From 478b7cde425e730542d07aa7059032ca2c16db9e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 28 Nov 2013 10:51:54 +1100
Subject: [PATCH] Removes uGoLive from the core (for now until it is rebuilt
 against v7 )

---
 build/NuSpecs/UmbracoCms.Core.nuspec                |  3 ---
 src/Umbraco.Core/CoreBootManager.cs                 | 10 +++++-----
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj            |  9 ---------
 src/Umbraco.Web.UI/config/BaseRestExtensions.config |  4 ++--
 src/Umbraco.Web.UI/packages.config                  |  1 -
 5 files changed, 7 insertions(+), 20 deletions(-)

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 @@
         <file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
         <file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
         <file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
-        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
-        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
-        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
         <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
         <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
         <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
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<CoreBootManager>("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 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Our.Umbraco.uGoLive">
-      <HintPath>..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.dll</HintPath>
-    </Reference>
-    <Reference Include="Our.Umbraco.uGoLive.47x">
-      <HintPath>..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.47x.dll</HintPath>
-    </Reference>
-    <Reference Include="Our.Umbraco.uGoLive.Checks">
-      <HintPath>..\packages\uGoLive.1.4.0\lib\Our.Umbraco.uGoLive.Checks.dll</HintPath>
-    </Reference>
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BaseRestExtensions>
-	<!--
+	
 	<extension alias="member" type="Umbraco.Web.BaseRest.MemberRest,umbraco">
 		<method name="Login" allowAll="true" />
 		<method name="Logout" allowAll="true" />
@@ -9,7 +9,7 @@
 		<method name="GetCurrentMemberAsXml" allowAll="true" />
 		<method name="SetProperty" allowAll="false" />
 	</extension>
-	-->
+	
 	<!--
 	<extension alias="umbBlog" type="Runway.Blog.Library.Base,Runway.Blog">
 		<method name="CreateComment" returnXml="false" allowAll="true" />
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 8c7ded2b5a..87da8738ae 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -24,6 +24,5 @@
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
   <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
-  <package id="uGoLive" version="1.4.0" targetFramework="net40" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />
 </packages>