From 561e85804f8835894d49b3ee1d7f88a44acf5f4d Mon Sep 17 00:00:00 2001
From: "Matt@MBP-PC.Home" <unknown@kiln.example.com>
Date: Wed, 4 Jul 2012 09:56:24 -0100
Subject: [PATCH] Fixed issue with build script overwriting local config files
 when run locally. Now only works if ProjectDir and WebProjectOutputDir are
 different.

---
 build/Build.proj                 |  6 +++++-
 src/umbraco.presentation.targets | 13 ++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/build/Build.proj b/build/Build.proj
index 602fa051f7..0f922cd881 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -28,14 +28,18 @@
     <BuildZipFileNameWebPi>UmbracoWebPi.zip</BuildZipFileNameWebPi>
     <IncludeSymbols>False</IncludeSymbols>
     <BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
+    <BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
     <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
     <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
     <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
     <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
+    <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
     <SolutionBinBuildFolderWildcard>$(SolutionBinFolder)**\*.*</SolutionBinBuildFolderWildcard>
     <SolutionBinBuildFolderExclusionWildcard>$(SolutionBinFolder)**\Web.Template.*;$(SolutionBinFolder)**\*.pdb</SolutionBinBuildFolderExclusionWildcard>
     <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
+    <WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
     <WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
+    <WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
     <WebBuildFolderWildcard>$(WebAppFolder)**\*.*</WebBuildFolderWildcard>
     <WebBuildFolderExclusionWildcard>$(WebAppFolder)**\Web.Template.*;$(WebAppFolder)**\*.pdb</WebBuildFolderExclusionWildcard>
   </PropertyGroup>
@@ -143,7 +147,7 @@
 
     <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
     <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
-    <MSBuild Projects="..\src\umbraco.presentation\umbraco.presentation.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderRelativeToProjects);WebProjectOutputDir=$(WebAppFolderRelativeToProjects)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+    <MSBuild Projects="..\src\umbraco.presentation\umbraco.presentation.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
     </MSBuild>
 
     <!--     
diff --git a/src/umbraco.presentation.targets b/src/umbraco.presentation.targets
index 0b3b391207..2dc67df679 100644
--- a/src/umbraco.presentation.targets
+++ b/src/umbraco.presentation.targets
@@ -18,8 +18,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ProjDir>$(SolutionRootFolder)umbraco.presentation\</ProjDir>
-    <ProjOutputDir>$(WebProjectOutputDir)\</ProjOutputDir>
+    <ProjDir>$(ProjectDir)</ProjDir>
+    <ProjOutputDir>$(WebProjectOutputDir)</ProjOutputDir>
     <WebConfigSource>web.Template.$(ConfigEnvironment)$(Configuration).config</WebConfigSource>
   </PropertyGroup>
 
@@ -31,6 +31,10 @@
     <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"  />
@@ -69,8 +73,11 @@
     <TransformXml Source="web.Template.config" Transform="$(WebConfigSource)" Destination="web.config" />
   </Target>
 
-  <Target Name="ResetConfigFiles" Condition="$(BuildingInsideVisualStudio) != true" BeforeTargets="Build;Rebuild" Inputs="@(ConfigFiles)" Outputs="%(Identity).Dummy">
+  <Target Name="ResetConfigFiles" Condition="$(ProjDir) != $(ProjOutputDir)" BeforeTargets="Build;Rebuild" Inputs="@(ConfigFiles)" Outputs="%(Identity).Dummy">
 
+    <Message Text="$(ProjDir)" Importance="high" />
+    <Message Text="$(ProjOutputDir)" Importance="high" />
+    
     <PropertyGroup>
       <OriginalFileName>@(ConfigFiles)</OriginalFileName>
       <ModifiedFileName>$(OriginalFileName.Replace("%(ConfigFiles.Extension)",".$(Configuration)%(ConfigFiles.Extension)"))</ModifiedFileName>