diff --git a/src/SQLCE4Umbraco/app.config b/src/SQLCE4Umbraco/app.config index 44298137ae..8f828418f3 100644 --- a/src/SQLCE4Umbraco/app.config +++ b/src/SQLCE4Umbraco/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Umbraco.Core/Profiling/WebProfiler.cs b/src/Umbraco.Core/Profiling/WebProfiler.cs index 139c020d3d..51dc650ed4 100644 --- a/src/Umbraco.Core/Profiling/WebProfiler.cs +++ b/src/Umbraco.Core/Profiling/WebProfiler.cs @@ -104,7 +104,7 @@ namespace Umbraco.Core.Profiling /// public string Render() { - return MiniProfiler.RenderIncludes(RenderPosition.BottomRight).ToString(); + return MiniProfiler.RenderIncludes(RenderPosition.Right).ToString(); } /// diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 1660ae19d2..ab90ce6a90 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -55,9 +55,9 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + False - ..\packages\MiniProfiler.3.0.11\lib\net40\MiniProfiler.dll + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll False diff --git a/src/Umbraco.Core/app.config b/src/Umbraco.Core/app.config index 44298137ae..8f828418f3 100644 --- a/src/Umbraco.Core/app.config +++ b/src/Umbraco.Core/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config index 3d897fa2a7..55d4c4b8ef 100644 --- a/src/Umbraco.Core/packages.config +++ b/src/Umbraco.Core/packages.config @@ -9,7 +9,7 @@ - + diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config index 042a2885a7..cef2946f32 100644 --- a/src/Umbraco.Tests/App.config +++ b/src/Umbraco.Tests/App.config @@ -128,6 +128,14 @@ + + + + + + + + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index a786e26151..7bccd734e8 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -157,9 +157,9 @@ False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - - ..\packages\MiniProfiler.3.0.11\lib\net40\MiniProfiler.dll - True + + False + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll False diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index 806e288bf8..c206ad9271 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -22,7 +22,7 @@ - + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index bb5f1b8699..7867c5c00f 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -135,13 +135,9 @@ False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + False - ..\packages\MiniProfiler.3.0.11\lib\net40\MiniProfiler.dll - True - - - ..\packages\MiniProfiler.Mvc4.3.0.11\lib\net40\MiniProfiler.Mvc.dll + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll False diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 7f26063331..b52e30edac 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -9,7 +9,6 @@ using System.Web.Http; using System.Web.Mvc; using System.Web.Routing; using ClientDependency.Core.Config; -using StackExchange.Profiling.Mvc; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Dictionary; @@ -95,8 +94,8 @@ namespace Umbraco.Web //set model binder ModelBinders.Binders.Add(new KeyValuePair(typeof(RenderModel), new RenderModelBinder())); - //add the profiling action filter - GlobalFilters.Filters.Add(new ProfilingActionFilter()); + ////add the profiling action filter + //GlobalFilters.Filters.Add(new ProfilingActionFilter()); //Register a custom renderer - used to process property editor dependencies var renderer = new DependencyPathRenderer(); diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index 5bfab3f92e..a86ef1716f 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -18,8 +18,7 @@ - - + diff --git a/src/umbraco.MacroEngines/app.config b/src/umbraco.MacroEngines/app.config index b859ea170a..a2f25c8809 100644 --- a/src/umbraco.MacroEngines/app.config +++ b/src/umbraco.MacroEngines/app.config @@ -14,6 +14,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.datalayer/app.config b/src/umbraco.datalayer/app.config index 44298137ae..8f828418f3 100644 --- a/src/umbraco.datalayer/app.config +++ b/src/umbraco.datalayer/app.config @@ -6,6 +6,14 @@ + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.editorControls/app.config b/src/umbraco.editorControls/app.config index b9e3ef148b..610def5a12 100644 --- a/src/umbraco.editorControls/app.config +++ b/src/umbraco.editorControls/app.config @@ -18,6 +18,10 @@ + + + + \ No newline at end of file