diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 0684d3651c..65a19d9089 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -45,9 +45,6 @@ - - - diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs index da81d617c9..3cbafcc08b 100644 --- a/src/Umbraco.Core/CoreBootManager.cs +++ b/src/Umbraco.Core/CoreBootManager.cs @@ -64,7 +64,7 @@ namespace Umbraco.Core InitializeProfilerResolver(); _timer = DisposableTimer.DebugDuration("Umbraco application starting", "Umbraco application startup complete"); - + CreateApplicationCache(); //Create the legacy prop-eds mapping @@ -223,10 +223,7 @@ namespace Umbraco.Core throw new InvalidOperationException("The boot manager has already been completed"); FreezeResolution(); - - //stop the timer and log the output - _timer.Dispose(); - + //call OnApplicationStarting of each application events handler ApplicationEventsResolver.Current.ApplicationEventHandlers .ForEach(x => x.OnApplicationStarted(UmbracoApplication, ApplicationContext)); @@ -244,6 +241,9 @@ namespace Umbraco.Core // we're ready to serve content! ApplicationContext.IsReady = true; + //stop the timer and log the output + _timer.Dispose(); + return this; } diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 74090b00e3..1f7bf68b75 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -155,15 +155,6 @@ False ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll - - ..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.dll - - - ..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.47x.dll - - - ..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.Checks.dll - System diff --git a/src/Umbraco.Web.UI/config/BaseRestExtensions.config b/src/Umbraco.Web.UI/config/BaseRestExtensions.config index 98b271bb3a..72057b4971 100644 --- a/src/Umbraco.Web.UI/config/BaseRestExtensions.config +++ b/src/Umbraco.Web.UI/config/BaseRestExtensions.config @@ -1,6 +1,6 @@  - +