From e484e36f2225aa907d212c78fa63f7e28ae274b9 Mon Sep 17 00:00:00 2001
From: Niraj Soni <23270244+ns8482e@users.noreply.github.com>
Date: Wed, 16 Feb 2022 14:58:49 -0600
Subject: [PATCH] Fixes #10311 (#10326)

---
 .../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 b06f4f2d73e..fe88d1d8f0b 100644
--- a/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
+++ b/src/OrchardCore/OrchardCore/Modules/Extensions/ServiceCollectionExtensions.cs
@@ -168,6 +168,8 @@ private static void AddExtensionServices(OrchardCoreBuilder builder)
             builder.ConfigureServices(services =>
             {
                 services.AddExtensionManager();
+                services.AddScoped<IShellFeaturesManager, ShellFeaturesManager>();
+                services.AddScoped<IShellDescriptorFeaturesManager, ShellDescriptorFeaturesManager>();
             });
         }