From 1459ca1edb8dad68b0e908677a3e9f5298bf864a Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Wed, 4 Mar 2015 18:07:34 -0800
Subject: [PATCH] React to DI changes

---
 .../ServiceCollectionExtensions.cs                    | 11 +++++------
 .../DefaultAuthorizationServiceTests.cs               |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNet.Authorization/ServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authorization/ServiceCollectionExtensions.cs
index 9146c747b9..292083120b 100644
--- a/src/Microsoft.AspNet.Authorization/ServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNet.Authorization/ServiceCollectionExtensions.cs
@@ -22,12 +22,11 @@ namespace Microsoft.Framework.DependencyInjection
         // Review: Need UseDefaultSubkey parameter?
         public static IServiceCollection AddAuthorization([NotNull] this IServiceCollection services, IConfiguration config = null, Action<AuthorizationOptions> configureOptions = null)
         {
-            var describe = new ServiceDescriber(config);
-            services.AddOptions(config);
-            services.TryAdd(describe.Transient<IAuthorizationService, DefaultAuthorizationService>());
-            services.Add(describe.Transient<IAuthorizationHandler, ClaimsAuthorizationHandler>());
-            services.Add(describe.Transient<IAuthorizationHandler, DenyAnonymousAuthorizationHandler>());
-            services.Add(describe.Transient<IAuthorizationHandler, PassThroughAuthorizationHandler>());
+            services.AddOptions();
+            services.TryAdd(ServiceDescriptor.Transient<IAuthorizationService, DefaultAuthorizationService>());
+            services.AddTransient<IAuthorizationHandler, ClaimsAuthorizationHandler>();
+            services.AddTransient<IAuthorizationHandler, DenyAnonymousAuthorizationHandler>();
+            services.AddTransient<IAuthorizationHandler, PassThroughAuthorizationHandler>();
             if (configureOptions != null)
             {
                 services.Configure(configureOptions);
diff --git a/test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs b/test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs
index 54a4e1a7c8..4b9b5a33de 100644
--- a/test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs
+++ b/test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Fallback;
 using Xunit;
 
 namespace Microsoft.AspNet.Authorization.Test