From d51851f34243fa567c3370134ed406955c028ace Mon Sep 17 00:00:00 2001
From: jacalvar <jacalvar@microsoft.com>
Date: Mon, 28 Mar 2016 15:13:07 -0700
Subject: [PATCH] Return IServiceCollection from service collection extension
 methods

---
 .../ElmServiceCollectionExtensions.cs                  | 10 ++++++++--
 .../AnalysisServiceCollectionExtensions.cs             |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs
index d7a5fc36d5..2d2da2d176 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmServiceCollectionExtensions.cs
@@ -16,7 +16,8 @@ namespace Microsoft.Extensions.DependencyInjection
         /// Adds error logging middleware services to the specified <see cref="IServiceCollection" />.
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        public static void AddElm(this IServiceCollection services)
+        /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
+        public static IServiceCollection AddElm(this IServiceCollection services)
         {
             if (services == null)
             {
@@ -26,6 +27,8 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddOptions();
             services.TryAddSingleton<ElmStore>();
             services.TryAddSingleton<ElmLoggerProvider>();
+
+            return services;
         }
 
         /// <summary>
@@ -33,7 +36,8 @@ namespace Microsoft.Extensions.DependencyInjection
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
         /// <param name="setupAction">An <see cref="Action{ElmOptions}"/> to configure the provided <see cref="ElmOptions"/>.</param>
-        public static void AddElm(this IServiceCollection services, Action<ElmOptions> setupAction)
+        /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
+        public static IServiceCollection AddElm(this IServiceCollection services, Action<ElmOptions> setupAction)
         {
             if (services == null)
             {
@@ -47,6 +51,8 @@ namespace Microsoft.Extensions.DependencyInjection
 
             services.AddElm();
             services.Configure(setupAction);
+
+            return services;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs
index 8c6188d7c8..c86020bc7d 100644
--- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisServiceCollectionExtensions.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Extensions.DependencyInjection
         /// Adds diagnostic services to the specified <see cref="IServiceCollection" />.
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
         public static IServiceCollection AddMiddlewareAnalysis(this IServiceCollection services)
         {
             if (services == null)