Move MVC dependencies from Umbraco.Core to Umbraco.Web
note:MvcHandler.DisableMvcResponseHeader = true was removed from UmbracoApplicationBase.StartApplication. This was the only breaking change, it can be put back in at a higher level if necessary.
This commit is contained in:
@@ -1,28 +0,0 @@
|
||||
using System.IO;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace Umbraco.Core.Profiling
|
||||
{
|
||||
public class ProfilingView : IView
|
||||
{
|
||||
private readonly IView _inner;
|
||||
private readonly string _name;
|
||||
private readonly string _viewPath;
|
||||
|
||||
public ProfilingView(IView inner)
|
||||
{
|
||||
_inner = inner;
|
||||
_name = inner.GetType().Name;
|
||||
var razorView = inner as RazorView;
|
||||
_viewPath = razorView != null ? razorView.ViewPath : "Unknown";
|
||||
}
|
||||
|
||||
public void Render(ViewContext viewContext, TextWriter writer)
|
||||
{
|
||||
using (ProfilerResolver.Current.Profiler.Step(string.Format("{0}.Render: {1}", _name, _viewPath)))
|
||||
{
|
||||
_inner.Render(viewContext, writer);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace Umbraco.Core.Profiling
|
||||
{
|
||||
public class ProfilingViewEngine: IViewEngine
|
||||
{
|
||||
internal readonly IViewEngine Inner;
|
||||
private readonly string _name;
|
||||
|
||||
public ProfilingViewEngine(IViewEngine inner)
|
||||
{
|
||||
Inner = inner;
|
||||
_name = inner.GetType().Name;
|
||||
}
|
||||
|
||||
public ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache)
|
||||
{
|
||||
using (ProfilerResolver.Current.Profiler.Step(string.Format("{0}.FindPartialView, {1}, {2}", _name, partialViewName, useCache)))
|
||||
{
|
||||
return WrapResult(Inner.FindPartialView(controllerContext, partialViewName, useCache));
|
||||
}
|
||||
}
|
||||
|
||||
public ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache)
|
||||
{
|
||||
using (ProfilerResolver.Current.Profiler.Step(string.Format("{0}.FindView, {1}, {2}, {3}", _name, viewName, masterName, useCache)))
|
||||
{
|
||||
return WrapResult(Inner.FindView(controllerContext, viewName, masterName, useCache));
|
||||
}
|
||||
}
|
||||
|
||||
private static ViewEngineResult WrapResult(ViewEngineResult innerResult)
|
||||
{
|
||||
var profiledResult = innerResult.View != null ?
|
||||
new ViewEngineResult(new ProfilingView(innerResult.View), innerResult.ViewEngine) :
|
||||
new ViewEngineResult(innerResult.SearchedLocations);
|
||||
return profiledResult;
|
||||
}
|
||||
|
||||
public void ReleaseView(ControllerContext controllerContext, IView view)
|
||||
{
|
||||
using (ProfilerResolver.Current.Profiler.Step(string.Format("{0}.ReleaseView, {1}", _name, view.GetType().Name)))
|
||||
{
|
||||
Inner.ReleaseView(controllerContext, view);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user