From 140cdfb2d2b0f5ff2bec11d70e956850d5be7488 Mon Sep 17 00:00:00 2001
From: jacalvar <jacalvar@microsoft.com>
Date: Thu, 25 Feb 2016 11:06:47 -0800
Subject: [PATCH] Make ServiceCollectionExtensions consistent

---
 .../CorsServiceCollectionExtensions.cs        | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs
index 6bb7c79d85..a37681f8d4 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs
@@ -8,49 +8,46 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
-    /// The <see cref="IServiceCollection"/> extensions for enabling CORS support.
+    /// Extension methods for setting up cross-origin resource sharing services in an <see cref="IServiceCollection" />.
     /// </summary>
     public static class CorsServiceCollectionExtensions
     {
         /// <summary>
-        /// Add services needed to support CORS to the given <paramref name="serviceCollection"/>.
+        /// Adds cross-origin resource sharing services to the specified <see cref="IServiceCollection" />.
         /// </summary>
-        /// <param name="serviceCollection">The service collection to which CORS services are added.</param>
-        /// <returns>The updated <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddCors(this IServiceCollection serviceCollection)
+        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        public static void AddCors(this IServiceCollection services)
         {
-            if (serviceCollection == null)
+            if (services == null)
             {
-                throw new ArgumentNullException(nameof(serviceCollection));
+                throw new ArgumentNullException(nameof(services));
             }
-            
-            serviceCollection.TryAdd(ServiceDescriptor.Transient<ICorsService, CorsService>());
-            serviceCollection.TryAdd(ServiceDescriptor.Transient<ICorsPolicyProvider, DefaultCorsPolicyProvider>());
-            return serviceCollection;
+
+            services.AddOptions();
+
+            services.TryAdd(ServiceDescriptor.Transient<ICorsService, CorsService>());
+            services.TryAdd(ServiceDescriptor.Transient<ICorsPolicyProvider, DefaultCorsPolicyProvider>());
         }
 
         /// <summary>
-        /// Add services needed to support CORS to the given <paramref name="serviceCollection"/>.
+        /// Adds cross-origin resource sharing services to the specified <see cref="IServiceCollection" />.
         /// </summary>
-        /// <param name="serviceCollection">The service collection to which CORS services are added.</param>
-        /// <param name="configure">A delegate which is run to configure the services.</param>
-        /// <returns>The updated <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddCors(
-            this IServiceCollection serviceCollection,
-            Action<CorsOptions> configure)
+        /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
+        /// <param name="setupAction">An <see cref="Action{CorsOptions}"/> to configure the provided <see cref="CorsOptions"/>.</param>
+        public static void AddCors(this IServiceCollection services, Action<CorsOptions> setupAction)
         {
-            if (serviceCollection == null)
+            if (services == null)
             {
-                throw new ArgumentNullException(nameof(serviceCollection));
+                throw new ArgumentNullException(nameof(services));
             }
 
-            if (configure == null)
+            if (setupAction == null)
             {
-                throw new ArgumentNullException(nameof(configure));
+                throw new ArgumentNullException(nameof(setupAction));
             }
 
-            serviceCollection.Configure(configure);
-            return serviceCollection.AddCors();
+            services.AddCors();
+            services.Configure(setupAction);
         }
     }
 }
\ No newline at end of file