From 6a93cc815195e38d85f9ac0f60714e618d8fdc0d Mon Sep 17 00:00:00 2001
From: ns8482e <23270244+ns8482e@users.noreply.github.com>
Date: Thu, 23 Sep 2021 17:17:43 -0500
Subject: [PATCH] Fixes #10311

---
 .../Shell/ShellOrchardCoreBuilderExtensions.cs                  | 2 --
 .../Modules/Extensions/ServiceCollectionExtensions.cs           | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellOrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellOrchardCoreBuilderExtensions.cs
index 2e96791974f..e6edd4ab963 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellOrchardCoreBuilderExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Shell/ShellOrchardCoreBuilderExtensions.cs
@@ -18,8 +18,6 @@ public static OrchardCoreBuilder AddDataStorage(this OrchardCoreBuilder builder)
                 .ConfigureServices(services =>
                 {
                     services.AddScoped<IShellDescriptorManager, ShellDescriptorManager>();
-                    services.AddScoped<IShellFeaturesManager, ShellFeaturesManager>();
-                    services.AddScoped<IShellDescriptorFeaturesManager, ShellDescriptorFeaturesManager>();
                 });
 
             return builder;
diff --git a/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
index f917beb9b4c..8af8098218d 100644
--- a/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
@@ -165,6 +165,8 @@ private static void AddExtensionServices(OrchardCoreBuilder builder)
             builder.ConfigureServices(services =>
             {
                 services.AddExtensionManager();
+                services.AddScoped<IShellFeaturesManager, ShellFeaturesManager>();
+                services.AddScoped<IShellDescriptorFeaturesManager, ShellDescriptorFeaturesManager>();
             });
         }