From 09ccc84a17b9ab248db0111da8867aae6ba29f1d Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Thu, 5 Mar 2015 14:29:22 -0800
Subject: [PATCH] DI API changes

---
 .../UseMiddlewareExtensions.cs                                 | 3 +--
 .../UseWithServicesTests.cs                                    | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Microsoft.AspNet.Http.Extensions/UseMiddlewareExtensions.cs b/src/Microsoft.AspNet.Http.Extensions/UseMiddlewareExtensions.cs
index 8a9de346ab..6425c20dc2 100644
--- a/src/Microsoft.AspNet.Http.Extensions/UseMiddlewareExtensions.cs
+++ b/src/Microsoft.AspNet.Http.Extensions/UseMiddlewareExtensions.cs
@@ -22,8 +22,7 @@ namespace Microsoft.AspNet.Builder
             var applicationServices = builder.ApplicationServices;
             return builder.Use(next =>
             {
-                var typeActivator = applicationServices.GetRequiredService<ITypeActivator>();
-                var instance = typeActivator.CreateInstance(builder.ApplicationServices, middleware, new[] { next }.Concat(args).ToArray());
+                var instance = ActivatorUtilities.CreateInstance(builder.ApplicationServices, middleware, new[] { next }.Concat(args).ToArray());
                 var methodinfo = middleware.GetMethod("Invoke", BindingFlags.Instance | BindingFlags.Public);
                 var parameters = methodinfo.GetParameters();
                 if (parameters[0].ParameterType != typeof(HttpContext))
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs b/test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs
index 7cf66aa951..66b5bb0ef4 100644
--- a/test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs
+++ b/test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs
@@ -38,7 +38,6 @@ namespace Microsoft.AspNet.Http.Extensions.Tests
         {
             var services = new ServiceCollection()
                 .AddScoped<ITestService, TestService>()
-                .AddTransient<ITypeActivator, TypeActivator>()
                 .BuildServiceProvider();
             var builder = new ApplicationBuilder(services);
 
@@ -101,7 +100,6 @@ namespace Microsoft.AspNet.Http.Extensions.Tests
         {
             var services = new ServiceCollection()
                 .AddScoped<ITestService, TestService>()
-                .AddTransient<ITypeActivator, TypeActivator>()
                 .BuildServiceProvider();
             var builder = new ApplicationBuilder(services);
             builder.UseMiddleware<TestMiddleware>();