From 794d0892ae6975014d3bfb393c9d7646511d81bc Mon Sep 17 00:00:00 2001
From: jacalvar <jacalvar@microsoft.com>
Date: Mon, 28 Mar 2016 15:26:49 -0700
Subject: [PATCH] Return IServiceCollection from AddWebEncoders extension
 methods

---
 .../EncoderServiceCollectionExtensions.cs             | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs b/src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs
index 317d88f99d..72f5e369a1 100644
--- a/src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs
+++ b/src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs
@@ -19,8 +19,8 @@ namespace Microsoft.Extensions.DependencyInjection
         /// to the specified <paramref name="services" />.
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> instance after the encoders have been added.</returns>
-        public static void AddWebEncoders(this IServiceCollection services)
+        /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
+        public static IServiceCollection AddWebEncoders(this IServiceCollection services)
         {
             if (services == null)
             {
@@ -37,6 +37,8 @@ namespace Microsoft.Extensions.DependencyInjection
                 CreateFactory(() => JavaScriptEncoder.Default, settings => JavaScriptEncoder.Create(settings)));
             services.TryAddSingleton(
                 CreateFactory(() => UrlEncoder.Default, settings => UrlEncoder.Create(settings)));
+
+            return services;
         }
 
         /// <summary>
@@ -45,7 +47,8 @@ namespace Microsoft.Extensions.DependencyInjection
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection"/>.</param>
         /// <param name="setupAction">An <see cref="Action{WebEncoderOptions}"/> to configure the provided <see cref="WebEncoderOptions"/>.</param>
-        public static void AddWebEncoders(this IServiceCollection services, Action<WebEncoderOptions> setupAction)
+        /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
+        public static IServiceCollection AddWebEncoders(this IServiceCollection services, Action<WebEncoderOptions> setupAction)
         {
             if (services == null)
             {
@@ -59,6 +62,8 @@ namespace Microsoft.Extensions.DependencyInjection
 
             services.AddWebEncoders();
             services.Configure(setupAction);
+
+            return services;
         }
 
         private static Func<IServiceProvider, TService> CreateFactory<TService>(