fixes from rebase

src/ImageSharp.Formats.Bmp/BootstrapperExtensions.cs

@@ -1,29 +0,0 @@
-// <copyright file="BootstrapperExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.IO;
-
-    using Formats;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
-    /// </summary>
-    public static partial class BootstrapperExtensions
-    {
-        /// <summary>
-        /// Adds the BMP format.
-        /// </summary>
-        /// <param name="bootstrapper">The bootstrapper.</param>
-        /// <returns>The bootstraper</returns>
-        public static Bootstrapper AddBmpFormat(this Bootstrapper bootstrapper)
-        {
-            bootstrapper.AddImageFormat(new BmpFormat());
-            return bootstrapper;
-        }
-    }
-}

src/ImageSharp.Formats.Bmp/ConfigurationExtensions.cs

@@ -0,0 +1,29 @@
+// <copyright file="ConfigurationExtensions.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp
+{
+    using System;
+    using System.IO;
+
+    using Formats;
+
+    /// <summary>
+    /// Extension methods for the <see cref="Configuration"/> type.
+    /// </summary>
+    public static partial class ConfigurationExtensions
+    {
+        /// <summary>
+        /// Adds the BMP format.
+        /// </summary>
+        /// <param name="config">The config.</param>
+        /// <returns>The config</returns>
+        public static Configuration AddBmpFormat(this Configuration config)
+        {
+            config.AddImageFormat(new BmpFormat());
+            return config;
+        }
+    }
+}

src/ImageSharp.Formats.Gif/BootstrapperExtensions.cs

@@ -1,29 +0,0 @@
-// <copyright file="BootstrapperExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.IO;
-
-    using Formats;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
-    /// </summary>
-    public static partial class BootstrapperExtensions
-    {
-        /// <summary>
-        /// Adds the Gif format.
-        /// </summary>
-        /// <param name="bootstrapper">The bootstrapper.</param>
-        /// <returns>The Bootstrapper</returns>
-        public static Bootstrapper AddGifFormat(this Bootstrapper bootstrapper)
-        {
-            bootstrapper.AddImageFormat(new GifFormat());
-            return bootstrapper;
-        }
-    }
-}

src/ImageSharp.Formats.Gif/ConfigurationExtensions.cs

@@ -0,0 +1,29 @@
+// <copyright file="ConfigurationExtensions.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp
+{
+    using System;
+    using System.IO;
+
+    using Formats;
+
+    /// <summary>
+    /// Extension methods for the <see cref="Configuration"/> type.
+    /// </summary>
+    public static partial class ConfigurationExtensions
+    {
+        /// <summary>
+        /// Adds the Gif format.
+        /// </summary>
+        /// <param name="config">The config.</param>
+        /// <returns>The config</returns>
+        public static Configuration AddGifFormat(this Configuration config)
+        {
+            config.AddImageFormat(new GifFormat());
+            return config;
+        }
+    }
+}

src/ImageSharp.Formats.Jpeg/BootstrapperExtensions.cs

@@ -1,29 +0,0 @@
-// <copyright file="BootstrapperExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.IO;
-
-    using Formats;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
-    /// </summary>
-    public static partial class BootstrapperExtensions
-    {
-        /// <summary>
-        /// Adds the Jpeg format.
-        /// </summary>
-        /// <param name="bootstrapper">The bootstrapper.</param>
-        /// <returns>The Bootstrapper</returns>
-        public static Bootstrapper AddJpegFormat(this Bootstrapper bootstrapper)
-        {
-            bootstrapper.AddImageFormat(new JpegFormat());
-            return bootstrapper;
-        }
-    }
-}

src/ImageSharp.Formats.Jpeg/ConfigurationExtensions.cs

@@ -0,0 +1,29 @@
+// <copyright file="ConfigurationExtensions.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp
+{
+    using System;
+    using System.IO;
+
+    using Formats;
+
+    /// <summary>
+    /// Extension methods for the <see cref="Configuration"/> type.
+    /// </summary>
+    public static partial class ConfigurationExtensions
+    {
+        /// <summary>
+        /// Adds the Jpeg format.
+        /// </summary>
+        /// <param name="config">The config.</param>
+        /// <returns>The config</returns>
+        public static Configuration AddJpegFormat(this Configuration config)
+        {
+            config.AddImageFormat(new JpegFormat());
+            return config;
+        }
+    }
+}

src/ImageSharp.Formats.Png/BootstrapperExtensions.cs

@@ -1,29 +0,0 @@
-// <copyright file="BootstrapperExtensions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.IO;
-
-    using Formats;
-
-    /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
-    /// </summary>
-    public static partial class BootstrapperExtensions
-    {
-        /// <summary>
-        /// Adds the Png format.
-        /// </summary>
-        /// <param name="bootstrapper">The bootstrapper.</param>
-        /// <returns>The Bootstrapper</returns>
-        public static Bootstrapper AddPngFormat(this Bootstrapper bootstrapper)
-        {
-            bootstrapper.AddImageFormat(new PngFormat());
-            return bootstrapper;
-        }
-    }
-}

src/ImageSharp.Formats.Png/ConfigurationExtensions.cs

@@ -0,0 +1,29 @@
+// <copyright file="ConfigurationExtensions.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp
+{
+    using System;
+    using System.IO;
+
+    using Formats;
+
+    /// <summary>
+    /// Extension methods for the <see cref="Configuration"/> type.
+    /// </summary>
+    public static partial class ConfigurationExtensions
+    {
+        /// <summary>
+        /// Adds the Png format.
+        /// </summary>
+        /// <param name="config">The Image configurations.</param>
+        /// <returns>The Configuration object</returns>
+        public static Configuration AddPngFormat(this Configuration config)
+        {
+            config.AddImageFormat(new PngFormat());
+            return config;
+        }
+    }
+}

src/ImageSharp.Formats/BootstrapperExtensions.cs → src/ImageSharp.Formats/ConfigurationExtensions.cs

@@ -1,4 +1,4 @@
-// <copyright file="BootstrapperExtensions.cs" company="James Jackson-South">
+// <copyright file="ConfigurationExtensions.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -11,18 +11,18 @@ namespace ImageSharp
     using Formats;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Configuration"/> type.
     /// </summary>
-    public static partial class BootstrapperExtensions
+    public static partial class ConfigurationExtensions
     {
         /// <summary>
         /// Adds the common formats, PNG, JPEG, GIF and BMP.
         /// </summary>
-        /// <param name="bootstrapper">The bootstrapper.</param>
-        /// <returns>The bootstrapper</returns>
-        public static Bootstrapper AddCommonFormats(this Bootstrapper bootstrapper)
+        /// <param name="config">The config.</param>
+        /// <returns>The config</returns>
+        public static Configuration AddCommonFormats(this Configuration config)
         {
-            return bootstrapper
+            return config
                     .AddPngFormat()
                     .AddJpegFormat()
                     .AddGifFormat()

tests/ImageSharp.Tests/TestBase.cs

@@ -15,7 +15,7 @@ namespace ImageSharp.Tests
     {
         protected TestBase()
         {
-            Bootstrapper.Default.AddCommonFormats();
+            Configuration.Default.AddCommonFormats();
         }
 
         /// <summary>