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

Fix API change in ITypeActivator

This commit is contained in:
Ryan Nowak 2014-03-21 18:16:02 -07:00
parent dc6843acf7
commit 89b53aab25
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.DependencyInjection; using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding;
using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Rendering;
@ -29,7 +28,7 @@ namespace Microsoft.AspNet.Mvc
try try
{ {
var controller = _activator.CreateInstance(actionDescriptor.ControllerDescriptor.ControllerTypeInfo.AsType()); var controller = _activator.CreateInstance(_serviceProvider, actionDescriptor.ControllerDescriptor.ControllerTypeInfo.AsType());
// TODO: How do we feed the controller with context (need DI improvements) // TODO: How do we feed the controller with context (need DI improvements)
InitializeController(controller, actionContext); InitializeController(controller, actionContext);

6
src/Microsoft.AspNet.Mvc.ModelBinding/Binders/GenericModelBinder.cs
View File

@ -10,9 +10,11 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
public class GenericModelBinder : IModelBinder public class GenericModelBinder : IModelBinder
{ {
private readonly ITypeActivator _activator; private readonly ITypeActivator _activator;
private readonly IServiceProvider _serviceProvider;
public GenericModelBinder(ITypeActivator activator) public GenericModelBinder(IServiceProvider serviceProvider, ITypeActivator activator)
{ {
_serviceProvider = serviceProvider;
_activator = activator; _activator = activator;
} }
@ -21,7 +23,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
Type binderType = ResolveBinderType(bindingContext.ModelType); Type binderType = ResolveBinderType(bindingContext.ModelType);
if (binderType != null) if (binderType != null)
{ {
var binder = (IModelBinder)_activator.CreateInstance(binderType); var binder = (IModelBinder)_activator.CreateInstance(_serviceProvider, binderType);
return binder.BindModel(bindingContext); return binder.BindModel(bindingContext);
} }