diff --git a/Microsoft.AspNet.Mvc/ActionResultHelper.cs b/Microsoft.AspNet.Mvc/ActionResultHelper.cs index 38207cade0..677259cc7e 100644 --- a/Microsoft.AspNet.Mvc/ActionResultHelper.cs +++ b/Microsoft.AspNet.Mvc/ActionResultHelper.cs @@ -23,7 +23,11 @@ namespace Microsoft.AspNet.Mvc public IActionResult Json(object value) { - // TODO: Make this work at some point + throw new NotImplementedException(); + } + + public IActionResult View() + { throw new NotImplementedException(); } } diff --git a/Microsoft.AspNet.Mvc/ControllerActionInvoker.cs b/Microsoft.AspNet.Mvc/ControllerActionInvoker.cs index a1779250f5..360195b216 100644 --- a/Microsoft.AspNet.Mvc/ControllerActionInvoker.cs +++ b/Microsoft.AspNet.Mvc/ControllerActionInvoker.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Mvc throw new InvalidOperationException(String.Format("Couldn't find controller '{0}'.", _descriptor.ControllerName)); } - Initialize(controller, _requestContext); + Initialize(controller); var method = controller.GetType().GetMethod(_descriptor.ActionName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase); @@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Mvc return actionResult.ExecuteResultAsync(_requestContext); } - private void Initialize(object controller, RequestContext requestContext) + private void Initialize(object controller) { var controllerType = controller.GetType(); @@ -62,11 +62,11 @@ namespace Microsoft.AspNet.Mvc { if (prop.PropertyType == typeof(IOwinContext)) { - prop.SetValue(controller, requestContext.HttpContext); + prop.SetValue(controller, _requestContext.HttpContext); } else if (prop.PropertyType == typeof(IDictionary)) { - prop.SetValue(controller, requestContext.HttpContext.Environment); + prop.SetValue(controller, _requestContext.HttpContext.Environment); } } } diff --git a/Microsoft.AspNet.Mvc/IActionResultHelper.cs b/Microsoft.AspNet.Mvc/IActionResultHelper.cs index 97940c81ef..9689d19c14 100644 --- a/Microsoft.AspNet.Mvc/IActionResultHelper.cs +++ b/Microsoft.AspNet.Mvc/IActionResultHelper.cs @@ -6,5 +6,6 @@ namespace Microsoft.AspNet.Mvc IActionResult Content(string value); IActionResult Content(string value, string contentType); IActionResult Json(object value); + IActionResult View(); } } diff --git a/MvcSample/HomeController.cs b/MvcSample/HomeController.cs index e9f98771b0..11efd273ea 100644 --- a/MvcSample/HomeController.cs +++ b/MvcSample/HomeController.cs @@ -36,5 +36,10 @@ namespace MvcSample return responseMessage; } + + public IActionResult MyView() + { + return Result.View(); + } } } \ No newline at end of file