From 5ae9a609544e8cf09a28cf07b41000da28c9ac9e Mon Sep 17 00:00:00 2001
From: "shannon@ShandemVaio.home" <unknown@kiln.example.com>
Date: Wed, 27 Jun 2012 09:07:24 +0400
Subject: [PATCH] Fixed DLL references, fixed build location on editorControls.
 NOTE: need to get the build.bat working with the circular dependency projects
 to get their DLLs and assets into the output build.

---
 build/Build.proj                              | 18 +++++++++++++++-
 src/SHANDEMVAIO.testrunconfig                 |  2 +-
 src/SHOCKING.testrunconfig                    | 10 ---------
 .../umbraco.MacroEngines.csproj               | 17 ++++++---------
 .../umbraco.editorControls.csproj             | 21 ++++++++-----------
 src/umbraco.presentation/web.config           |  4 ++--
 src/umbraco.sln                               |  1 -
 .../umbraco.webservices.csproj                |  3 ++-
 8 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 src/SHOCKING.testrunconfig

diff --git a/build/Build.proj b/build/Build.proj
index cb0f7c5ce2..17f1d1d52e 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -58,8 +58,24 @@
 
     <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.sln" Properties="Configuration=Debug;UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderRelativeToProjects);WebProjectOutputDir=$(WebAppFolderRelativeToProjects)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+    <MSBuild Projects="..\src\umbraco.sln" Properties="Configuration=Release;UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderRelativeToProjects);WebProjectOutputDir=$(WebAppFolderRelativeToProjects)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
     </MSBuild>
+    <!-- 
+    
+    TODO:
+    
+    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, but we may have to create a special build 
+    configuration for each of these to get them to put their files in our build folder or something like that
+    
+    -->
+    
+    
     <Message Text="Finished compiling web project to build\$(BuildFolder)" Importance="high" />
   </Target>
   <!--<Target Name="CopyDefaultPlugins" DependsOnTargets="CompileWeb">
diff --git a/src/SHANDEMVAIO.testrunconfig b/src/SHANDEMVAIO.testrunconfig
index 1c32ed2bc1..06450df892 100644
--- a/src/SHANDEMVAIO.testrunconfig
+++ b/src/SHANDEMVAIO.testrunconfig
@@ -4,7 +4,7 @@
   <Execution>
     <Hosts type="ASP.NET" skipUnhostableTests="false">
       <AspNet name="ASP.NET" executionType="WebDev" urlToTest="http://localhost:59454/">
-        <DevelopmentServer pathToWebSite="C:\Users\Shannon\Documents\Visual Studio 2008\Projects\Umbraco\Branch-4.1\umbraco\presentation" webApplicationRoot="/" />
+        <DevelopmentServer pathToWebSite="C:\Users\shannon\Documents\~Jobs\Umbraco4\src\umbraco.presentation" webApplicationRoot="/" />
       </AspNet>
     </Hosts>
     <TestTypeSpecific>
diff --git a/src/SHOCKING.testrunconfig b/src/SHOCKING.testrunconfig
deleted file mode 100644
index 604440815c..0000000000
--- a/src/SHOCKING.testrunconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TestRunConfiguration name="SHOCKING" id="0317effe-25fb-4c40-99c3-8529bdb6b284" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
-  <Description>This is a default test run configuration for a local test run.</Description>
-  <Hosts type="ASP.NET" skipUnhostableTests="false">
-    <AspNet name="ASP.NET" executionType="WebDev" urlToTest="http://localhost:59454/">
-      <DevelopmentServer pathToWebSite="D:\~CODEPLEXPROJECTS\Umbraco\branches\4.1\umbraco\presentation" webApplicationRoot="/" />
-    </AspNet>
-  </Hosts>
-  <TestTypeSpecific />
-</TestRunConfiguration>
\ No newline at end of file
diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
index f8cf619f04..cf0acf2f75 100644
--- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
+++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
@@ -43,7 +43,7 @@
       <HintPath>..\..\lib\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.3.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\lib\HtmlAgilityPack.dll</HintPath>
+      <HintPath>..\..\lib\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="Lucene.Net">
       <HintPath>..\..\lib\Lucene.Net.dll</HintPath>
@@ -55,15 +55,15 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\WebPages\System.Web.Razor.dll</HintPath>
+      <HintPath>..\..\lib\WebPages\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\WebPages\System.Web.WebPages.dll</HintPath>
+      <HintPath>..\..\lib\WebPages\System.Web.WebPages.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\WebPages\System.Web.WebPages.Razor.dll</HintPath>
+      <HintPath>..\..\lib\WebPages\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
@@ -154,13 +154,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>if $(ConfigurationName) == Debug goto :debug
-
-goto :exit
-
-:debug
-xcopy "$(ProjectDir)bin\debug\umbraco.MacroEngines.*" "$(ProjectDir)..\umbraco.presentation\bin\" /Y/F
-:exit</PostBuildEvent>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\umbraco.presentation\bin\" /Y /F
+</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 5da39583cd..15f5c0096f 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -55,7 +55,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\umbraco\presentation\bin\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -79,7 +79,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\umbraco\presentation\bin\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -134,14 +134,16 @@
       <Name>System.Windows.Forms</Name>
     </Reference>
     <ProjectReference Include="..\umbraco.businesslogic\umbraco.businesslogic.csproj">
-      <Name>umbraco.businesslogic</Name>
       <Project>{E469A9CE-1BEC-423F-AC44-713CD72457EA}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Name>umbraco.businesslogic</Name>
     </ProjectReference>
     <ProjectReference Include="..\umbraco.cms\umbraco.cms.csproj">
-      <Name>umbraco.cms</Name>
       <Project>{CCD75EC3-63DB-4184-B49D-51C1DD337230}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+      <Name>umbraco.cms</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
+      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
+      <Name>umbraco.controls</Name>
     </ProjectReference>
     <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
       <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
@@ -160,10 +162,6 @@
       <Project>{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}</Project>
       <Name>umbraco.macroRenderings</Name>
     </ProjectReference>
-    <ProjectReference Include="..\umbraco.controls\umbraco.controls.csproj">
-      <Project>{6EDD2061-82F2-461B-BB6E-879245A832DE}</Project>
-      <Name>umbraco.controls</Name>
-    </ProjectReference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
@@ -485,7 +483,6 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\umbraco.presentation\bin\" /Y /F</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/umbraco.presentation/web.config b/src/umbraco.presentation/web.config
index 71d13e8df1..d6b9b88172 100644
--- a/src/umbraco.presentation/web.config
+++ b/src/umbraco.presentation/web.config
@@ -91,7 +91,7 @@
   <system.web>
     <httpRuntime requestValidationMode="2.0" />
     <customErrors mode="Off" />
-    <trace enabled="false" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
+    <trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
     <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
     <globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
     <xhtmlConformance mode="Strict" />
@@ -129,7 +129,7 @@
       <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
     </httpHandlers>
 
-    <compilation defaultLanguage="c#" batch="false">
+    <compilation defaultLanguage="c#" debug="true" batch="false">
       <assemblies>
         <!-- ASPNETAJAX -->
         <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
diff --git a/src/umbraco.sln b/src/umbraco.sln
index d84975d83d..7c4cfef841 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -4,7 +4,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		INDIGO64.testrunconfig = INDIGO64.testrunconfig
 		SHANDEMVAIO.testrunconfig = SHANDEMVAIO.testrunconfig
-		SHOCKING.testrunconfig = SHOCKING.testrunconfig
 		umbraco2.vsmdi = umbraco2.vsmdi
 		UMBRACOELISE.testrunconfig = UMBRACOELISE.testrunconfig
 		UMBRACOHUMMER.testrunconfig = UMBRACOHUMMER.testrunconfig
diff --git a/src/umbraco.webservices/umbraco.webservices.csproj b/src/umbraco.webservices/umbraco.webservices.csproj
index deaf511315..e6aadbf9e2 100644
--- a/src/umbraco.webservices/umbraco.webservices.csproj
+++ b/src/umbraco.webservices/umbraco.webservices.csproj
@@ -160,6 +160,7 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>xcopy "$(ProjectDir)*.asmx" "$(ProjectDir)..\umbraco.presentation\umbraco\webservices\api\" /Y</PostBuildEvent>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\umbraco.presentation\bin\" /Y /F
+xcopy "$(ProjectDir)*.asmx" "$(SolutionDir)\umbraco.presentation\umbraco\webservices\api\" /Y /F</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file