From 6519055d21697a7933bb6f7185a82ee73e2713ae Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 09:16:35 -0100
Subject: [PATCH 01/13] New nant file

---
 default.build | 105 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 74 insertions(+), 31 deletions(-)

diff --git a/default.build b/default.build
index 6be7ce3532..82515352bd 100644
--- a/default.build
+++ b/default.build
@@ -14,7 +14,11 @@
     <property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.6" />
     <property name="root.dir" value="${directory::get-current-directory()}" />
     <property name="source.dir" value="${root.dir}\umbraco\presentation" />
+    
     <property name="build.dir" value="${root.dir}\build" />
+    <property name="build.symbolFiles.dir" value="${root.dir}\SymbolFiles" />
+    <property name="build.macroEnginesIron.dir" value="${root.dir}\umbraco.macroEngines.Iron_build" />
+  
     <property name="dlls.dir" value="${root.dir}\foreign dlls" />
 
     <property name="WebPiAssets.dir" value="${root.dir}\config templates\WebPi" />
@@ -41,8 +45,7 @@
 
     <!-- YUI -->
     <property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
-
-
+  
     <!-- Build source -->
     <target name="build" depends="init">
 
@@ -84,9 +87,54 @@
             <arg value="/p:ToolsVersion=4.0" />
             <arg value="/p:Configuration=${build.configuration}" />
         </exec>
+
+      <call target="buildMacroEnginesIron" />
+
+      <call target="buildSymbolFiles" />
+      
 	</target>
 
 
+  <target name="buildMacroEnginesIron">
+
+    <mkdir dir="${build.macroEnginesIron.dir}" />
+    <mkdir dir="${build.macroEnginesIron.dir}\bin" />
+
+    <copy todir="${build.macroEnginesIron.dir}\bin" overwrite="true">
+      <fileset basedir="${dlls.dir}\DLR 4.0">
+        <include name="*.dll" />
+        <exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
+      </fileset>
+    </copy>
+
+    <copy file="${root.dir}\umbraco.MacroEngines.Iron\bin\${build.configuration}\umbraco.MacroEngines.Iron.dll" tofile="${build.macroEnginesIron.dir}\bin\umbraco.MacroEngines.Iron.dll" failonerror="false" overwrite="true"/>
+    
+  </target>
+
+
+  <target name="buildSymbolFiles">
+
+    <!-- setup symbol files -->
+    <mkdir dir="${build.symbolFiles.dir}" />
+
+    <copy todir="${build.symbolFiles.dir}">
+      <fileset basedir="${build.dir}\bin">
+        <include name="*.xml" />
+        <include name="*.pdb" />
+      </fileset>
+    </copy>
+
+    <copy todir="${build.symbolFiles.dir}">
+      <fileset basedir="${docs.dir}">
+        <include name="*.xml" />
+      </fileset>
+    </copy>
+    
+  </target>  
+  
+  
+  
+
     <!-- Directories and files -->
     <target name="directories" depends="build">
 
@@ -108,13 +156,15 @@
             </fileset>
         </delete>
                 
+      <!--
         <copy todir="${build.dir}\bin" overwrite="true">
             <fileset basedir="${dlls.dir}\DLR 4.0">
                 <include name="*.dll" />
                 <exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
             </fileset>
         </copy>
-        
+        -->
+      
         <!--standard web.config-->
         <copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
 
@@ -133,13 +183,14 @@
         <copy file="${root.dir}\config templates\config\ClientDependency.config" tofile="${build.dir}\config\ClientDependency.config" failonerror="false" overwrite="true"/>
         <copy file="${root.dir}\config templates\config\ExamineSettings.config" tofile="${build.dir}\config\ExamineSettings.config" failonerror="false" overwrite="true"/>
         <copy file="${root.dir}\config templates\config\ExamineIndex.config" tofile="${build.dir}\config\ExamineIndex.config" failonerror="false" overwrite="true"/>
+        
         <copy file="${root.dir}\config templates\config\scripting.config" tofile="${build.dir}\config\scripting.config" failonerror="false" overwrite="true"/>
                 
         
         <!-- Macro engines files + razor Files -->
         <copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.dll" tofile="${build.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
         <copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.pdb" tofile="${build.dir}\bin\umbraco.MacroEngines.pdb" failonerror="false" overwrite="true"/>
-		<copy todir="${build.dir}\bin" overwrite="true">
+		    <copy todir="${build.dir}\bin" overwrite="true">
             <fileset basedir="${dlls.dir}\WebPages">
                 <include name="*.dll" />
             </fileset>
@@ -234,33 +285,6 @@
 
     
 
-    <!-- Minify -->
-    <target name="minify" description="minify JS files" depends="directories">
-        <fileset basedir="${build.dir}" id="jsFileSet">
-            <include name="umbraco/css/*.css"/>
-            <include name="umbraco/js/**/*.js"/>
-
-            <include name="umbraco_client/**/*.js"/>
-            <include name="umbraco_client/**/*.css"/>
-        </fileset>
-
-        <property name="js_files" value=""/>
-        <foreach item="File" property="file">
-            <in>
-                <items refid="jsFileSet"/>
-            </in>
-            <do>
-                <exec program="java" workingdir="${YUICompressor.dir}" failonerror="false">
-                    <arg value="-jar" />
-                    <arg value="yuicompressor.jar" />
-                    <arg value="-o" />
-                    <arg value="${file}.min" />
-                    <arg value="${file}" />
-                </exec>
-                <move file="${file}.min" tofile="${file}" overwrite="true" failonerror="false"/>
-            </do>
-        </foreach>
-    </target>
 
     <!-- Documentation -->
     <target name="documentation" depends="directories">
@@ -348,15 +372,34 @@
                 <include name="build/**/*" />
             </fileset>
         </zip>
+
+      <zip zipfile="${root.dir}\SymbolFiles.zip" includeemptydirs="true" >
+        <fileset basedir="${root.dir}">
+          <include name="SymbolFiles/*" />
+          <include name="SymbolFiles/**/*" />
+        </fileset>
+      </zip>
+
+      <zip zipfile="${root.dir}\Umbraco.MacroEngines.Iron.zip" includeemptydirs="true" >
+        <fileset basedir="${root.dir}">
+          <include name="umbraco.macroEngines.Iron_build/*" />
+          <include name="umbraco.macroEngines.Iron_build/**/*" />
+        </fileset>
+      </zip>
     </target>
 
+  
     <!-- do a nightly build without the minification and docs -->
     <target name="nightly" depends="zip">
         <property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
         <property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
 
         <mkdir dir="${public.dir}\${build.version}" />
+        
         <copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
+        <copy file="${root.dir}\Umbraco.MacroEngines.Iron.zip" tofile="${public.dir}\${build.version}\Umbraco.MacroEngines.Iron.zip" />
+        <copy file="${root.dir}\SymbolFiles.zip" tofile="${public.dir}\${build.version}\SymbolFiles.zip" />
+      
     </target>
 
     <!-- will produce the a clean /build folder and nothing else-->

From dbc8a0762897d2602b16d32b0ca0e2d30453585a Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 09:21:22 -0100
Subject: [PATCH 02/13] sdsad

---
 umbraco.sln                     | 201 --------------------------
 umbraco/presentation/web.config | 242 --------------------------------
 2 files changed, 443 deletions(-)
 delete mode 100644 umbraco.sln
 delete mode 100644 umbraco/presentation/web.config

diff --git a/umbraco.sln b/umbraco.sln
deleted file mode 100644
index 0f4e59c558..0000000000
--- a/umbraco.sln
+++ /dev/null
@@ -1,201 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0242771-6DE6-4E03-BD3A-7B79BA79105B}"
-	ProjectSection(SolutionItems) = preProject
-		aspnet35.build = aspnet35.build
-		build.xml = build.xml
-		default.build = default.build
-		INDIGO64.testrunconfig = INDIGO64.testrunconfig
-		SHANDEMVAIO.testrunconfig = SHANDEMVAIO.testrunconfig
-		SHOCKING.testrunconfig = SHOCKING.testrunconfig
-		umbraco weekly.build = umbraco weekly.build
-		umbraco.build = umbraco.build
-		umbraco2.vsmdi = umbraco2.vsmdi
-		UMBRACOELISE.testrunconfig = UMBRACOELISE.testrunconfig
-		UMBRACOHUMMER.testrunconfig = UMBRACOHUMMER.testrunconfig
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StandardConfig", "StandardConfig", "{B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7}"
-	ProjectSection(SolutionItems) = preProject
-		aspnet35.config = aspnet35.config
-		config templates\config\UI.xml = config templates\config\UI.xml
-		config templates\umbraco.config = config templates\umbraco.config
-		config templates\config\umbracoSettings.config = config templates\config\umbracoSettings.config
-		config templates\config\UrlRewriting.config = config templates\config\UrlRewriting.config
-		config templates\web.config = config templates\web.config
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{5BB61485-B480-4A03-A8DD-1636A5AF575C}"
-	ProjectSection(SolutionItems) = preProject
-		config templates\packages\createdPackages.config = config templates\packages\createdPackages.config
-		config templates\packages\installedPackages.config = config templates\packages\installedPackages.config
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{05329DB0-5C47-44A1-B7B8-BF377446BCD1}"
-	ProjectSection(SolutionItems) = preProject
-		config templates\config\404handlers.config = config templates\config\404handlers.config
-		config templates\config\ClientDependency.config = config templates\config\ClientDependency.config
-		config templates\config\ExamineIndex.config = config templates\config\ExamineIndex.config
-		config templates\config\ExamineSettings.config = config templates\config\ExamineSettings.config
-		config templates\config\formHandlers.config = config templates\config\formHandlers.config
-		config templates\config\metablogConfig.config = config templates\config\metablogConfig.config
-		config templates\config\restExtensions.config = config templates\config\restExtensions.config
-		config templates\config\scripting.config = config templates\config\scripting.config
-		config templates\config\tinyMceConfig.config = config templates\config\tinyMceConfig.config
-		config templates\config\umbracoSettings.config = config templates\config\umbracoSettings.config
-		config templates\config\UrlRewriting.config = config templates\config\UrlRewriting.config
-		config templates\config\xsltExtensions.config = config templates\config\xsltExtensions.config
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{58072405-85D0-45CA-8F5C-EA8928C32A6A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Upgrade 4.1", "Upgrade 4.1", "{C5FA9596-B9DC-4DF9-8380-AFC19C1EF51F}"
-	ProjectSection(SolutionItems) = preProject
-		UpgradeReadme.txt = UpgradeReadme.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLLs", "DLLs", "{F06D18F6-C510-4CBA-9514-0F890FD62103}"
-	ProjectSection(SolutionItems) = preProject
-		foreign dlls\ClientDependency.Core.dll = foreign dlls\ClientDependency.Core.dll
-		foreign dlls\CookComputing.XmlRpcV2.dll = foreign dlls\CookComputing.XmlRpcV2.dll
-		foreign dlls\Examine.dll = foreign dlls\Examine.dll
-		foreign dlls\HtmlAgilityPack.dll = foreign dlls\HtmlAgilityPack.dll
-		foreign dlls\ICSharpCode.SharpZipLib.dll = foreign dlls\ICSharpCode.SharpZipLib.dll
-		foreign dlls\IronMath.dll = foreign dlls\IronMath.dll
-		IronPython License.Rtf = IronPython License.Rtf
-		License.txt = License.txt
-		foreign dlls\Microsoft.ApplicationBlocks.Data.dll = foreign dlls\Microsoft.ApplicationBlocks.Data.dll
-		foreign dlls\WebPages\Microsoft.Web.Infrastructure.dll = foreign dlls\WebPages\Microsoft.Web.Infrastructure.dll
-		foreign dlls\MySql.Data.dll = foreign dlls\MySql.Data.dll
-		foreign dlls\TidyNet.dll = foreign dlls\TidyNet.dll
-		foreign dlls\UmbracoExamine.dll = foreign dlls\UmbracoExamine.dll
-		foreign dlls\UrlRewritingNet.UrlRewriter.dll = foreign dlls\UrlRewritingNet.UrlRewriter.dll
-		foreign dlls\VistaDB For Umbraco.dll = foreign dlls\VistaDB For Umbraco.dll
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.presentation", "umbraco\presentation\umbraco.presentation.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.businesslogic", "umbraco\businesslogic\umbraco.businesslogic.csproj", "{E469A9CE-1BEC-423F-AC44-713CD72457EA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.cms", "umbraco\cms\umbraco.cms.csproj", "{CCD75EC3-63DB-4184-B49D-51C1DD337230}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.interfaces", "umbraco\interfaces\umbraco.interfaces.csproj", "{511F6D8D-7717-440A-9A57-A507E9A8B27F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.editorControls", "components\editorControls\umbraco.editorControls.csproj", "{255F5DF1-4E43-4758-AC05-7A0B68EB021B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.macroRenderings", "components\macroRenderings\umbraco.macroRenderings.csproj", "{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.providers", "umbraco\providers\umbraco.providers.csproj", "{D7636876-0756-43CB-A192-138C6F0D5E42}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.datalayer", "umbraco\datalayer\umbraco.datalayer.csproj", "{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.controls", "components\umbraco.controls\umbraco.controls.csproj", "{6EDD2061-82F2-461B-BB6E-879245A832DE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.webservices", "components\umbraco.webservices\umbraco.webservices.csproj", "{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.Linq.Core", "LinqToUmbraco\src\umbraco.Linq\Core\umbraco.Linq.Core.csproj", "{31CAEC36-0C3D-4D69-B092-84866811EA07}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.Legacy", "umbraco\umbraco.Legacy\umbraco.Legacy.csproj", "{27A2590E-1313-4A33-89FD-92811540B69C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.Test", "umbraco.Test\umbraco.Test.csproj", "{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{19400916-4F71-45A0-B0E0-F9BE406D7772}"
-	ProjectSection(SolutionItems) = preProject
-		assets\Umbraco.sdf = assets\Umbraco.sdf
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlCE4Umbraco", "components\SQLCE4Umbraco\SqlCE4Umbraco.csproj", "{5BA5425F-27A7-4677-865E-82246498AA2E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Legacy", "umbraco.MacroEngines\umbraco.MacroEngines.Legacy.csproj", "{6AE67079-2C00-476C-81DE-2800D1AC14BC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines", "umbraco.MacroEngines.Juno\umbraco.MacroEngines.csproj", "{89C09045-1064-466B-B94A-DB3AFE2A5853}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebPi", "WebPi", "{AA6839DD-07D5-4277-915D-8C9290A36D5B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Iron", "umbraco.MacroEngines.Iron\umbraco.MacroEngines.Iron.csproj", "{98CBA7E2-1B62-497C-8AA3-B868704068D7}"
-EndProject
-Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = umbraco2.vsmdi
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{651E1350-91B6-44B7-BD60-7207006D7003}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{651E1350-91B6-44B7-BD60-7207006D7003}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCD75EC3-63DB-4184-B49D-51C1DD337230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCD75EC3-63DB-4184-B49D-51C1DD337230}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCD75EC3-63DB-4184-B49D-51C1DD337230}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCD75EC3-63DB-4184-B49D-51C1DD337230}.Release|Any CPU.Build.0 = Release|Any CPU
-		{511F6D8D-7717-440A-9A57-A507E9A8B27F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{511F6D8D-7717-440A-9A57-A507E9A8B27F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{511F6D8D-7717-440A-9A57-A507E9A8B27F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{511F6D8D-7717-440A-9A57-A507E9A8B27F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7636876-0756-43CB-A192-138C6F0D5E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7636876-0756-43CB-A192-138C6F0D5E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7636876-0756-43CB-A192-138C6F0D5E42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7636876-0756-43CB-A192-138C6F0D5E42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EDD2061-82F2-461B-BB6E-879245A832DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EDD2061-82F2-461B-BB6E-879245A832DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EDD2061-82F2-461B-BB6E-879245A832DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EDD2061-82F2-461B-BB6E-879245A832DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31CAEC36-0C3D-4D69-B092-84866811EA07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31CAEC36-0C3D-4D69-B092-84866811EA07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31CAEC36-0C3D-4D69-B092-84866811EA07}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31CAEC36-0C3D-4D69-B092-84866811EA07}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27A2590E-1313-4A33-89FD-92811540B69C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27A2590E-1313-4A33-89FD-92811540B69C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BA5425F-27A7-4677-865E-82246498AA2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BA5425F-27A7-4677-865E-82246498AA2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BA5425F-27A7-4677-865E-82246498AA2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BA5425F-27A7-4677-865E-82246498AA2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AE67079-2C00-476C-81DE-2800D1AC14BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AE67079-2C00-476C-81DE-2800D1AC14BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
-		{58072405-85D0-45CA-8F5C-EA8928C32A6A} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
-		{F06D18F6-C510-4CBA-9514-0F890FD62103} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
-		{19400916-4F71-45A0-B0E0-F9BE406D7772} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
-		{AA6839DD-07D5-4277-915D-8C9290A36D5B} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
-		{5BB61485-B480-4A03-A8DD-1636A5AF575C} = {B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7}
-		{05329DB0-5C47-44A1-B7B8-BF377446BCD1} = {B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7}
-		{C5FA9596-B9DC-4DF9-8380-AFC19C1EF51F} = {58072405-85D0-45CA-8F5C-EA8928C32A6A}
-	EndGlobalSection
-EndGlobal
diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config
deleted file mode 100644
index 6d8e33b4d3..0000000000
--- a/umbraco/presentation/web.config
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <!--
-      <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
-    
-
-      ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
-      USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
-      -->
-    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
-          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
-        </sectionGroup>
-      </sectionGroup>
-    </sectionGroup>-->
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    </sectionGroup>
-    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
-    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
-    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-    <!-- End of added in Umbraco 4.6.2 -->
-  </configSections>
-  <urlrewritingnet configSource="config\UrlRewriting.config" />
-  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
-  <clientDependency configSource="config\ClientDependency.config" />
-  <Examine configSource="config\ExamineSettings.config" />
-  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-  <appSettings>
-    <add key="umbracoDbDSN" value="server=ssaolap01;database=umbracodev;integrated security=false;user id=dev;pwd=dev" />
-    <add key="umbracoConfigurationStatus" value="4.6.1" />
-    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
-    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
-    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
-    <add key="umbracoStorageDirectory" value="~/App_Data" />
-    <add key="umbracoPath" value="~/umbraco" />
-    <add key="umbracoEnableStat" value="false" />
-    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
-    <add key="umbracoEditXhtmlMode" value="true" />
-    <add key="umbracoUseDirectoryUrls" value="false" />
-    <add key="umbracoDebugMode" value="true" />
-    <add key="umbracoTimeOutInMinutes" value="20" />
-    <add key="umbracoVersionCheckPeriod" value="7" />
-    <add key="umbracoDisableXsltExtensions" value="true" />
-    <add key="umbracoDefaultUILanguage" value="en" />
-    <add key="umbracoProfileUrl" value="profiler" />
-    <add key="umbracoUseSSL" value="false" />
-    <add key="umbracoUseMediumTrust" value="false" />
-    <!-- 
-      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
-      Alex Norcliffe 2010 02 for 4.1
-    -->
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-    <!-- Added in Umbraco 4.6.2 -->
-    <add key="webPages:Enabled" value="false" />
-    <add key="enableSimpleMembership" value="false" />
-    <add key="autoFormsAuthentication" value="false" />
-    <!-- End of added in Umbraco 4.6.2 -->
-  </appSettings>
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <httpRuntime requestValidationMode="2.0" />
-    <customErrors mode="Off" />
-    <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" />
-    <pages enableEventValidation="false">
-      <!-- ASPNETAJAX -->
-      <controls>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      </controls>
-    </pages>
-    <httpModules>
-      <!-- URL REWRTIER -->
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <!-- UMBRACO -->
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
-      <!-- ASPNETAJAX -->
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <!-- CLIENT DEPENDENCY -->
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </httpModules>
-    <httpHandlers>
-      <remove verb="*" path="*.asmx" />
-      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-      <!-- UMBRACO CHANNELS -->
-      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <!-- CLIENT DEPENDENCY -->
-      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <!-- SPELL CHECKER -->
-      <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </httpHandlers>
-    <compilation defaultLanguage="c#" debug="true" batch="false">
-      <assemblies>
-        <!-- ASPNETAJAX -->
-        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
-        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
-        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
-      </assemblies>
-      <!-- Added in Umbraco 4.6.2 -->
-      <buildProviders>
-        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
-      </buildProviders>
-      <!-- End of added in Umbraco 4.6.2 -->
-    </compilation>
-    <authentication mode="Forms">
-      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
-    </authentication>
-    <authorization>
-      <allow users="?" />
-    </authorization>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-      <providers>
-        <clear />
-        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
-        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
-      </providers>
-    </membership>
-    <!-- added by NH to support membership providers in access layer -->
-    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
-      <providers>
-        <clear />
-        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
-      </providers>
-    </roleManager>
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <modules>
-      <remove name="ScriptModule" />
-      <remove name="UrlRewriteModule" />
-      <remove name="umbracoRequestModule" />
-      <remove name="viewstateMoverModule" />
-      <remove name="umbracoBaseRequestModule" />
-      <remove name="ClientDependencyModule" />
-      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
-      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
-      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-    </modules>
-    <handlers accessPolicy="Read, Write, Script, Execute">
-      <remove name="WebServiceHandlerFactory-Integrated" />
-      <remove name="ScriptHandlerFactory" />
-      <remove name="ScriptHandlerFactoryAppServices" />
-      <remove name="ScriptResource" />
-      <remove name="Channels" />
-      <remove name="Channels_Word" />
-      <remove name="ClientDependency" />
-      <remove name="SpellChecker" />
-      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
-      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
-      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
-    </handlers>
-    <staticContent>
-      <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
-    </staticContent>
-  </system.webServer>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
-        <providerOption name="CompilerVersion" value="v3.5" />
-        <providerOption name="WarnAsError" value="false" />
-      </compiler>
-    </compilers>
-  </system.codedom>
-  <runtime>
-    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
--->
-  </runtime>
-  <!-- Added in Umbraco 4.6.2 -->
-  <system.web.webPages.razor>
-    <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines" />
-    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
-      <namespaces>
-        <add namespace="Microsoft.Web.Helpers" />
-        <add namespace="umbraco" />
-        <add namespace="Examine" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-  <!-- End of added in Umbraco 4.6.2 -->
-</configuration>
\ No newline at end of file

From 50f917093533af0f49d7e52638020d1b1dc8768b Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 09:22:32 -0100
Subject: [PATCH 03/13] sdasda

---
 umbraco.sln | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 200 insertions(+)
 create mode 100644 umbraco.sln

diff --git a/umbraco.sln b/umbraco.sln
new file mode 100644
index 0000000000..f41144e7b7
--- /dev/null
+++ b/umbraco.sln
@@ -0,0 +1,200 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0242771-6DE6-4E03-BD3A-7B79BA79105B}"
+	ProjectSection(SolutionItems) = preProject
+		aspnet35.build = aspnet35.build
+		build.xml = build.xml
+		default.build = default.build
+		INDIGO64.testrunconfig = INDIGO64.testrunconfig
+		SHANDEMVAIO.testrunconfig = SHANDEMVAIO.testrunconfig
+		SHOCKING.testrunconfig = SHOCKING.testrunconfig
+		umbraco weekly.build = umbraco weekly.build
+		umbraco.build = umbraco.build
+		umbraco2.vsmdi = umbraco2.vsmdi
+		UMBRACOELISE.testrunconfig = UMBRACOELISE.testrunconfig
+		UMBRACOHUMMER.testrunconfig = UMBRACOHUMMER.testrunconfig
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StandardConfig", "StandardConfig", "{B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7}"
+	ProjectSection(SolutionItems) = preProject
+		aspnet35.config = aspnet35.config
+		config templates\config\UI.xml = config templates\config\UI.xml
+		config templates\umbraco.config = config templates\umbraco.config
+		config templates\config\umbracoSettings.config = config templates\config\umbracoSettings.config
+		config templates\config\UrlRewriting.config = config templates\config\UrlRewriting.config
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{5BB61485-B480-4A03-A8DD-1636A5AF575C}"
+	ProjectSection(SolutionItems) = preProject
+		config templates\packages\createdPackages.config = config templates\packages\createdPackages.config
+		config templates\packages\installedPackages.config = config templates\packages\installedPackages.config
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{05329DB0-5C47-44A1-B7B8-BF377446BCD1}"
+	ProjectSection(SolutionItems) = preProject
+		config templates\config\404handlers.config = config templates\config\404handlers.config
+		config templates\config\ClientDependency.config = config templates\config\ClientDependency.config
+		config templates\config\ExamineIndex.config = config templates\config\ExamineIndex.config
+		config templates\config\ExamineSettings.config = config templates\config\ExamineSettings.config
+		config templates\config\formHandlers.config = config templates\config\formHandlers.config
+		config templates\config\metablogConfig.config = config templates\config\metablogConfig.config
+		config templates\config\restExtensions.config = config templates\config\restExtensions.config
+		config templates\config\scripting.config = config templates\config\scripting.config
+		config templates\config\tinyMceConfig.config = config templates\config\tinyMceConfig.config
+		config templates\config\umbracoSettings.config = config templates\config\umbracoSettings.config
+		config templates\config\UrlRewriting.config = config templates\config\UrlRewriting.config
+		config templates\config\xsltExtensions.config = config templates\config\xsltExtensions.config
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{58072405-85D0-45CA-8F5C-EA8928C32A6A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Upgrade 4.1", "Upgrade 4.1", "{C5FA9596-B9DC-4DF9-8380-AFC19C1EF51F}"
+	ProjectSection(SolutionItems) = preProject
+		UpgradeReadme.txt = UpgradeReadme.txt
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLLs", "DLLs", "{F06D18F6-C510-4CBA-9514-0F890FD62103}"
+	ProjectSection(SolutionItems) = preProject
+		foreign dlls\ClientDependency.Core.dll = foreign dlls\ClientDependency.Core.dll
+		foreign dlls\CookComputing.XmlRpcV2.dll = foreign dlls\CookComputing.XmlRpcV2.dll
+		foreign dlls\Examine.dll = foreign dlls\Examine.dll
+		foreign dlls\HtmlAgilityPack.dll = foreign dlls\HtmlAgilityPack.dll
+		foreign dlls\ICSharpCode.SharpZipLib.dll = foreign dlls\ICSharpCode.SharpZipLib.dll
+		foreign dlls\IronMath.dll = foreign dlls\IronMath.dll
+		IronPython License.Rtf = IronPython License.Rtf
+		License.txt = License.txt
+		foreign dlls\Microsoft.ApplicationBlocks.Data.dll = foreign dlls\Microsoft.ApplicationBlocks.Data.dll
+		foreign dlls\WebPages\Microsoft.Web.Infrastructure.dll = foreign dlls\WebPages\Microsoft.Web.Infrastructure.dll
+		foreign dlls\MySql.Data.dll = foreign dlls\MySql.Data.dll
+		foreign dlls\TidyNet.dll = foreign dlls\TidyNet.dll
+		foreign dlls\UmbracoExamine.dll = foreign dlls\UmbracoExamine.dll
+		foreign dlls\UrlRewritingNet.UrlRewriter.dll = foreign dlls\UrlRewritingNet.UrlRewriter.dll
+		foreign dlls\VistaDB For Umbraco.dll = foreign dlls\VistaDB For Umbraco.dll
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.presentation", "umbraco\presentation\umbraco.presentation.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.businesslogic", "umbraco\businesslogic\umbraco.businesslogic.csproj", "{E469A9CE-1BEC-423F-AC44-713CD72457EA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.cms", "umbraco\cms\umbraco.cms.csproj", "{CCD75EC3-63DB-4184-B49D-51C1DD337230}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.interfaces", "umbraco\interfaces\umbraco.interfaces.csproj", "{511F6D8D-7717-440A-9A57-A507E9A8B27F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.editorControls", "components\editorControls\umbraco.editorControls.csproj", "{255F5DF1-4E43-4758-AC05-7A0B68EB021B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.macroRenderings", "components\macroRenderings\umbraco.macroRenderings.csproj", "{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.providers", "umbraco\providers\umbraco.providers.csproj", "{D7636876-0756-43CB-A192-138C6F0D5E42}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.datalayer", "umbraco\datalayer\umbraco.datalayer.csproj", "{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.controls", "components\umbraco.controls\umbraco.controls.csproj", "{6EDD2061-82F2-461B-BB6E-879245A832DE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.webservices", "components\umbraco.webservices\umbraco.webservices.csproj", "{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.Linq.Core", "LinqToUmbraco\src\umbraco.Linq\Core\umbraco.Linq.Core.csproj", "{31CAEC36-0C3D-4D69-B092-84866811EA07}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.Legacy", "umbraco\umbraco.Legacy\umbraco.Legacy.csproj", "{27A2590E-1313-4A33-89FD-92811540B69C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.Test", "umbraco.Test\umbraco.Test.csproj", "{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{19400916-4F71-45A0-B0E0-F9BE406D7772}"
+	ProjectSection(SolutionItems) = preProject
+		assets\Umbraco.sdf = assets\Umbraco.sdf
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlCE4Umbraco", "components\SQLCE4Umbraco\SqlCE4Umbraco.csproj", "{5BA5425F-27A7-4677-865E-82246498AA2E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Legacy", "umbraco.MacroEngines\umbraco.MacroEngines.Legacy.csproj", "{6AE67079-2C00-476C-81DE-2800D1AC14BC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines", "umbraco.MacroEngines.Juno\umbraco.MacroEngines.csproj", "{89C09045-1064-466B-B94A-DB3AFE2A5853}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebPi", "WebPi", "{AA6839DD-07D5-4277-915D-8C9290A36D5B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Iron", "umbraco.MacroEngines.Iron\umbraco.MacroEngines.Iron.csproj", "{98CBA7E2-1B62-497C-8AA3-B868704068D7}"
+EndProject
+Global
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = umbraco2.vsmdi
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{651E1350-91B6-44B7-BD60-7207006D7003}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{651E1350-91B6-44B7-BD60-7207006D7003}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E469A9CE-1BEC-423F-AC44-713CD72457EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCD75EC3-63DB-4184-B49D-51C1DD337230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCD75EC3-63DB-4184-B49D-51C1DD337230}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCD75EC3-63DB-4184-B49D-51C1DD337230}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCD75EC3-63DB-4184-B49D-51C1DD337230}.Release|Any CPU.Build.0 = Release|Any CPU
+		{511F6D8D-7717-440A-9A57-A507E9A8B27F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{511F6D8D-7717-440A-9A57-A507E9A8B27F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{511F6D8D-7717-440A-9A57-A507E9A8B27F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{511F6D8D-7717-440A-9A57-A507E9A8B27F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{255F5DF1-4E43-4758-AC05-7A0B68EB021B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7636876-0756-43CB-A192-138C6F0D5E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7636876-0756-43CB-A192-138C6F0D5E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7636876-0756-43CB-A192-138C6F0D5E42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7636876-0756-43CB-A192-138C6F0D5E42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EDD2061-82F2-461B-BB6E-879245A832DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EDD2061-82F2-461B-BB6E-879245A832DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EDD2061-82F2-461B-BB6E-879245A832DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EDD2061-82F2-461B-BB6E-879245A832DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31CAEC36-0C3D-4D69-B092-84866811EA07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31CAEC36-0C3D-4D69-B092-84866811EA07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31CAEC36-0C3D-4D69-B092-84866811EA07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31CAEC36-0C3D-4D69-B092-84866811EA07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27A2590E-1313-4A33-89FD-92811540B69C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27A2590E-1313-4A33-89FD-92811540B69C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BA5425F-27A7-4677-865E-82246498AA2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BA5425F-27A7-4677-865E-82246498AA2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BA5425F-27A7-4677-865E-82246498AA2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BA5425F-27A7-4677-865E-82246498AA2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AE67079-2C00-476C-81DE-2800D1AC14BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AE67079-2C00-476C-81DE-2800D1AC14BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89C09045-1064-466B-B94A-DB3AFE2A5853}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98CBA7E2-1B62-497C-8AA3-B868704068D7}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
+		{58072405-85D0-45CA-8F5C-EA8928C32A6A} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
+		{F06D18F6-C510-4CBA-9514-0F890FD62103} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
+		{19400916-4F71-45A0-B0E0-F9BE406D7772} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
+		{AA6839DD-07D5-4277-915D-8C9290A36D5B} = {F0242771-6DE6-4E03-BD3A-7B79BA79105B}
+		{5BB61485-B480-4A03-A8DD-1636A5AF575C} = {B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7}
+		{05329DB0-5C47-44A1-B7B8-BF377446BCD1} = {B8ECDB8B-BF44-462C-B6DA-22421B3EC4D7}
+		{C5FA9596-B9DC-4DF9-8380-AFC19C1EF51F} = {58072405-85D0-45CA-8F5C-EA8928C32A6A}
+	EndGlobalSection
+EndGlobal

From f1b904ecc46534d5164bb1b54a95eba6ca7048f9 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 09:23:21 -0100
Subject: [PATCH 04/13] web.config

---
 umbraco/presentation/web.config | 242 ++++++++++++++++++++++++++++++++
 1 file changed, 242 insertions(+)
 create mode 100644 umbraco/presentation/web.config

diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config
new file mode 100644
index 0000000000..1308072404
--- /dev/null
+++ b/umbraco/presentation/web.config
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
+    <!--
+      <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
+    
+
+      ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
+      USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX
+      -->
+    <!--<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+        <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+        <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+          <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
+          <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+          <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+          <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
+        </sectionGroup>
+      </sectionGroup>
+    </sectionGroup>-->
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
+    <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
+    <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
+    <section name="ExamineLuceneIndexSets" type="UmbracoExamine.Config.ExamineLuceneIndexes, UmbracoExamine" requirePermission="false" />
+    <!-- Added in Umbraco 4.6.2 -->
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+    </sectionGroup>
+    <!-- End of added in Umbraco 4.6.2 -->
+  </configSections>
+  <urlrewritingnet configSource="config\UrlRewriting.config" />
+  <!-- <microsoft.scripting configSource="config\scripting.config" />-->
+  <clientDependency configSource="config\ClientDependency.config" />
+  <Examine configSource="config\ExamineSettings.config" />
+  <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
+  <appSettings>
+    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=v46;user id=umbracouser;password=farmer" />
+    <add key="umbracoConfigurationStatus" value="" />
+    <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
+    <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
+    <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
+    <add key="umbracoStorageDirectory" value="~/App_Data" />
+    <add key="umbracoPath" value="~/umbraco" />
+    <add key="umbracoEnableStat" value="false" />
+    <add key="umbracoHideTopLevelNodeFromPath" value="true" />
+    <add key="umbracoEditXhtmlMode" value="true" />
+    <add key="umbracoUseDirectoryUrls" value="false" />
+    <add key="umbracoDebugMode" value="true" />
+    <add key="umbracoTimeOutInMinutes" value="20" />
+    <add key="umbracoVersionCheckPeriod" value="7" />
+    <add key="umbracoDisableXsltExtensions" value="true" />
+    <add key="umbracoDefaultUILanguage" value="en" />
+    <add key="umbracoProfileUrl" value="profiler" />
+    <add key="umbracoUseSSL" value="false" />
+    <add key="umbracoUseMediumTrust" value="false" />
+    <!-- 
+      Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS 
+      Alex Norcliffe 2010 02 for 4.1
+    -->
+    <add key="umbracoContentXMLUseLocalTemp" value="false" />
+    <!-- Added in Umbraco 4.6.2 -->
+    <add key="webPages:Enabled" value="false" />
+    <add key="enableSimpleMembership" value="false" />
+    <add key="autoFormsAuthentication" value="false" />
+    <!-- End of added in Umbraco 4.6.2 -->
+  </appSettings>
+  <system.net>
+    <mailSettings>
+      <smtp>
+        <network host="127.0.0.1" userName="username" password="password" />
+      </smtp>
+    </mailSettings>
+  </system.net>
+  <connectionStrings>
+    <remove name="LocalSqlServer" />
+    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
+  </connectionStrings>
+  <system.web>
+    <httpRuntime requestValidationMode="2.0" />
+    <customErrors mode="Off" />
+    <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" />
+    <pages enableEventValidation="false">
+      <!-- ASPNETAJAX -->
+      <controls>
+        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
+        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      </controls>
+    </pages>
+    <httpModules>
+      <!-- URL REWRTIER -->
+      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
+      <!-- UMBRACO -->
+      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule, umbraco" />
+      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule, umbraco" />
+      <!-- ASPNETAJAX -->
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <!-- CLIENT DEPENDENCY -->
+      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
+    </httpModules>
+    <httpHandlers>
+      <remove verb="*" path="*.asmx" />
+      <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
+      <!-- UMBRACO CHANNELS -->
+      <add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
+      <add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
+      <!-- CLIENT DEPENDENCY -->
+      <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+      <!-- SPELL CHECKER -->
+      <add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
+    </httpHandlers>
+    <compilation defaultLanguage="c#" debug="true" batch="false">
+      <assemblies>
+        <!-- ASPNETAJAX -->
+        <add assembly="System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
+        <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+        <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add assembly="System.Web.Extensions.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+        <!--<add assembly="Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> -->
+      </assemblies>
+      <!-- Added in Umbraco 4.6.2 -->
+      <buildProviders>
+        <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
+        <add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
+        <add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
+      </buildProviders>
+      <!-- End of added in Umbraco 4.6.2 -->
+    </compilation>
+    <authentication mode="Forms">
+      <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
+    </authentication>
+    <authorization>
+      <allow users="?" />
+    </authorization>
+    <!-- Membership Provider -->
+    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
+      <providers>
+        <clear />
+        <add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
+        <add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
+      </providers>
+    </membership>
+    <!-- added by NH to support membership providers in access layer -->
+    <roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
+      <providers>
+        <clear />
+        <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
+      </providers>
+    </roleManager>
+    <!-- Sitemap provider-->
+    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
+      <providers>
+        <clear />
+        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
+      </providers>
+    </siteMap>
+  </system.web>
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules>
+      <remove name="ScriptModule" />
+      <remove name="UrlRewriteModule" />
+      <remove name="umbracoRequestModule" />
+      <remove name="viewstateMoverModule" />
+      <remove name="umbracoBaseRequestModule" />
+      <remove name="ClientDependencyModule" />
+      <add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
+      <add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
+      <add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
+      <add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
+    </modules>
+    <handlers accessPolicy="Read, Write, Script, Execute">
+      <remove name="WebServiceHandlerFactory-Integrated" />
+      <remove name="ScriptHandlerFactory" />
+      <remove name="ScriptHandlerFactoryAppServices" />
+      <remove name="ScriptResource" />
+      <remove name="Channels" />
+      <remove name="Channels_Word" />
+      <remove name="ClientDependency" />
+      <remove name="SpellChecker" />
+      <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+      <add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
+      <add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
+      <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+      <add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
+    </handlers>
+    <staticContent>
+      <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
+    </staticContent>
+  </system.webServer>
+  <system.codedom>
+    <compilers>
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider,System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+        <providerOption name="CompilerVersion" value="v3.5" />
+        <providerOption name="WarnAsError" value="false" />
+      </compiler>
+    </compilers>
+  </system.codedom>
+  <runtime>
+    <!--    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+-->
+  </runtime>
+  <!-- Added in Umbraco 4.6.2 -->
+  <system.web.webPages.razor>
+    <host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines" />
+    <pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
+      <namespaces>
+        <add namespace="Microsoft.Web.Helpers" />
+        <add namespace="umbraco" />
+        <add namespace="Examine" />
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor>
+  <!-- End of added in Umbraco 4.6.2 -->
+</configuration>
\ No newline at end of file

From 5fd694cca92aaf3a41af29ecd78bc1081c5ecb23 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 09:29:34 -0100
Subject: [PATCH 05/13] nant build

---
 default.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.build b/default.build
index 82515352bd..5f666394f6 100644
--- a/default.build
+++ b/default.build
@@ -353,7 +353,7 @@
 
 
     <!-- do the full release with docs, minify and nightly file distribution -->
-    <target name="release" depends="zip,minify">
+    <target name="release" depends="zip">
         <property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
         <property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
 

From d324ee90a7705a53a70c0a70e361cae9df87fe41 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 09:36:57 -0100
Subject: [PATCH 06/13] Change build order

---
 default.build | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/default.build b/default.build
index 5f666394f6..d0028a852a 100644
--- a/default.build
+++ b/default.build
@@ -71,7 +71,16 @@
             </fileset>
         </delete>
 
-        <exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
+
+      <exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
+        <arg value="${root.dir}\umbraco.MacroEngines.Juno\umbraco.MacroEngines.csproj" />
+        <arg value="/v:n" />
+        <arg value="/p:WarningLevel=0" />
+        <arg value="/p:ToolsVersion=4.0" />
+        <arg value="/p:Configuration=${build.configuration}" />
+      </exec>
+
+      <exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
             <arg value="${root.dir}\umbraco.sln" />
             <arg value="/v:n" />
             <arg value="/p:WarningLevel=0" />
@@ -80,14 +89,7 @@
         </exec>
         <exec program="${win.dir}\microsoft.net\framework\v4.0.30319\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
     
-		<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
-            <arg value="${root.dir}\umbraco.MacroEngines.Juno\umbraco.MacroEngines.csproj" />
-            <arg value="/v:n" />
-            <arg value="/p:WarningLevel=0" />
-            <arg value="/p:ToolsVersion=4.0" />
-            <arg value="/p:Configuration=${build.configuration}" />
-        </exec>
-
+		    
       <call target="buildMacroEnginesIron" />
 
       <call target="buildSymbolFiles" />
@@ -133,7 +135,6 @@
   </target>  
   
   
-  
 
     <!-- Directories and files -->
     <target name="directories" depends="build">
@@ -283,8 +284,7 @@
         <mkdir dir="${build.dir}\usercontrols" />
     </target>
 
-    
-
+   
 
     <!-- Documentation -->
     <target name="documentation" depends="directories">

From 300da7f04a5b22fc5e8c62e642577f6fe44ef645 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 09:46:21 -0100
Subject: [PATCH 07/13] One more change to build file

---
 default.build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default.build b/default.build
index d0028a852a..81e861b458 100644
--- a/default.build
+++ b/default.build
@@ -79,6 +79,8 @@
         <arg value="/p:ToolsVersion=4.0" />
         <arg value="/p:Configuration=${build.configuration}" />
       </exec>
+      <copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.dll" tofile="${source.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
+
 
       <exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
             <arg value="${root.dir}\umbraco.sln" />

From 60c18bdff95ef6c00508880256b19b0a55f02428 Mon Sep 17 00:00:00 2001
From: "agrath@gmail.com" <unknown@kiln.example.com>
Date: Sun, 27 Feb 2011 21:53:45 -1300
Subject: [PATCH 08/13] More graceful handling of missing properties in .Where
 - TryGetMember now returns DynamicNull (IEnumerable with fake .Where and
 .OrderBy) when the property/child type doesn't exist. Expression Tree in
 DynamicQueryable explictly checks for this type and forces that portion of
 the predicate/expression tree to return true, bypassing the missing property
 Handy when you are checking e.g. a boolean property in a .Where and that
 boolean doesn't exist on all nodes.

---
 .../RazorDynamicNode/DynamicNode.cs           |  6 ++--
 .../RazorDynamicNode/DynamicNull.cs           | 30 +++++++++++++++++++
 .../RazorDynamicNode/DynamicQueryable.cs      |  7 +++++
 .../umbraco.MacroEngines.csproj               |  1 +
 .../presentation/umbraco.presentation.csproj  |  1 +
 5 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNull.cs

diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
index e2b22078d6..28af0dd70e 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
@@ -265,9 +265,9 @@ namespace umbraco.MacroEngines
 
             //if property access, type lookup and member invoke all failed
             //at this point, we're going to return null
-            //instead, we return an empty list
+            //instead, we return a DynamicNull - see comments in that file
             //this will let things like Model.ChildItem work and return nothing instead of crashing
-            result = new DynamicNodeList(new List<INode>());
+            result = new DynamicNull();
             //changed this to a return true because it breaks testing when using .Children().Random().propertyName
             return true;
         }
@@ -281,7 +281,7 @@ namespace umbraco.MacroEngines
             if (dataType == DATATYPE_YESNO_GUID)
             {
                 bool parseResult;
-                if (result.ToString() == "") result = "0";
+                if (string.Format("{0}", result) == "") result = "0";
                 if (Boolean.TryParse(result.ToString().Replace("1", "true").Replace("0", "false"), out parseResult))
                 {
                     result = parseResult;
diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNull.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNull.cs
new file mode 100644
index 0000000000..c93ce3389a
--- /dev/null
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNull.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.Dynamic;
+
+namespace umbraco.MacroEngines
+{
+    //This type is used as a return type when TryGetMember fails on a DynamicNode
+    //.Where explicitly checks for this type, to indicate that nothing was returned
+    //Because it's IEnumerable, if the user is actually trying @Model.TextPages or similar
+    //it will still return an enumerable object (assuming the call actually failed because there were no children of that type)
+    //but in .Where, if they use a property that doesn't exist, the lambda will bypass this and return false
+    public class DynamicNull : DynamicObject, IEnumerable
+    {
+        public IEnumerator GetEnumerator()
+        {
+            return (new List<DynamicNull>()).GetEnumerator();
+        }
+        public DynamicNull Where(string predicate, params object[] values)
+        {
+            return this;
+        }
+        public DynamicNull OrderBy(string orderBy)
+        {
+            return this;
+        }
+    }
+}
diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
index 6d8202c3b5..f02c6de106 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
@@ -54,6 +54,7 @@ namespace System.Linq.Dynamic
                         {
                             return (bool)value;
                         }
+
                         return false;
                     }
                     catch (Exception)
@@ -1467,6 +1468,12 @@ namespace System.Linq.Dynamic
                      Expression.Assign(result, Expression.Constant(null)),
                      Expression.IfThen(Expression.NotEqual(Expression.Constant(null), instanceExpression),
                         Expression.Call(instanceExpression, method, binder, result)),
+                     Expression.IfThen(
+                        Expression.TypeEqual(result, typeof(DynamicNull)),
+                        Expression.Assign(result,
+                            Expression.Constant(true, typeof(object))
+                        )
+                     ),
                      Expression.Return(blockReturnLabel, result),
                      Expression.Label(blockReturnLabel, Expression.Constant(-2, typeof(object)))
                      );
diff --git a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
index 9fef26f020..286cde54dc 100644
--- a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
+++ b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
@@ -64,6 +64,7 @@
     <Compile Include="RazorDynamicNode\DynamicMediaList.cs" />
     <Compile Include="RazorDynamicNode\DynamicNodeList.cs" />
     <Compile Include="RazorDynamicNode\DynamicNodeWalker.cs" />
+    <Compile Include="RazorDynamicNode\DynamicNull.cs" />
     <Compile Include="RazorDynamicNode\DynamicQueryable.cs" />
     <Compile Include="RazorDynamicNode\DynamicXml.cs" />
     <Compile Include="RazorDynamicNode\ExtensionMethodFinder.cs" />
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index 526fad75ac..344d90c196 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -1921,6 +1921,7 @@
     <Content Include="umbraco\xslt\templates\Schema2\RSSFeed.xslt" />
     <Content Include="umbraco\xslt\templates\Schema2\Sitemap.xslt" />
     <Content Include="umbraco\xslt\templates\Schema2\TablePrototype.xslt" />
+    <Content Include="web.config.ssaolap01.xslt" />
     <Content Include="web.config.UMBRACOELISE.xslt">
       <SubType>Designer</SubType>
     </Content>

From 3f74ee4ab56f92991ee7929a041e3a8bfa727fe5 Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 09:55:02 -0100
Subject: [PATCH 09/13] adding system.webpages to build dir

---
 default.build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/default.build b/default.build
index 81e861b458..d6815d5beb 100644
--- a/default.build
+++ b/default.build
@@ -79,8 +79,16 @@
         <arg value="/p:ToolsVersion=4.0" />
         <arg value="/p:Configuration=${build.configuration}" />
       </exec>
+      
+      
       <copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.dll" tofile="${source.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
 
+      <copy todir="${source.dir}\bin" overwrite="true">
+        <fileset basedir="${dlls.dir}\WebPages">
+          <include name="*.dll" />
+        </fileset>
+      </copy>
+      
 
       <exec program="${win.dir}\microsoft.net\framework\v4.0.30319\msbuild.exe">
             <arg value="${root.dir}\umbraco.sln" />

From 59e41e39123992d4157ffa2b31fcbf724c715aa3 Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 10:01:53 -0100
Subject: [PATCH 10/13] Work items: 30086, 30087

---
 umbraco/interfaces/INode.cs                        |  1 +
 .../umbraco/create/DLRScripting.ascx.cs            |  7 +++----
 umbraco/presentation/umbraco/nodeFactory/Page.cs   | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/umbraco/interfaces/INode.cs b/umbraco/interfaces/INode.cs
index d3c9ca1bd8..e4ecd9c215 100644
--- a/umbraco/interfaces/INode.cs
+++ b/umbraco/interfaces/INode.cs
@@ -29,6 +29,7 @@ namespace umbraco.interfaces
         List<IProperty> PropertiesAsList { get; }
         List<INode> ChildrenAsList { get; }
         IProperty GetProperty(string Alias);
+        IProperty GetProperty(string Alias, out bool propertyExists);
         DataTable ChildrenAsTable();
         DataTable ChildrenAsTable(string nodeTypeAliasFilter);
     }
diff --git a/umbraco/presentation/umbraco/create/DLRScripting.ascx.cs b/umbraco/presentation/umbraco/create/DLRScripting.ascx.cs
index 4c4983619d..3c55f39b9f 100644
--- a/umbraco/presentation/umbraco/create/DLRScripting.ascx.cs
+++ b/umbraco/presentation/umbraco/create/DLRScripting.ascx.cs
@@ -61,6 +61,9 @@ namespace umbraco.presentation.create
             string abPath = IO.IOHelper.MapPath(path);
             list.Items.Clear();
 
+            // always add the option of an empty one
+            list.Items.Add(new ListItem("Empty template", ""));
+
             if (System.IO.Directory.Exists(abPath))
             {
                 string extension = "." + scriptType;
@@ -72,10 +75,6 @@ namespace umbraco.presentation.create
                     list.Items.Add(new ListItem(helper.SpaceCamelCasing(filename.Replace(extension, "")), scriptType + "/" + filename));
                 }
             }
-            else
-            {
-                list.Items.Add(new ListItem("Empty template", ""));
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco/nodeFactory/Page.cs b/umbraco/presentation/umbraco/nodeFactory/Page.cs
index a182c6a4b8..a554472f30 100644
--- a/umbraco/presentation/umbraco/nodeFactory/Page.cs
+++ b/umbraco/presentation/umbraco/nodeFactory/Page.cs
@@ -314,6 +314,20 @@ namespace umbraco.NodeFactory
             return null;
         }
 
+        public IProperty GetProperty(string Alias, out bool propertyExists)
+        {
+            foreach (Property p in Properties)
+            {
+                if (p.Alias == Alias)
+                {
+                    propertyExists = true;
+                    return p;
+                }
+            }
+            propertyExists = false;
+            return null;
+        }
+
         public static Node GetNodeByXpath(string xpath)
         {
             XPathNodeIterator xpathNode = library.GetXmlNodeByXPath(xpath);

From 6be3b5d93bf6a7b031442338e64f2553824bf08a Mon Sep 17 00:00:00 2001
From: PerPloug <unknown@kiln.example.com>
Date: Mon, 28 Feb 2011 10:46:48 -0100
Subject: [PATCH 11/13] build version id

---
 default.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.build b/default.build
index d6815d5beb..647559ec61 100644
--- a/default.build
+++ b/default.build
@@ -373,7 +373,7 @@
 
     <!-- do the full release with docs, minify and nightly file distribution -->
     <target name="zip" depends="directories">
-        <property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
+        <property name="assembly.name" value="${build.number}"/>
         <property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
 
         <zip zipfile="${release.filename}" includeemptydirs="true" >
@@ -401,7 +401,7 @@
   
     <!-- do a nightly build without the minification and docs -->
     <target name="nightly" depends="zip">
-        <property name="assembly.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
+        <property name="assembly.name" value="${build.number}"/>
         <property name="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
 
         <mkdir dir="${public.dir}\${build.version}" />

From aaa90bea146ca19dce6b9c559e163e03b87dfa8b Mon Sep 17 00:00:00 2001
From: "agrath@gmail.com" <unknown@kiln.example.com>
Date: Sun, 27 Feb 2011 22:55:50 -1300
Subject: [PATCH 12/13] More graceful handling of missing properties in .Where
 - TryGetMember now returns DynamicNull Only return DynamicNull if property
 truely doesn't exist - if it does exist and has no value, still return null

---
 .../RazorDynamicNode/DynamicNode.cs           | 20 +++++++++++++------
 .../RazorDynamicNode/DynamicNull.cs           |  4 ++++
 .../RazorDynamicNode/DynamicQueryable.cs      |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
index 28af0dd70e..55e60d2a28 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNode.cs
@@ -205,20 +205,21 @@ namespace umbraco.MacroEngines
         {
 
             var name = binder.Name;
+            result = null; //this will never be returned
 
             if (name == "ChildrenAsList" || name == "Children")
             {
                 result = GetChildrenAsList;
                 return true;
             }
-
+            bool propertyExists = false;
             if (n != null)
             {
-                var data = n.GetProperty(name);
+                var data = n.GetProperty(name, out propertyExists);
                 // check for nicer support of Pascal Casing EVEN if alias is camelCasing:
-                if (data == null && name.Substring(0, 1).ToUpper() == name.Substring(0, 1))
+                if (data == null && name.Substring(0, 1).ToUpper() == name.Substring(0, 1) && !propertyExists)
                 {
-                    data = n.GetProperty(name.Substring(0, 1).ToLower() + name.Substring((1)));
+                    data = n.GetProperty(name.Substring(0, 1).ToLower() + name.Substring((1)), out propertyExists);
                 }
 
                 if (data != null)
@@ -267,8 +268,15 @@ namespace umbraco.MacroEngines
             //at this point, we're going to return null
             //instead, we return a DynamicNull - see comments in that file
             //this will let things like Model.ChildItem work and return nothing instead of crashing
-            result = new DynamicNull();
-            //changed this to a return true because it breaks testing when using .Children().Random().propertyName
+            if (!propertyExists && result == null)
+            {
+                //.Where explictly checks for this type
+                //and will make it false
+                //which means backwards equality (&& property != true) will pass
+                //forwwards equality (&& property or && property == true) will fail
+                result = new DynamicNull();
+                return true;
+            }
             return true;
         }
 
diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNull.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNull.cs
index c93ce3389a..7bfe6462c5 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNull.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicNull.cs
@@ -26,5 +26,9 @@ namespace umbraco.MacroEngines
         {
             return this;
         }
+        public override string ToString()
+        {
+            return string.Empty;
+        }
     }
 }
diff --git a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
index f02c6de106..1f1833869c 100644
--- a/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
+++ b/umbraco.MacroEngines.Juno/RazorDynamicNode/DynamicQueryable.cs
@@ -1471,7 +1471,7 @@ namespace System.Linq.Dynamic
                      Expression.IfThen(
                         Expression.TypeEqual(result, typeof(DynamicNull)),
                         Expression.Assign(result,
-                            Expression.Constant(true, typeof(object))
+                            Expression.Constant(false, typeof(object))
                         )
                      ),
                      Expression.Return(blockReturnLabel, result),

From 4f496ef5da6ee2ac2a7d52156509eceac2103467 Mon Sep 17 00:00:00 2001
From: "agrath@gmail.com" <unknown@kiln.example.com>
Date: Sun, 27 Feb 2011 22:56:12 -1300
Subject: [PATCH 13/13] Updated web.config.ssaolap01.xslt

---
 umbraco/presentation/web.config.ssaolap01.xslt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/umbraco/presentation/web.config.ssaolap01.xslt b/umbraco/presentation/web.config.ssaolap01.xslt
index 98e733067d..dc347ada6e 100644
--- a/umbraco/presentation/web.config.ssaolap01.xslt
+++ b/umbraco/presentation/web.config.ssaolap01.xslt
@@ -8,7 +8,7 @@
   </xsl:template>
 
   <xsl:template match="/configuration/appSettings/add[@key='umbracoConfigurationStatus']/@value">
-    <xsl:attribute name="value">4.6.1</xsl:attribute>
+    <xsl:attribute name="value">4.7.0.beta</xsl:attribute>
   </xsl:template>
 
   <!-- Default templates to match anything else -->