From 1c5e2b5f735734ebc1411b89c1bd466c02a80f8d Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 12 Sep 2017 09:02:57 +0200
Subject: [PATCH] No need for UmbracoBuild=True - the build scripts already
 manually build Belle once, this would just cause it to run again during
 MSBuild

---
 build/Modules/Umbraco.Build/Umbraco.Build.psm1 | 6 ------
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj       | 7 ++-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/build/Modules/Umbraco.Build/Umbraco.Build.psm1 b/build/Modules/Umbraco.Build/Umbraco.Build.psm1
index 32803ae8f0..f0c0c24d7c 100644
--- a/build/Modules/Umbraco.Build/Umbraco.Build.psm1
+++ b/build/Modules/Umbraco.Build/Umbraco.Build.psm1
@@ -205,10 +205,7 @@ function Compile-Umbraco
     /p:Verbosity=minimal `
     /t:Clean`;Rebuild `
     /tv:$toolsVersion `
-    /p:UmbracoBuild=True `
     > $tmp\msbuild.umbraco.log
-    
-  # /p:UmbracoBuild tells the csproj that we are building from PS
 }
 
 #
@@ -289,11 +286,8 @@ function Compile-Tests
     /p:Verbosity=minimal `
     /t:Build `
     /tv:$toolsVersion `
-    /p:UmbracoBuild=True `
     /p:NugetPackages=$src\packages `
     > $tmp\msbuild.tests.log
-    
-  # /p:UmbracoBuild tells the csproj that we are building from PS
 }
 
 #
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 28067e5588..842ab8ded2 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2428,14 +2428,11 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     <!-- Create ClientDependency.config file from Template if it doesn't exist -->
     <Copy SourceFiles="$(ProjectDir)Config\ClientDependency.Release.config" DestinationFiles="$(ProjectDir)Config\ClientDependency.config" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="!Exists('$(ProjectDir)Config\ClientDependency.config')" />
     
-    <!-- Only runs if the Belle build folder doesn't yet exist -->
-	<Message Text="Running BelleBuild because UmbracoBuild is '$(UmbracoBuild)', " Importance="High" Condition="'$(UmbracoBuild)' != ''" />
-	<CallTarget Targets="BelleBuild" Condition="'$(UmbracoBuild)' != ''" />
-	
+    <!-- Only runs if the Belle build folder doesn't yet exist -->	
 	<Message Text="Running BelleBuild because $(ProjectDir)\..\Umbraco.Web.UI\Umbraco\lib does not exist" Importance="High" Condition="!Exists('$(ProjectDir)\..\Umbraco.Web.UI\Umbraco\lib')" />
     <CallTarget Targets="BelleBuild" Condition="!Exists('$(ProjectDir)\..\Umbraco.Web.UI\Umbraco\lib')" />
 	
-	<Message Text="Skipping BelleBuild because $(ProjectDir)\..\Umbraco.Web.UI\Umbraco\lib exists and UmbracoBuild is not set" Importance="High" Condition="Exists('$(ProjectDir)\..\Umbraco.Web.UI\Umbraco\lib') and '$(UmbracoBuild)' == ''" />	
+	<Message Text="Skipping BelleBuild because $(ProjectDir)\..\Umbraco.Web.UI\Umbraco\lib exists" Importance="High" Condition="Exists('$(ProjectDir)\..\Umbraco.Web.UI\Umbraco\lib')" />	
   </Target>
   
   <Target Name="AfterBuild">