Move the new AddResourceConfiguration to the Abstractions project (#1…

…7107)
OrchardCMS · Dec 3, 2024 · 69762e2 · 69762e2
1 parent b7ee089
commit 69762e2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/OrchardCore.Resources.csproj b/src/OrchardCore.Modules/OrchardCore.Resources/OrchardCore.Resources.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.DisplayManagement.Liquid\OrchardCore.DisplayManagement.Liquid.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.csproj" />
-    <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement\OrchardCore.ResourceManagement.csproj" />
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement.Core\OrchardCore.ResourceManagement.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Themes/TheAgencyTheme/TheAgencyTheme.csproj b/src/OrchardCore.Themes/TheAgencyTheme/TheAgencyTheme.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement.Abstractions\OrchardCore.ResourceManagement.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Theme.Targets\OrchardCore.Theme.Targets.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.DisplayManagement\OrchardCore.DisplayManagement.csproj" />
-    <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement\OrchardCore.ResourceManagement.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Themes/TheComingSoonTheme/TheComingSoonTheme.csproj b/src/OrchardCore.Themes/TheComingSoonTheme/TheComingSoonTheme.csproj
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement.Abstractions\OrchardCore.ResourceManagement.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Theme.Targets\OrchardCore.Theme.Targets.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.DisplayManagement\OrchardCore.DisplayManagement.csproj" />
-    <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement\OrchardCore.ResourceManagement.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/ServiceCollectionExtensions.cs
@@ -0,0 +1,17 @@
+using Microsoft.Extensions.Options;
+using OrchardCore.ResourceManagement;
+
+namespace Microsoft.Extensions.DependencyInjection;
+
+public static class ServiceCollectionExtensions
+{
+    /// <summary>
+    /// Adds a service implementing <see cref="IConfigureOptions{ResourceManagementOptions}"/> to the service collection.
+    /// </summary>
+    /// <typeparam name="T">
+    /// The type of the implementation of <see cref="IConfigureOptions{ResourceManagementOptions}"/> to register.
+    /// </typeparam>
+    public static IServiceCollection AddResourceConfiguration<T>(this IServiceCollection services)
+        where T : class, IConfigureOptions<ResourceManagementOptions>
+        => services.AddTransient<IConfigureOptions<ResourceManagementOptions>, T>();
+}
diff --git a/src/OrchardCore/OrchardCore.ResourceManagement/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.ResourceManagement/ServiceCollectionExtensions.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -15,14 +14,4 @@ public static IServiceCollection AddResourceManagement(this IServiceCollection s
 
         return services;
     }
-
-    /// <summary>
-    /// Adds a service implementing <see cref="IConfigureOptions{ResourceManagementOptions}"/> to the service collection.
-    /// </summary>
-    /// <typeparam name="T">
-    /// The type of the implementation of <see cref="IConfigureOptions{ResourceManagementOptions}"/> to register.
-    /// </typeparam>
-    public static IServiceCollection AddResourceConfiguration<T>(this IServiceCollection services)
-        where T : class, IConfigureOptions<ResourceManagementOptions>
-        => services.AddTransient<IConfigureOptions<ResourceManagementOptions>, T>();
 }