Added extraDefaultFeatureIds param to AddOrchardCms extension

OrchardCMS · Apr 16, 2017 · 5940a41 · 5940a41
1 parent f5f383c
commit 5940a41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Orchard.Cms.Web/Startup.cs b/src/Orchard.Cms.Web/Startup.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/src/OrchardCore/OrchardCore.Cms/ServiceExtensions.cs b/src/OrchardCore/OrchardCore.Cms/ServiceExtensions.cs
@@ -3,17 +3,18 @@
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Manifests;
 using Orchard.Environment.Shell.Data;
+using System.Linq;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceExtensions
     {
-        public static IServiceCollection AddOrchardCms(this IServiceCollection services)
+        public static IServiceCollection AddOrchardCms(this IServiceCollection services, params string[] extraDefaultFeatureIds)
         {
-            return AddOrchardCms(services, null);
+            return AddOrchardCms(services, null, extraDefaultFeatureIds);
         }
 
-        public static IServiceCollection AddOrchardCms(this IServiceCollection services, IConfiguration configuration)
+        public static IServiceCollection AddOrchardCms(this IServiceCollection services, IConfiguration configuration, params string[] extraDefaultFeatureIds)
         {
             services.AddManifestDefinition("Theme.txt", "theme");
             services.AddExtensionLocation("Themes");
@@ -26,8 +27,8 @@ public static IServiceCollection AddOrchardCms(this IServiceCollection services,
                 {
                     modules.WithConfiguration(configuration);
                 }
-
-                modules.WithDefaultFeatures("Orchard.Mvc", "Orchard.Settings", "Orchard.Setup", "Orchard.Recipes", "Orchard.Commons");
+            var defultFeatureIds = new string[] { "Orchard.Mvc", "Orchard.Settings", "Orchard.Setup", "Orchard.Recipes", "Orchard.Commons" };
+                modules.WithDefaultFeatures(defultFeatureIds.Union(extraDefaultFeatureIds).ToArray());
             });
 
             return services;