From f83ae489db27cfa844a12750c6f8a0a8ddfaf7bf Mon Sep 17 00:00:00 2001
From: "shannon@ShandemVaio" <unknown@kiln.example.com>
Date: Thu, 19 Jul 2012 22:48:09 +0600
Subject: [PATCH] Fixes remaining circular dependencies and updates the build
 script to not have to manually build these projects seperately :) fixes:
 #U4-77

---
 build/Build.proj                              | 61 -------------------
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  8 +++
 .../umbraco.MacroEngines.csproj               |  5 +-
 .../umbraco.editorControls.csproj             |  3 +-
 4 files changed, 12 insertions(+), 65 deletions(-)

diff --git a/build/Build.proj b/build/Build.proj
index 9396b8f60f..498637ccd4 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -168,67 +168,6 @@
     <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.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>
 
-    <!--     
-    Now, because of all the circular dependencies we need to build those projects and have them dump their DLLs/assets out to the same folder. Really wish this wasn't the case! 
-    These are:    umbraco.editorControls    umbraco.webservices    umbraco.MacroEngines
-    
-    Each of these projects has a post build to put their stuff in the correct location based on the solution and unfortunately for us each 
-    of these projects references the web application! So if we specify an OutDir parameter it will also trigger a web deploy and chuck another
-    website output in bin/_PublishedWebSites folder. we cannot disable this: http://social.msdn.microsoft.com/forums/en-US/tfsbuild/thread/3ec642ad-2e6d-424c-891a-62f6409da62a/
-    so we need to just build the project 'in-place' then copy its output to the SolutionBinFolder    
-    -->
-
-    <!-- MACRO ENGINES -->
-    <Message Text="Compiling MacroEngines project" Importance="high" />
-    <MSBuild Projects="..\src\umbraco.MacroEngines\umbraco.MacroEngines.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
-    </MSBuild>
-    <ItemGroup>
-      <MacroEngineDll Include="..\src\umbraco.MacroEngines\bin\$(BuildConfiguration)\umbraco.MacroEngines.dll"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(MacroEngineDll)"
-          DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
-    <Copy SourceFiles="@(MacroEngineDll)"
-            DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
-
-    <!-- EDITOR CONTROLS -->
-    <Message Text="Compiling editorControls project" Importance="high" />
-    <MSBuild Projects="..\src\umbraco.editorControls\umbraco.editorControls.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
-    </MSBuild>
-    <ItemGroup>
-      <EditorControlsDll Include="..\src\umbraco.editorControls\bin\$(BuildConfiguration)\umbraco.editorControls.dll"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(EditorControlsDll)"
-          DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
-    <Copy SourceFiles="@(EditorControlsDll)"
-            DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
-
-    <!-- WEBSERVICES -->
-    <Message Text="Compiling webservices project" Importance="high" />
-    <MSBuild Projects="..\src\umbraco.webservices\umbraco.webservices.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
-    </MSBuild>
-    <ItemGroup>
-      <WebServicesDll Include="..\src\umbraco.webservices\bin\$(BuildConfiguration)\umbraco.webservices.dll"/>
-      <WebServicesASMX Include="..\src\umbraco.webservices\*.asmx"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(WebServicesDll)"
-          DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
-    <Copy SourceFiles="@(WebServicesDll)"
-          DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>
-    <Copy SourceFiles="@(WebServicesASMX)"
-            DestinationFolder="$(WebAppFolder)\umbraco\webservices\api" OverwriteReadOnlyFiles="True"/>
-
-    <!-- SQLCE4UMBRACO -->
-    <!--<Message Text="Compiling SQLCE4Umbraco project" Importance="high" />
-    <MSBuild Projects="..\src\SQLCE4Umbraco\SQLCE4Umbraco.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
-    </MSBuild>
-    <ItemGroup>
-      <SQLCE4UmbracoDll Include="..\src\SQLCE4Umbraco\bin\$(BuildConfiguration)\SQLCE4Umbraco.dll" />
-    </ItemGroup>
-    <Copy SourceFiles="@(SQLCE4UmbracoDll)"
-          DestinationFolder="$(SolutionBinFolder)" OverwriteReadOnlyFiles="True"/>
-    <Copy SourceFiles="@(SQLCE4UmbracoDll)"
-          DestinationFolder="$(WebAppFolder)\bin" OverwriteReadOnlyFiles="True"/>-->
-
     <!-- DONE -->
     <Message Text="Finished compiling projects" Importance="high" />
   </Target>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b26161b876..6f4ac938d7 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -200,6 +200,14 @@
       <Project>{5BA5425F-27A7-4677-865E-82246498AA2E}</Project>
       <Name>SqlCE4Umbraco</Name>
     </ProjectReference>
+    <ProjectReference Include="..\umbraco.editorControls\umbraco.editorControls.csproj">
+      <Project>{255F5DF1-4E43-4758-AC05-7A0B68EB021B}</Project>
+      <Name>umbraco.editorControls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.MacroEngines\umbraco.MacroEngines.csproj">
+      <Project>{89C09045-1064-466B-B94A-DB3AFE2A5853}</Project>
+      <Name>umbraco.MacroEngines</Name>
+    </ProjectReference>
     <ProjectReference Include="..\umbraco.macroRenderings\umbraco.macroRenderings.csproj">
       <Project>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</Project>
       <Name>umbraco.macroRenderings</Name>
diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
index 3ce0102767..5120e38326 100644
--- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
+++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
@@ -156,9 +156,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetPath)" "$(ProjectDir)..\Umbraco.Web.UI\bin\" /Y /F
-
-</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj
index cfa501e095..44579c7d1d 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -478,6 +478,7 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>xcopy "$(TargetPath)" "$(ProjectDir)..\Umbraco.Web.UI\bin\" /Y /F</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file