From ab758001ef6f7276eade094fa1e34f924e5d438b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 26 Oct 2017 17:52:51 +0200
Subject: [PATCH] Cleanup more build

---
 build/NuSpecs/UmbracoCms.nuspec          |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 38 +++++++++++--
 src/umbraco.presentation.targets         | 69 ------------------------
 src/umbraco.sln                          |  1 -
 4 files changed, 35 insertions(+), 75 deletions(-)
 delete mode 100644 src/umbraco.presentation.targets

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 0ab77a88d1..04cf190c78 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -17,7 +17,7 @@
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
       <dependency id="Newtonsoft.Json" version="[10.0.3, 11.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.12, 9.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.13, 9.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.2, 3.0.0)" />
     </dependencies>
   </metadata>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e846891c91..b5b41d328a 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1011,8 +1011,6 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
   </ProjectExtensions>
 
   <!-- go figure where WebPublishingTasks live -->
-  <Import Project="$(MSBuildProjectDirectory)\..\umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) != true" />
-  <Import Project="$(SolutionDir)umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) == true" />
   <PropertyGroup Condition="$(WebPublishingTasks) == '' and Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll')">
     <WebPublishingTasks>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v15.0\Web\Microsoft.Web.Publishing.Tasks.dll</WebPublishingTasks>
   </PropertyGroup>
@@ -1056,8 +1054,8 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     <CallTarget Targets="BelleBuild" Condition="!Exists('$(ProjectDir)Umbraco\lib') and '$(UmbracoBuild)' == ''" />
   </Target>
 
-  <!-- Clean Belle when cleaning and rebuilding -->
-  <Target Name="CleanBelle" AfterTargets="Clean">
+  <!-- Clean Belle when cleaning and rebuilding, but only in Visual Studio -->
+  <Target Name="CleanBelle" AfterTargets="Clean" Condition="'$(UmbracoBuild)' == ''">
     <Message Text="-CleanBelle-" Importance="high" />
     <Message Text="Nothing to clean, as $(ProjectDir)Umbraco\lib does not exist." Importance="High" Condition="!Exists('$(ProjectDir)Umbraco\lib')" />
     <Message Text="Remove $(ProjectDir)Umbraco\lib." Importance="High" Condition="Exists('$(ProjectDir)Umbraco\lib')" />
@@ -1078,4 +1076,36 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
     <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.2.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.2.0\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
   </Target>
+
+  <ItemGroup>
+    <!-- every *.config (recursive) files xcept web[.*].config -->
+    <!-- beware! includes any rogue git-ignored or temp config file -->
+    <ConfigFiles Include="$(ProjectDir)**\*.config" Exclude="$(ProjectDir)web.config;$(ProjectDir)web.*.config" />
+    <!-- and the UI file -->
+    <ConfigFiles Include="$(ProjectDir)umbraco\config\create\UI.xml" />
+  </ItemGroup>
+
+ <Target Name="ResetConfigFiles" Condition="'$(WebProjectOutputDir)' != ''" BeforeTargets="Build;Rebuild" Inputs="@(ConfigFiles)" Outputs="%(Identity).Dummy">    
+    <PropertyGroup>
+      <!-- the original file eg src/.../umbracoSettings.config -->
+      <OriginalFileName>@(ConfigFiles)</OriginalFileName>
+      <!-- the configuration version of the original file eg src/.../umbracoSettings.Release.config -->
+      <ModifiedFileName>$(OriginalFileName.Replace("%(ConfigFiles.Extension)",".$(Configuration)%(ConfigFiles.Extension)"))</ModifiedFileName>
+      <!-- the target file eg webapp/.../umbracoSettings.config -->
+      <OutputFileName>$(OriginalFileName.Replace("$(ProjectDir)", "$(WebProjectOutputDir)"))</OutputFileName>
+    </PropertyGroup>
+
+    <!-- 
+      for each whatever.config file,
+      if there is a whatever.(Release|Debug).config file,
+      copy it over as whatever.config 
+    -->
+    <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
+
+    <Copy SourceFiles="$(ModifiedFileName)"
+      DestinationFiles="$(OutputFileName)"
+      OverwriteReadOnlyFiles="true"
+      SkipUnchangedFiles="false"
+      Condition="Exists('$(ModifiedFileName)')"/>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/umbraco.presentation.targets b/src/umbraco.presentation.targets
deleted file mode 100644
index 87b0536696..0000000000
--- a/src/umbraco.presentation.targets
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- 
-  ****************************************************
-  VARIABLES 
-  *****************************************************
-  -->
-  
-  <PropertyGroup Condition="$(BuildingInsideVisualStudio) != true">
-    <SolutionRootFolder>$(MSBuildStartupDirectory)\..\src\</SolutionRootFolder>
-    <ConfigEnvironment></ConfigEnvironment>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(BuildingInsideVisualStudio) == true">
-    <SolutionRootFolder>$(SolutionDir)</SolutionRootFolder>
-    <ConfigEnvironment>$(Computername).</ConfigEnvironment>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ProjDir>$(ProjectDir)</ProjDir>
-    <ProjOutputDir>$(WebProjectOutputDir)</ProjOutputDir>
-    <WebConfigSource>$(ProjDir)web.Template.$(ConfigEnvironment)$(Configuration).config</WebConfigSource>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="!Exists('$(WebConfigSource)')">
-    <WebConfigSource>$(ProjDir)web.Template.$(Configuration).config</WebConfigSource>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(ProjOutputDir)'==''">
-    <ProjOutputDir>$(ProjDir)</ProjOutputDir>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="!HasTrailingSlash('$(ProjOutputDir)')">
-    <ProjOutputDir>$(ProjOutputDir)\</ProjOutputDir>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ConfigFiles Include="$(ProjDir)**\*.config" Exclude="$(ProjDir)web.config;$(ProjDir)web.*.config" />
-    <ConfigFiles Include="$(ProjDir)umbraco\config\create\UI.xml"  />
-  </ItemGroup>
-  
-  <!-- 
-  ****************************************************
-  TARGETS 
-  *****************************************************
-  -->
-
-  <Target Name="ResetConfigFiles" Condition="$(ProjDir) != $(ProjOutputDir)" BeforeTargets="Build;Rebuild" Inputs="@(ConfigFiles)" Outputs="%(Identity).Dummy">
-    
-    <PropertyGroup>
-      <OriginalFileName>@(ConfigFiles)</OriginalFileName>
-      <ModifiedFileName>$(OriginalFileName.Replace("%(ConfigFiles.Extension)",".$(Configuration)%(ConfigFiles.Extension)"))</ModifiedFileName>
-      <OutputFileName>$(OriginalFileName.Replace("$(ProjDir)", "$(ProjOutputDir)"))</OutputFileName>
-    </PropertyGroup>
-
-    <Message Text="-ResetConfigFiles-" Importance="high" />
-    <Message Text="$(OriginalFileName)" Importance="high" />
-    <Message Text="$(OutputFileName)" Importance="high" />
-
-    <Copy SourceFiles="$(ModifiedFileName)"
-      DestinationFiles="$(OutputFileName)"
-      OverwriteReadOnlyFiles="true"
-      SkipUnchangedFiles="false"
-      Condition="Exists('$(ModifiedFileName)')"/>
-
-  </Target>
-  
-</Project>
\ No newline at end of file
diff --git a/src/umbraco.sln b/src/umbraco.sln
index c2b0b85d68..9f4f6ba1f4 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4
 		..\build\RevertToCleanInstall.bat = ..\build\RevertToCleanInstall.bat
 		..\build\RevertToEmptyInstall.bat = ..\build\RevertToEmptyInstall.bat
 		SolutionInfo.cs = SolutionInfo.cs
-		umbraco.presentation.targets = umbraco.presentation.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}"