huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DI API changes

This commit is contained in:
Brennan 2015-03-05 14:29:22 -08:00
parent 20848da93f
commit 09ccc84a17
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNet.Http.Extensions/UseMiddlewareExtensions.cs
View File

@ -22,8 +22,7 @@ namespace Microsoft.AspNet.Builder
var applicationServices = builder.ApplicationServices; var applicationServices = builder.ApplicationServices;
return builder.Use(next => return builder.Use(next =>
{ {
var typeActivator = applicationServices.GetRequiredService<ITypeActivator>(); var instance = ActivatorUtilities.CreateInstance(builder.ApplicationServices, middleware, new[] { next }.Concat(args).ToArray());
var instance = typeActivator.CreateInstance(builder.ApplicationServices, middleware, new[] { next }.Concat(args).ToArray());
var methodinfo = middleware.GetMethod("Invoke", BindingFlags.Instance | BindingFlags.Public); var methodinfo = middleware.GetMethod("Invoke", BindingFlags.Instance | BindingFlags.Public);
var parameters = methodinfo.GetParameters(); var parameters = methodinfo.GetParameters();
if (parameters[0].ParameterType != typeof(HttpContext)) if (parameters[0].ParameterType != typeof(HttpContext))

2
test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs
View File

@ -38,7 +38,6 @@ namespace Microsoft.AspNet.Http.Extensions.Tests
{ {
var services = new ServiceCollection() var services = new ServiceCollection()
.AddScoped<ITestService, TestService>() .AddScoped<ITestService, TestService>()
.AddTransient<ITypeActivator, TypeActivator>()
.BuildServiceProvider(); .BuildServiceProvider();
var builder = new ApplicationBuilder(services); var builder = new ApplicationBuilder(services);
@ -101,7 +100,6 @@ namespace Microsoft.AspNet.Http.Extensions.Tests
{ {
var services = new ServiceCollection() var services = new ServiceCollection()
.AddScoped<ITestService, TestService>() .AddScoped<ITestService, TestService>()
.AddTransient<ITypeActivator, TypeActivator>()
.BuildServiceProvider(); .BuildServiceProvider();
var builder = new ApplicationBuilder(services); var builder = new ApplicationBuilder(services);
builder.UseMiddleware<TestMiddleware>(); builder.UseMiddleware<TestMiddleware>();