Remove services.AddImageSharpCore

Author: JimBobSquarePants

samples/ImageSharp.Web.Sample/Startup.cs

@@ -39,7 +39,7 @@ public class Startup
         /// <param name="services">The collection of service desscriptors.</param>
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddImageSharpCore()
+            services.AddImageSharp()
                 .SetRequestParser<QueryCollectionRequestParser>()
                 .Configure<PhysicalFileSystemCacheOptions>(options =>
                 {
@@ -102,7 +102,7 @@ private void ConfigureCustomServicesAndDefaultOptions(IServiceCollection service
 
         private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services)
         {
-            services.AddImageSharpCore(
+            services.AddImageSharp(
                 options =>
                     {
                         options.Configuration = Configuration.Default;
@@ -128,7 +128,9 @@ private void ConfigureCustomServicesAndCustomOptions(IServiceCollection services
                         provider.GetRequiredService<FormatUtilities>());
                 })
                 .SetCacheHash<CacheHash>()
+                .ClearProviders()
                 .AddProvider<PhysicalFileSystemProvider>()
+                .ClearProcessors()
                 .AddProcessor<ResizeWebProcessor>()
                 .AddProcessor<FormatWebProcessor>()
                 .AddProcessor<BackgroundColorWebProcessor>();

…ction/ImageSharpCoreBuilderExtensions.cs …Injection/ImageSharpBuilderExtensions.cssrc/ImageSharp.Web/DependencyInjection/ImageSharpCoreBuilderExtensions.cs renamed to src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs src/ImageSharp.Web/DependencyInjection/ImageSharpCoreBuilderExtensions.cs renamed to src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.Configuration;
@@ -21,7 +20,7 @@ namespace SixLabors.ImageSharp.Web.DependencyInjection
     /// <summary>
     /// Extension methods for <see cref="IImageSharpBuilder"/> that allow configuration of services.
     /// </summary>
-    public static class ImageSharpCoreBuilderExtensions
+    public static class ImageSharpBuilderExtensions
     {
         /// <summary>
         /// Sets the given <see cref="IRequestParser"/> adding it to the service collection.
@@ -243,6 +242,18 @@ public static IImageSharpBuilder RemoveProcessor<TProcessor>(this IImageSharpBui
             return builder;
         }
 
+        /// <summary>
+        /// Removes all <see cref="IImageWebProcessor"/> instances from the processor collection within the service collection.
+        /// </summary>
+        /// <param name="builder">The core builder.</param>
+        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
+        public static IImageSharpBuilder ClearProcessors(this IImageSharpBuilder builder)
+        {
+            builder.Services.RemoveAll(typeof(IImageWebProcessor));
+
+            return builder;
+        }
+
         /// <summary>
         /// Registers an action used to configure a particular type of options.
         /// </summary>

src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs

@@ -24,67 +24,39 @@ public static class ServiceCollectionExtensions
         /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
         /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
         public static IImageSharpBuilder AddImageSharp(this IServiceCollection services)
-        {
-            IImageSharpBuilder builder = AddImageSharpCore(services);
-
-            AddDefaultServices(builder);
-
-            return new ImageSharpBuilder(builder.Services);
-        }
+            => AddImageSharp(services, _ => { });
 
         /// <summary>
         /// Adds ImageSharp services to the specified <see cref="IServiceCollection" /> with the given options.
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
         /// <param name="setupAction">An <see cref="Action{ImageSharpMiddlewareOptions}"/> to configure the provided <see cref="ImageSharpMiddlewareOptions"/>.</param>
         /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-        public static IImageSharpBuilder AddImageSharp(this IServiceCollection services, Action<ImageSharpMiddlewareOptions> setupAction)
-        {
-            IImageSharpBuilder builder = AddImageSharpCore(services, setupAction);
-
-            AddDefaultServices(builder);
-
-            return new ImageSharpBuilder(builder.Services);
-        }
-
-        /// <summary>
-        /// Provides the means to add essential ImageSharp services to the specified <see cref="IServiceCollection" /> with the given options.
-        /// All additional services are required to be configured.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        /// <param name="setupAction">An <see cref="Action{ImageSharpMiddlewareOptions}"/> to configure the provided <see cref="ImageSharpMiddlewareOptions"/>.</param>
-        /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-        public static IImageSharpBuilder AddImageSharpCore(this IServiceCollection services, Action<ImageSharpMiddlewareOptions> setupAction)
+        public static IImageSharpBuilder AddImageSharp(
+            this IServiceCollection services,
+            Action<ImageSharpMiddlewareOptions> setupAction)
         {
             Guard.NotNull(services, nameof(services));
+            Guard.NotNull(setupAction, nameof(setupAction));
 
             services.TryAddTransient<IConfigureOptions<ImageSharpMiddlewareOptions>, ImageSharpConfiguration>();
 
             IImageSharpBuilder builder = new ImageSharpBuilder(services);
 
-            builder.Services.Configure(setupAction);
-
-            builder.SetMemoryAllocatorFromMiddlewareOptions();
-            builder.SetFormatUtilitesFromMiddlewareOptions();
+            AddDefaultServices(builder, setupAction);
 
             return builder;
         }
 
-        /// <summary>
-        /// Provides the means to add essential ImageSharp services to the specified <see cref="IServiceCollection" /> with the default options.
-        /// All additional services are required to be configured.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        /// <returns>An <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</returns>
-        public static IImageSharpBuilder AddImageSharpCore(this IServiceCollection services)
-            => AddImageSharpCore(services, _ => { });
-
-        /// <summary>
-        /// Adds the default service to the service collection.
-        /// </summary>
-        /// <param name="builder">The <see cref="IImageSharpBuilder"/> that can be used to further configure the ImageSharp services.</param>
-        private static void AddDefaultServices(IImageSharpBuilder builder)
+        private static void AddDefaultServices(
+            IImageSharpBuilder builder,
+            Action<ImageSharpMiddlewareOptions> setupAction)
         {
+            builder.Services.Configure(setupAction);
+
+            builder.SetMemoryAllocatorFromMiddlewareOptions();
+            builder.SetFormatUtilitesFromMiddlewareOptions();
+
             builder.SetRequestParser<QueryCollectionRequestParser>();
 
             builder.SetCache<PhysicalFileSystemCache>();