diff --git a/src/Microsoft.AspNet.Mvc/ActionDescriptorProviderContext.cs b/src/Microsoft.AspNet.Mvc/ActionDescriptorProviderContext.cs index 2bbc1526f6..d62ec66ccd 100644 --- a/src/Microsoft.AspNet.Mvc/ActionDescriptorProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc/ActionDescriptorProviderContext.cs @@ -7,9 +7,9 @@ namespace Microsoft.AspNet.Mvc { public ActionDescriptorProviderContext() { - ActionDescriptors = new List(); + Results = new List(); } - public List ActionDescriptors { get; private set; } + public List Results { get; private set; } } } diff --git a/src/Microsoft.AspNet.Mvc/ActionInvokerFactory.cs b/src/Microsoft.AspNet.Mvc/ActionInvokerFactory.cs index 642911a8c9..ed05e7ed01 100644 --- a/src/Microsoft.AspNet.Mvc/ActionInvokerFactory.cs +++ b/src/Microsoft.AspNet.Mvc/ActionInvokerFactory.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc { var context = new ActionInvokerProviderContext(actionContext); _actionInvokerProvider.Invoke(context); - return context.ActionInvoker; + return context.Result; } } } diff --git a/src/Microsoft.AspNet.Mvc/ActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc/ActionInvokerProvider.cs index 7ae935d0b4..924d5a566c 100644 --- a/src/Microsoft.AspNet.Mvc/ActionInvokerProvider.cs +++ b/src/Microsoft.AspNet.Mvc/ActionInvokerProvider.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Mvc if (ad != null) { - context.ActionInvoker = new TypeMethodBasedActionInvoker( + context.Result = new TypeMethodBasedActionInvoker( context.ActionContext, ad, _actionResultFactory, diff --git a/src/Microsoft.AspNet.Mvc/ActionInvokerProviderContext.cs b/src/Microsoft.AspNet.Mvc/ActionInvokerProviderContext.cs index 9e849dfe7b..5b992680c4 100644 --- a/src/Microsoft.AspNet.Mvc/ActionInvokerProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc/ActionInvokerProviderContext.cs @@ -16,6 +16,6 @@ namespace Microsoft.AspNet.Mvc public ActionContext ActionContext { get; private set; } - public IActionInvoker ActionInvoker { get; set; } + public IActionInvoker Result { get; set; } } } diff --git a/src/Microsoft.AspNet.Mvc/TypeMethodBasedActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc/TypeMethodBasedActionDescriptorProvider.cs index 252e51185f..57802747ab 100644 --- a/src/Microsoft.AspNet.Mvc/TypeMethodBasedActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc/TypeMethodBasedActionDescriptorProvider.cs @@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Mvc public void Invoke(ActionDescriptorProviderContext context, Action callNext) { - context.ActionDescriptors.AddRange(GetDescriptors()); + context.Results.AddRange(GetDescriptors()); callNext(); }