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

Adjusting due to API changes

This commit is contained in:
David Fowler 2014-04-17 22:16:04 -07:00
parent 11080a5d06
commit 252f17e5e2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNet.RequestContainer/ContainerExtensions.cs
View File

@ -15,8 +15,8 @@ namespace Microsoft.AspNet.RequestContainer
// TODO: move this ext method someplace nice // TODO: move this ext method someplace nice
return builder.Use(next => return builder.Use(next =>
{ {
var typeActivator = builder.ServiceProvider.GetService<ITypeActivator>(); var typeActivator = builder.ApplicationServices.GetService<ITypeActivator>();
var instance = typeActivator.CreateInstance(builder.ServiceProvider, middleware, new[] { next }.Concat(args).ToArray()); var instance = typeActivator.CreateInstance(builder.ApplicationServices, middleware, new[] { next }.Concat(args).ToArray());
var methodinfo = middleware.GetTypeInfo().GetDeclaredMethod("Invoke"); var methodinfo = middleware.GetTypeInfo().GetDeclaredMethod("Invoke");
return (RequestDelegate)methodinfo.CreateDelegate(typeof(RequestDelegate), instance); return (RequestDelegate)methodinfo.CreateDelegate(typeof(RequestDelegate), instance);
}); });
@ -29,7 +29,7 @@ namespace Microsoft.AspNet.RequestContainer
public static IBuilder UseServices(this IBuilder builder, IServiceProvider applicationServices) public static IBuilder UseServices(this IBuilder builder, IServiceProvider applicationServices)
{ {
builder.ServiceProvider = applicationServices; builder.ApplicationServices = applicationServices;
return builder.UseMiddleware(typeof(ContainerMiddleware)); return builder.UseMiddleware(typeof(ContainerMiddleware));
} }
@ -43,7 +43,7 @@ namespace Microsoft.AspNet.RequestContainer
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
configureServices(serviceCollection); configureServices(serviceCollection);
builder.ServiceProvider = serviceCollection.BuildServiceProvider(builder.ServiceProvider); builder.ApplicationServices = serviceCollection.BuildServiceProvider(builder.ApplicationServices);
return builder.UseMiddleware(typeof(ContainerMiddleware)); return builder.UseMiddleware(typeof(ContainerMiddleware));
} }