Fixes U4-1432 4.11.2 - Tinymce strips 'src' attribute from images

no need for relative path hacks

.hgignore

@@ -27,12 +27,17 @@ umbraco\presentation\usercontrols\*
 umbraco\presentation\scripts\*
 umbraco\presentation\fonts\*
 umbraco\presentation\css\*
-glob:*App_Code\*
-glob:*App_Data\*
-glob:*media\*
-glob:*masterpages\*
-glob:*macroScripts\*
-glob:*xslt\*
+
+src\Umbraco.Web.UI\css\*
+src\Umbraco.Web.UI\App_Code\*
+src\Umbraco.Web.UI\App_Data\*
+src\Umbraco.Tests\App_Data\*
+src\Umbraco.Web.UI\media\*
+src\Umbraco.Web.UI\masterpages\*
+src\Umbraco.Web.UI\macroScripts\*
+src\Umbraco.Web.UI\xslt\*
+src\Umbraco.Web.UI\images\*
+src\Umbraco.Web.UI\scripts\*
 
 umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx
 umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx
@@ -41,7 +46,16 @@ _BuildOutput/*
 build/UmbracoCms.AllBinaries.zip
 build/UmbracoCms.WebPI.zip
 build/UmbracoCms.zip
+build/*.nupkg
 src/Umbraco.Tests/config/applications.config
 src/Umbraco.Tests/config/trees.config
 src/Umbraco.Web.UI/web.config
 *.orig
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/Views/*.cshtml
+src/Umbraco.Web.UI/Views/*.vbhtml
+src/Umbraco.Tests/config/umbracoSettings.config
+src/Umbraco.Web.UI/App_Plugins/*
+src/Umbraco.Web.UI/Views/*
+
+src\Umbraco.Web.UI\[W]eb.config

.hgtags

@@ -10,3 +10,13 @@ d03fcffb8834a9583a56813bb44b6abbd9f042cc Release-4.6.0
 096f20bb0575d6199f20fcb3147b63554e765a74 Release-4.8.0
 8f8a203857886b373148af29edd57460a42940be Release-4.8.1
 de73e687ddf6086ed52b6554676c1632865d07f2 Release-4.9.0
+8d7d8609e2e4b971da99cd97f72132ce85ce3333 Release-4.9.1
+f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0
+20e4dff821d8ac2527a5353618fa1a23ea1d8b34 Release-4.11.0
+7f827760cb49d749616859f528d19dde64807947 Release-4.11.1
+7f827760cb49d749616859f528d19dde64807947 Release-4.11.1
+6eb5f2fb5a88aa29ea544499df9160a1b31b5638 Release-4.11.1
+73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
+73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2
+0000000000000000000000000000000000000000 4.11.2
+73711b806a4044dbf0d7d7c095ddfdda23b09932 Release-4.11.2

build/Build.bat

@@ -1,2 +1,9 @@
+@ECHO OFF
 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj"
-REM pause
+
+if ERRORLEVEL 1 goto :showerror
+
+goto :EOF
+
+:showerror
+pause

build/Build.proj

@@ -46,10 +46,9 @@
  </PropertyGroup>
 
  <ItemGroup>
-   <SystemFolders Include="$(WebAppFolder)App_Code" />
+	 <SystemFolders Include="$(WebAppFolder)App_Plugins" />
+	 <SystemFolders Include="$(WebAppFolder)App_Code" />
    <SystemFolders Include="$(WebAppFolder)App_Data" />
-   <SystemFolders Include="$(WebAppFolder)App_Data\ClientDependency" />
-   <SystemFolders Include="$(WebAppFolder)App_Data\ExamineIndexes" />
    <SystemFolders Include="$(WebAppFolder)media" />
    <SystemFolders Include="$(WebAppFolder)masterpages" />
    <SystemFolders Include="$(WebAppFolder)scripts" />

build/Nant/aspnet35.build

@@ -1,370 +0,0 @@
-<?xml version="1.0" ?>
-<project name="umbraco" default="test" basedir=".">
-    <description>Build the umbraco 4.6 alpha Application for asp.net 3.5</description>
-
-   <property name="nant.settings.currentframework" value="net-2.0" />
-
-    <!-- filenames and directories, generally won't change -->
-
-    <property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
-    <property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.6 for asp.net 3.5" />
-    <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="dlls.dir" value="${root.dir}\foreign dlls" />
-
-    <property name="build.version" value="4.6 Alpha"/>
-
-    <property name="docs.dir" value="${root.dir}\docs" />
-
-    <property name="win.dir" value="c:\WINDOWS" />
-    <property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
-
-    <!-- YUI -->
-    <property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
-
-
-   
-    <target name="build" depends="init">
-        <!-- set everything to writable-->
-        <attrib normal="true" readonly="false">
-            <fileset basedir="${root.dir}">
-                <include name="**/*" />
-            </fileset>
-        </attrib>
-
-        <!-- Remove those damn DLR dlls that might be left behind by careless devs...-->
-        <!-- They will get added again after build is completed, no worries no dependencies during build-->
-        <delete>
-            <fileset>
-                <include name="${source.dir}\bin\IronPython.dll" />
-                <include name="${source.dir}\bin\IronPython.Modules.dll" />
-                <include name="${source.dir}\bin\IronRuby.dll" />
-                <include name="${source.dir}\bin\IronRuby.Libraries.dll" />
-                <include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
-                <include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
-                <include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
-                <include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
-                <include name="${source.dir}\bin\Microsoft.Scripting.dll" />
-                <include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
-            </fileset>
-        </delete>
-        
-        <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" />
-            <arg value="/p:ToolsVersion=3.5" />
-        </exec>
-
-        <exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
-    </target>
-    
-
-
-    <!-- Directories and files -->
-    <target name="directories" depends="build">
-
-        <!-- setup docs files -->
-        <mkdir dir="${docs.dir}" />
-        <copy todir="${docs.dir}">
-            <fileset basedir="${build.dir}\bin">
-                <include name="*.xml" />
-            </fileset>
-        </copy>
-
-        <!-- asp.net 2.0 SP1 DLR dlls -->
-        <delete>
-            <fileset>
-                <include name="${build.dir}\bin\Microsoft.Scripting.*" />
-                <include name="${build.dir}\bin\Microsoft.Dynamic.*" />
-                <include name="${build.dir}\bin\IronPython.*" />
-                <include name="${build.dir}\bin\IronRuby.*" />
-            </fileset>
-        </delete>
-        <copy todir="${build.dir}\bin">
-            <fileset basedir="${dlls.dir}\DLR 2.0 SP1">
-                <include name="*.dll" />
-                <exclude name="Microsoft.Scripting.ExtensionAttribute.dll" />
-            </fileset>
-        </copy>
-
-        <!--standard web.config-->
-        <copy file="${root.dir}\aspnet35.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
-
-        <!--standard /config files-->
-        <copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
-        
-        <!-- new 4.1 files -->
-        <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"/>
-        
-        
-        <!--standard /data/packages files-->
-        <copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
-
-        <!-- Standard access.xml file-->
-        <copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
-
-        <!-- Standard create UI.xml-->
-        <copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
-
-        <!-- Standard empty cache file -->
-        <copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
-
-        <!-- Baseline Language file for translation tool -->
-        <copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
-
-        <!-- LINQ2UMB dll-->
-        <copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\Debug - Fixed Version\umbraco.Linq.Core.dll" tofile="${build.dir}\bin\umbraco.Linq.Core.dll" failonerror="false" overwrite="true"/>
-
-
-        <delete dir="${build.dir}\webservices" />
-        <delete dir="${build.dir}\umbracoBase" />
-        <delete dir="${build.dir}\Web References" />
-        <delete dir="${build.dir}\obj" />
-        <delete dir="${build.dir}\properties" />
-
-        <delete dir="${build.dir}\css" />
-        <delete dir="${build.dir}\masterpages" />
-        <delete dir="${build.dir}\scripts" />
-        <delete dir="${build.dir}\python" />
-        <delete dir="${build.dir}\xslt" />
-        <delete dir="${build.dir}\usercontrols" />
-    
-
-        <delete>
-            <fileset>
-                <include name="${build.dir}/**/*.build" />
-                <include name="${build.dir}/**/*.csproj" />
-                <include name="${build.dir}/**/*.vspscc" />
-                <include name="${build.dir}/**/*.scc" />
-                <include name="${build.dir}/**/*.sln" />
-                <include name="${build.dir}/**/*.compiled" />
-                <include name="${build.dir}/**/*.resx" />
-                <include name="${build.dir}/**/*.user" />
-                <include name="${build.dir}/**/*.pdb" />
-
-                <include name="${build.dir}/PrecompiledApp.config" />
-                <include name="${build.dir}/web.config.template" />
-                <include name="${build.dir}/*.xslt" />
-                <include name="${build.dir}/web.STANDARD.config" />
-                <include name="${build.dir}/site.py" />
-            </fileset>
-        </delete>
-        
-        <!-- standard folders -->
-        <mkdir dir="${build.dir}\App_Code" />
-        <mkdir dir="${build.dir}\App_Data" />
-        <mkdir dir="${build.dir}\App_Data\ClientDependency" />
-        <mkdir dir="${build.dir}\App_Data\ExamineIndexes" />
-
-        <mkdir dir="${build.dir}\media" />
-        <mkdir dir="${build.dir}\masterpages" />
-        <mkdir dir="${build.dir}\scripts" />
-        <mkdir dir="${build.dir}\css" />
-        <mkdir dir="${build.dir}\python" />
-        <mkdir dir="${build.dir}\xslt" />
-        <mkdir dir="${build.dir}\usercontrols" />
-    </target>
-
-    <!-- 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">
-        <!-- Transformations -->
-        <property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
-        <property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
-
-        <property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
-
-        <!-- Create a doc dir and move vs comment files to it-->
-        <mkdir dir="${docs.dir}" />
-        <copy todir="${docs.dir}">
-            <fileset basedir="${build.dir}\bin">
-                <include name="*.xml" />
-            </fileset>
-        </copy>
-
-        <!-- Create or Cleanup Working Directory -->
-        <mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
-        <delete>
-            <fileset basedir="${sandcastle.workingdir}">
-                <include name="**\*" />
-            </fileset>
-        </delete>
-
-        <copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
-            <filterchain>
-                <replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
-                <replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
-            </filterchain>
-        </copy>
-
-        <!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
-        <exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
-            <arg value="&quot;${build.dir}\bin\businesslogic.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\cms.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\controls.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\interfaces.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.datalayer.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.editorcontrols.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.providers.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.webservices.dll&quot; " />
-            <arg value="/out:reflection.org" />
-        </exec>
-
-        <!-- Regroup overloads -->
-        <exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
-            <arg value="reflection.org" />
-            <arg value="/xsl:&quot;${sandcastle.addfriendlyfilenames.xsl}&quot;" />
-            <arg value="/out:reflection.xml" />
-        </exec>
-
-
-        <exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
-            <arg value="reflection.org" />
-            <arg value="/xsl:&quot;${sandcastle.reflectiontomanifest.xsl}&quot;" />
-            <arg value="/out:manifest.xml" />
-        </exec>
-
-        <exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
-            <arg value="/config:Sandcastle.config" />
-            <arg value="manifest.xml" />
-        </exec>
-    </target>
-
-
-    <!-- do the full release with docs, minify and nightly file distribution -->
-    <target name="release" depends="zip,minify">
-        <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" />
-    </target>
-
-    <!-- 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="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
-
-        <zip zipfile="${release.filename}" includeemptydirs="true" >
-            <fileset basedir="${root.dir}">
-                <include name="build/*" />
-                <include name="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" />
-    </target>
-
-    <!-- will produce the a clean /build folder and nothing else-->
-    <target name="test" depends="directories">
-
-    </target>
-
-    <target name="webPIRelease" depends="release,webPiFile">
-        <copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\webPi_sha.txt" />
-        <copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
-    </target>
-
-    <!-- do the webdeploy release for web PI-->
-    <target name="webPiFile" depends="directories">
-
-        <property name="webpi.dir" value="${root.dir}\deploy" />
-
-        <delete dir="${webpi.dir}\umbraco" />
-
-        <mkdir dir="${webpi.dir}" />
-        <mkdir dir="${webpi.dir}\umbraco" />
-
-        <copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
-            <fileset basedir="${root.dir}">
-                <include name="build/*" />
-                <include name="build/**/*" />
-            </fileset>
-        </copy>
-
-        <copy file="d:\webpiAssets\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
-        <copy file="d:\webpiAssets\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
-        <copy file="d:\webpiAssets\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
-
-        <property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
-        <zip zipfile="${webpi.filename}" includeemptydirs="true" >
-            <fileset basedir="${webpi.dir}">
-                <include name="*" />
-                <include name="**/*" />
-            </fileset>
-        </zip>
-
-        <exec program="${win.dir}\hashMyFiles.exe">
-            <arg value="/file &quot;${webpi.filename}&quot;" />
-            <arg value="/stext &quot;${root.dir}\webPi_sha.txt&quot;" />
-        </exec>
-    </target>
-
-
-    <target name="init" description="init tasks for the build">
-
-        <!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
-        <delete>
-            <fileset>
-                <include name="${build.dir}\umbraco\plugins\*" />
-                <exclude name="${build.dir}\umbraco\plugins\tinymce3" />
-            </fileset>
-        </delete>
-
-        <delete dir="${build.dir}" />
-        <mkdir dir="${build.dir}" />
-    </target>
-
-
-</project>

build/Nant/aspnet35.config

@@ -1,229 +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  -->
-    <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"/>
-  </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=DATABASE;user id=USER;password=PASS" />
-    <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" />
-    <add key="umbracoContentXMLUseLocalTemp" value="false" />
-  </appSettings>
-  <system.net>
-    <mailSettings>
-      <smtp>
-        <network host="127.0.0.1" userName="username" password="password" />
-      </smtp>
-    </mailSettings>
-  </system.net>
-  <!-- REMOVE FOR BETA -->
-  <!-- added by NH to test foreign membership providers-->
-  <connectionStrings>
-    <remove name="LocalSqlServer" />
-    <!--<add name="LocalSqlServer" connectionString="server=.\sqlexpress;database=aspnetdb;user id=DBUSER;password=DBPASSWORD" providerName="System.Data.SqlClient"/>-->
-  </connectionStrings>
-  <system.web>
-    <!-- <trust level="Medium" originUrl=".*" /> -->
-    <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="false" 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.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <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.Design, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-        <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      </assemblies>
-    </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>
-  </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>
-
-</configuration>

build/Nant/build.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<build>
-  <version>4.0 Beta 2</version>
-  <assembly>@assembly@</assembly>
-  <date>@date@</date>
-</build>

build/Nant/default.build

@@ -1,495 +0,0 @@
-<?xml version="1.0" ?>
-<project name="umbraco" default="test" basedir=".">
-    <description>Build the umbraco 4.5 Application</description>
-
-    <!-- global properties, generally won't change -->
-    <!--
-    <property name="nant.settings.currentframework" value="net-2.0" />
-    -->
-    <property name="nant.settings.currentframework" value="net-4.0" />,
-
-    <property name="build.version" value="4.8.0"/>
-    <property name="build.configuration" value="Debug"/>
-
-
-    <!-- filenames and directories, generally won't change -->
-
-    <property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
-    <property name="public.dir" value="C:\inetpub\wwwroot\_Live Sites\nightly.umbraco.org\umbraco 4.7.2" />
-    <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" />
-
-
-
-    <property name="docs.dir" value="${root.dir}\docs" />
-
-    <property name="win.dir" value="c:\WINDOWS" />
-    <property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
-
-    <!-- Sandcastle Directories -->
-    <property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
-    <property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
-    <property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
-
-    <!-- Sandcastle -->
-    <property name="sandcastle.mrefbuilder"  value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
-    <property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
-    <property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
-
-    <!-- YUI -->
-    <property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
-
-    <!-- Build source -->
-    <target name="build" depends="init">
-
-        <!-- set everything to writable-->
-        <attrib normal="true" readonly="false">
-            <fileset basedir="${root.dir}">
-                <include name="**/*" />
-            </fileset>
-        </attrib>
-
-        <delete>
-            <fileset>
-                <include name="${source.dir}\bin\IronPython.dll" />
-                <include name="${source.dir}\bin\IronPython.Modules.dll" />
-                <include name="${source.dir}\bin\IronRuby.dll" />
-                <include name="${source.dir}\bin\IronRuby.Libraries.dll" />
-                <include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
-                <include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
-                <include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
-                <include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
-                <include name="${source.dir}\bin\Microsoft.Scripting.dll" />
-                <include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
-            </fileset>
-        </delete>
-
-
-        <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>
-
-
-        <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" />
-            <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\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
-
-
-        <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}" flatten="true">
-            <fileset basedir="${build.dir}\bin">
-                <include name="*.xml" />
-                <include name="*.pdb" />
-            </fileset>
-        </copy>
-
-        <copy todir="${build.symbolFiles.dir}" flatten="true">
-            <fileset basedir="${root.dir}" >
-                <include name="**/*.pdb" />
-                <include name="**/bin/*.xml" />
-            </fileset>
-        </copy>
-
-        <copy todir="${build.symbolFiles.dir}" flatten="true">
-            <fileset basedir="${docs.dir}">
-                <include name="*.xml" />
-            </fileset>
-        </copy>
-
-    </target>
-
-
-
-    <!-- Directories and files -->
-    <target name="directories" depends="build">
-
-        <!-- setup docs files -->
-        <mkdir dir="${docs.dir}" />
-        <copy todir="${docs.dir}">
-            <fileset basedir="${build.dir}\bin">
-                <include name="*.xml" />
-            </fileset>
-        </copy>
-
-        <!-- DLR FILES -->
-        <delete>
-            <fileset>
-                <include name="${build.dir}\bin\Microsoft.Scripting.*" />
-                <include name="${build.dir}\bin\Microsoft.Dynamic.*" />
-                <include name="${build.dir}\bin\IronPython.*" />
-                <include name="${build.dir}\bin\IronRuby.*" />
-            </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"/>
-
-        <!--standard /config files-->
-        <copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
-
-      <!-- new 4.5 files -->
-        <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">
-            <fileset basedir="${dlls.dir}\WebPages">
-                <include name="*.dll" />
-            </fileset>
-        </copy>
-
-
-        <!--
-		<copy file="${root.dir}\foreign dlls\System.Web.Razor.dll" tofile="${build.dir}\bin\System.Web.Razor.dll" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\foreign dlls\RazorEngine.Core.dll" tofile="${build.dir}\bin\RazorEngine.Core.dll" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\foreign dlls\RazorEngine.Templates.dll" tofile="${build.dir}\bin\RazorEngine.Templates.dll" failonerror="false" overwrite="true"/>
-        -->
-
-        <!--standard /data/packages files-->
-        <mkdir dir="${build.dir}\App_Data" />
-        <copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\app_data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\app_data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
-
-        <!-- Standard access.xml file-->
-        <copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\app_data\access.config" failonerror="false" overwrite="true"/>
-
-        <!-- Standard create UI.xml-->
-        <copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
-
-        <!-- Standard empty cache file -->
-        <copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\app_data\umbraco.config" failonerror="false" overwrite="true"/>
-
-        <!-- Baseline Language file for translation tool -->
-        <copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
-
-        <!-- LINQ2UMB dll-->
-        <copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\${build.configuration}\umbraco.Linq.Core.dll" tofile="${build.dir}\bin\umbraco.Linq.Core.dll" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\${build.configuration}\umbraco.Linq.Core.pdb" tofile="${build.dir}\bin\umbraco.Linq.Core.pdb" failonerror="false" overwrite="true"/>
-
-        <delete dir="${build.dir}\webservices" />
-        <delete dir="${build.dir}\umbracoBase" />
-        <delete dir="${build.dir}\Web References" />
-        <delete dir="${build.dir}\obj" />
-        <delete dir="${build.dir}\properties" />
-
-        <delete dir="${build.dir}\css" />
-        <delete dir="${build.dir}\masterpages" />
-        <delete dir="${build.dir}\scripts" />
-        <delete dir="${build.dir}\python" />
-        <delete dir="${build.dir}\macroScripts" />
-        <delete dir="${build.dir}\xslt" />
-        <delete dir="${build.dir}\usercontrols" />
-
-        <delete>
-            <fileset>
-                <include name="${build.dir}/**/*.build" />
-                <include name="${build.dir}/**/*.csproj" />
-                <include name="${build.dir}/**/*.vspscc" />
-                <include name="${build.dir}/**/*.scc" />
-                <include name="${build.dir}/**/*.sln" />
-                <include name="${build.dir}/**/*.compiled" />
-                <include name="${build.dir}/**/*.resx" />
-                <include name="${build.dir}/**/*.user" />
-                <include name="${build.dir}/**/*.bak" />
-
-                <include name="${build.dir}/**/*.orig" />
-
-                <include name="${build.dir}/PrecompiledApp.config" />
-                <include name="${build.dir}/web.config.template" />
-                <include name="${build.dir}/*.xslt" />
-                <include name="${build.dir}/web.*.config" />
-                <include name="${build.dir}/site.py" />
-                <include name="${build.dir}/bin/umbraco.MacroEngines.Legacy.*" />
-            </fileset>
-        </delete>
-
-        <if test="${build.configuration=='Release'}">
-            <delete>
-                <fileset>
-                    <include name="${build.dir}/**/*.pdb" />
-                    <include name="${build.dir}/bin/*.xml" />
-                </fileset>
-            </delete>
-        </if>
-
-        <!-- standard folders -->
-        <mkdir dir="${build.dir}\App_Code" />
-        <mkdir dir="${build.dir}\App_Data\ClientDependency" />
-        <mkdir dir="${build.dir}\App_Data\ExamineIndexes" />
-
-        <mkdir dir="${build.dir}\media" />
-        <mkdir dir="${build.dir}\masterpages" />
-        <mkdir dir="${build.dir}\scripts" />
-        <mkdir dir="${build.dir}\css" />
-        <mkdir dir="${build.dir}\macroScripts" />
-        <mkdir dir="${build.dir}\xslt" />
-        <mkdir dir="${build.dir}\usercontrols" />
-    </target>
-
-
-
-    <!-- Documentation -->
-    <target name="documentation" depends="directories">
-        <!-- Transformations -->
-        <property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
-        <property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
-
-        <property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
-
-        <!-- Create a doc dir and move vs comment files to it-->
-        <mkdir dir="${docs.dir}" />
-        <copy todir="${docs.dir}">
-            <fileset basedir="${build.dir}\bin">
-                <include name="*.xml" />
-            </fileset>
-        </copy>
-
-        <!-- Create or Cleanup Working Directory -->
-        <mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
-        <delete>
-            <fileset basedir="${sandcastle.workingdir}">
-                <include name="**\*" />
-            </fileset>
-        </delete>
-
-        <copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
-            <filterchain>
-                <replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
-                <replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
-            </filterchain>
-        </copy>
-
-        <!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
-        <exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
-            <arg value="&quot;${build.dir}\bin\businesslogic.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\cms.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\controls.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\interfaces.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.datalayer.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.editorcontrols.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.providers.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.webservices.dll&quot; " />
-            <arg value="/out:reflection.org" />
-        </exec>
-
-        <!-- Regroup overloads -->
-        <exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
-            <arg value="reflection.org" />
-            <arg value="/xsl:&quot;${sandcastle.addfriendlyfilenames.xsl}&quot;" />
-            <arg value="/out:reflection.xml" />
-        </exec>
-
-
-        <exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
-            <arg value="reflection.org" />
-            <arg value="/xsl:&quot;${sandcastle.reflectiontomanifest.xsl}&quot;" />
-            <arg value="/out:manifest.xml" />
-        </exec>
-
-        <exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
-            <arg value="/config:Sandcastle.config" />
-            <arg value="manifest.xml" />
-        </exec>
-    </target>
-
-
-    <!-- do the full release with docs, minify and nightly file distribution -->
-    <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" />
-
-        <mkdir dir="${public.dir}\${build.version}" />
-        <copy file="${release.filename}" tofile="${public.dir}\${build.version}\${assembly.name}.zip" />
-    </target>
-
-    <!-- do the full release with docs, minify and nightly file distribution -->
-    <target name="zip" depends="directories">
-        <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" >
-            <fileset basedir="${root.dir}">
-                <include name="build/*" />
-                <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="${build.number}"/>
-        <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-->
-    <target name="test" depends="directories">
-
-    </target>
-
-    <target name="webPIRelease" depends="webPiFile">
-        <copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy_sha.txt" />
-        <copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
-    </target>
-
-    <!-- do the webdeploy release for web PI-->
-    <target name="webPiFile" depends="directories">
-
-        <property name="webpi.dir" value="${root.dir}\deploy" />
-
-        <delete dir="${webpi.dir}\umbraco" />
-
-        <mkdir dir="${webpi.dir}" />
-        <mkdir dir="${webpi.dir}\umbraco" />
-
-        <copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
-            <fileset basedir="${root.dir}\build">
-                <include name="*" />
-                <include name="**/*" />
-            </fileset>
-        </copy>
-
-        <copy todir="${webpi.dir}\umbraco\bin" includeemptydirs="true" >
-            <fileset basedir="${dlls.dir}\SQLCE4">
-                <include name="*" />
-                <include name="**/*" />
-            </fileset>
-        </copy>
-
-        <copy file="${root.dir}\components\SQLCE4Umbraco\bin\${build.configuration}\SQLCE4Umbraco.dll" tofile="${webpi.dir}\umbraco\bin\SQLCE4Umbraco.dll" failonerror="false" overwrite="true"/>
-
-        <copy file="${WebPiAssets.dir}\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
-        <copy file="${WebPiAssets.dir}\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
-        <copy file="${WebPiAssets.dir}\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
-
-        <property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
-        <zip zipfile="${webpi.filename}" includeemptydirs="true" >
-            <fileset basedir="${webpi.dir}">
-                <include name="*" />
-                <include name="**/*" />
-            </fileset>
-        </zip>
-
-        <exec program="${win.dir}\hashMyFiles.exe">
-            <arg value="/file &quot;${webpi.filename}&quot;" />
-            <arg value="/stext &quot;${root.dir}\webPi_sha.txt&quot;" />
-        </exec>
-    </target>
-
-    <target name="init" description="init tasks for the build">
-
-        <!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
-        <delete>
-            <fileset>
-                <include name="${build.dir}\umbraco\plugins\*" />
-                <exclude name="${build.dir}\umbraco\plugins\tinymce3" />
-            </fileset>
-        </delete>
-
-        <delete dir="${build.dir}" />
-        <mkdir dir="${build.dir}" />
-    </target>
-
-
-</project>

build/Nant/nuget.build

@@ -1,149 +0,0 @@
-<?xml version="1.0" ?>
-<project name="umbraco" default="test" basedir=".">
-	<description>Build the umbraco 4.6 Application for asp.net 3.5</description>
-
-   <property name="nant.settings.currentframework" value="net-2.0" />
-   
-	<!-- filenames and directories, generally won't change -->
-
-	<property name="public.dir" value="C:\Users\per\Documents\Projects\NugetServer\GalleryServer\src\Gallery.Server\App_Data\packages" />
-	
-
-	<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="dlls.dir" value="${root.dir}\foreign dlls" />
-
-	<property name="nuget.dir" value="${root.dir}\nuget" />
-	<property name="nuget.app" value="C:\Program Files (x86)\nuget\nuget.exe" />
-	<property name="nuget.spec" value="${public.dir}\..\umbraco.nuspec" />
-
-	<property name="build.version" value="4.6.Beta"/>
-
-	<property name="win.dir" value="C:\windows" />
-
-	<target name="build" depends="init">
-		<!-- set everything to writable-->
-		<attrib normal="true" readonly="false">
-			<fileset basedir="${root.dir}">
-				<include name="**/*" />
-			</fileset>
-		</attrib>
-
-		<!-- Remove those damn DLR dlls that might be left behind by careless devs...-->
-		<!-- They will get added again after build is completed, no worries no dependencies during build-->
-		<delete>
-			<fileset>
-				<include name="${source.dir}\bin\IronPython.dll" />
-				<include name="${source.dir}\bin\IronPython.Modules.dll" />
-				<include name="${source.dir}\bin\IronRuby.dll" />
-				<include name="${source.dir}\bin\IronRuby.Libraries.dll" />
-				<include name="${source.dir}\bin\IronRuby.Libraries.Yaml.dll" />
-				<include name="${source.dir}\bin\Microsoft.Dynamic.dll" />
-				<include name="${source.dir}\bin\Microsoft.ScriptinG.Core.dll" />
-				<include name="${source.dir}\bin\Microsoft.Scripting.Debugging.dll" />
-				<include name="${source.dir}\bin\Microsoft.Scripting.dll" />
-				<include name="${source.dir}\bin\Microsoft.Scripting.ExtensionAttribute.dll" />
-			</fileset>
-		</delete>
-		
-		<!-- build for 2.0 -->
-		<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" />
-			<arg value="/p:ToolsVersion=3.5" />
-		</exec>
-		<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}\Net20&quot;"/>
-		
-
-		<!-- build for 4.0 -->
-		<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" />
-			<arg value="/p:ToolsVersion=4.0" />
-		</exec>
-		<exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}\Net40&quot;"/>
-	</target>
-	
-
-
-	<!-- Directories and files -->
-	<target name="directories" depends="build">
-		<!-- asp.net 2.0 SP1 DLR dlls -->
-		<delete>
-			<fileset>
-				<include name="${build.dir}\**\*" />
-
-				<exclude name="${build.dir}\**\businesslogic.dll" />
-				<exclude name="${build.dir}\**\cms.dll" />
-				<exclude name="${build.dir}\**\controls.dll" />
-				<exclude name="${build.dir}\**\Examine.dll" />
-
-				<exclude name="${build.dir}\**\interfaces.dll" />
-				<exclude name="${build.dir}\**\Microsoft.ApplicationBlocks.Data.dll" />
-				<exclude name="${build.dir}\**\umbraco.DataLayer.dll" />
-				<exclude name="${build.dir}\**\umbraco.dll" />
-				<exclude name="${build.dir}\**\umbraco.editorcontrols.dll" />
-				<exclude name="${build.dir}\**\umbraco.linq.core.dll" />
-				<exclude name="${build.dir}\**\umbraco.macrorenderings.dll" />
-				<exclude name="${build.dir}\**\umbraco.providers.dll" />
-				<exclude name="${build.dir}\**\UmbracoExamine.dll" />
-			</fileset>
-		</delete>
-		
-		<copy todir="${nuget.dir}\lib\Net20">
-			<fileset basedir="${build.dir}\Net20\bin">
-				<include name="*.dll" />
-			</fileset>
-		</copy>
-
-		<copy todir="${nuget.dir}\lib\Net40">
-			<fileset basedir="${build.dir}\Net40\bin">
-				<include name="*.dll" />
-			</fileset>
-		</copy>
-
-		<copy file="${nuget.spec}" tofile="${nuget.dir}\umbraco.nuspec" failonerror="false" overwrite="true"/>
-
-		<xmlpoke
-				file="${nuget.dir}\umbraco.nuspec"
-				xpath="/package/metadata/version"
-				value="${build.version}" />
-						
-	</target>
-
-	
-	<!-- will produce the a clean /build folder and nothing else-->
-	<target name="nuget" depends="directories">
-		 <exec program="${nuget.app}" commandline="pack &quot;${nuget.dir}\umbraco.nuspec&quot; /o &quot;${public.dir}&quot;"/>
-	</target>
-
-   
-   <target name="test">
-		 <exec program="${nuget.app}" commandline="pack &quot;${nuget.dir}\umbraco.nuspec&quot; /o &quot;${public.dir}&quot;"/>
-	</target>
-
-	<target name="init" description="init tasks for the build">
-
-		<!-- Clean the plugins dir any leftovers, only tinyMCE belongs in here -->
-		<delete>
-			<fileset>
-				<include name="${build.dir}\umbraco\plugins\*" />
-				<exclude name="${build.dir}\umbraco\plugins\tinymce3" />
-			</fileset>
-		</delete>
-
-		<delete dir="${build.dir}" />
-		<mkdir dir="${build.dir}" />
-
-		 <delete dir="${nuget.dir}" />
-		<mkdir dir="${nuget.dir}" />
-		<mkdir dir="${nuget.dir}\lib\Net20" />
-		<mkdir dir="${nuget.dir}\lib\Net40" />
-
-	</target>
-
-
-</project>

build/Nant/umbraco weekly.build

@@ -1,310 +0,0 @@
-<?xml version="1.0" ?>
-<project name="umbraco" default="test" basedir=".">
-    <description>Build the umbraco 3.1.x Application</description>
-
-    <!-- global properties, generally won't change -->
-
-    <property name="nant.settings.currentframework" value="net-2.0" />
-
-    <!-- filenames and directories, generally won't change -->
-
-    <property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
-    <property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.1" />
-    <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="dlls.dir" value="${root.dir}\foreign dlls" />
-
-    <property name="build.version" value="4.1"/>
-
-    <property name="docs.dir" value="${root.dir}\docs" />
-
-    <property name="win.dir" value="c:\WINDOWS" />
-    <property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
-
-    <!-- Sandcastle Directories -->
-    <property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
-    <property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
-    <property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
-
-    <!-- Sandcastle -->
-    <property name="sandcastle.mrefbuilder"  value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
-    <property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
-    <property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
-
-    <!-- YUI -->
-    <property name="YUICompressor.dir" value="D:\inetpub\wwwroot\ccnet\buildTools\YUI" />
-
-
-    <!-- Build source -->
-    <target name="build" depends="init">
-        <attrib normal="true" readonly="false">
-            <fileset basedir="${root.dir}">
-                <include name="**/*" />
-            </fileset>
-        </attrib>
-
-        <exec program="${win.dir}\microsoft.net\framework\v3.5\msbuild.exe">
-            <arg value="${root.dir}\umbraco.sln" />
-        </exec>
-
-        <exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
-    </target>
-
-
-    <!-- Directories and files -->
-    <target name="directories" depends="build">
-
-        <!-- setup docs files -->
-        <mkdir dir="${docs.dir}" />
-        <copy todir="${docs.dir}">
-            <fileset basedir="${build.dir}\bin">
-                <include name="*.xml" />
-            </fileset>
-        </copy>
-
-        <!--standard web.config-->
-        <copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
-
-        <!--standard /config files-->
-        <copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
-      
-        <!--standard /data/packages files-->
-        <copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
-        <copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
-
-        <!-- Standard access.xml file-->
-        <copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
-
-        <!-- Standard create UI.xml-->
-        <copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
-
-        <!-- Standard empty cache file -->
-        <copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
-
-        <!-- Baseline Language file for translation tool -->
-        <copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
-
-
-        <!-- standard folders -->
-        <mkdir dir="${build.dir}\App_Code" />
-        <mkdir dir="${build.dir}\App_Data" />
-
-        <mkdir dir="${build.dir}\media" />
-        <mkdir dir="${build.dir}\masterpages" />
-        <mkdir dir="${build.dir}\scripts" />
-        <mkdir dir="${build.dir}\css" />
-        <mkdir dir="${build.dir}\python" />
-        <mkdir dir="${build.dir}\xslt" />
-        <mkdir dir="${build.dir}\usercontrols" />
-
-        <delete dir="${build.dir}\webservices" />
-        <delete dir="${build.dir}\umbracoBase" />
-        <delete dir="${build.dir}\Web References" />
-        <delete dir="${build.dir}\obj" />
-        <delete dir="${build.dir}\properties" />
-
-        <delete>
-            <fileset>
-                <include name="${build.dir}/**/*.build" />
-                <include name="${build.dir}/**/*.csproj" />
-                <include name="${build.dir}/**/*.vspscc" />
-                <include name="${build.dir}/**/*.scc" />
-                <include name="${build.dir}/**/*.sln" />
-                <include name="${build.dir}/**/*.compiled" />
-                <include name="${build.dir}/**/*.resx" />
-                <include name="${build.dir}/PrecompiledApp.config" />
-                <include name="${build.dir}/web.config.template" />
-            </fileset>
-        </delete>
-
-    </target>
-
-    <!-- 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">
-        <!-- Transformations -->
-        <property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
-        <property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
-
-        <property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
-
-        <!-- Create a doc dir and move vs comment files to it-->
-        <mkdir dir="${docs.dir}" />
-        <copy todir="${docs.dir}">
-            <fileset basedir="${build.dir}\bin">
-                <include name="*.xml" />
-            </fileset>
-        </copy>
-
-        <!-- Create or Cleanup Working Directory -->
-        <mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
-        <delete>
-            <fileset basedir="${sandcastle.workingdir}">
-                <include name="**\*" />
-            </fileset>
-        </delete>
-
-        <copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
-            <filterchain>
-                <replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
-                <replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
-            </filterchain>
-        </copy>
-
-        <!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
-        <exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
-            <arg value="&quot;${build.dir}\bin\businesslogic.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\cms.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\controls.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\interfaces.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.datalayer.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.editorcontrols.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.providers.dll&quot; " />
-            <arg value="&quot;${build.dir}\bin\umbraco.webservices.dll&quot; " />
-            <arg value="/out:reflection.org" />
-        </exec>
-
-        <!-- Regroup overloads -->
-        <exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
-            <arg value="reflection.org" />
-            <arg value="/xsl:&quot;${sandcastle.addfriendlyfilenames.xsl}&quot;" />
-            <arg value="/out:reflection.xml" />
-        </exec>
-
-
-        <exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
-            <arg value="reflection.org" />
-            <arg value="/xsl:&quot;${sandcastle.reflectiontomanifest.xsl}&quot;" />
-            <arg value="/out:manifest.xml" />
-        </exec>
-
-        <exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
-            <arg value="/config:Sandcastle.config" />
-            <arg value="manifest.xml" />
-        </exec>
-    </target>
-
-
-    <!-- do the full release with docs, minify and nightly file distribution -->
-    <target name="release" depends="zip,minify">
-        <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" />
-    </target>
-
-    <!-- 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="release.filename" value="${root.dir}\build_${build.version}_${assembly.name}.zip" />
-
-        <zip zipfile="${release.filename}" includeemptydirs="true" >
-            <fileset basedir="${root.dir}">
-                <include name="build/*" />
-                <include name="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" />
-    </target>
-    
-    <!-- will produce the a clean /build folder and nothing else-->
-    <target name="test" depends="directories">
-        
-    </target>
-
-    <target name="webPIRelease" depends="release,webPiFile">
-        <copy file="${root.dir}\webPi_sha.txt" tofile="${public.dir}\${build.version}\webPi_sha.txt" />
-        <copy file="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" tofile="${public.dir}\${build.version}\Umbraco_${build.version}_WebDeploy.zip" />
-    </target>
-
-    <!-- do the webdeploy release for web PI-->
-    <target name="webPiFile" depends="directories">
-
-        <property name="webpi.dir" value="${root.dir}\deploy" />
-
-        <delete dir="${webpi.dir}\umbraco" />
-
-        <mkdir dir="${webpi.dir}" />
-        <mkdir dir="${webpi.dir}\umbraco" />
-
-        <copy todir="${webpi.dir}\umbraco" includeemptydirs="true" >
-            <fileset basedir="${root.dir}">
-                <include name="build/*" />
-                <include name="build/**/*" />
-            </fileset>
-        </copy>
-
-        <copy file="d:\webpiAssets\installSQL.sql" tofile="${webpi.dir}\installSQL.sql" failonerror="false"/>
-        <copy file="d:\webpiAssets\manifest.xml" tofile="${webpi.dir}\manifest.xml" failonerror="false"/>
-        <copy file="d:\webpiAssets\parameters.xml" tofile="${webpi.dir}\parameters.xml" failonerror="false"/>
-
-        <property name="webpi.filename" value="${root.dir}\Umbraco_${build.version}_WebDeploy.zip" />
-        <zip zipfile="${webpi.filename}" includeemptydirs="true" >
-            <fileset basedir="${webpi.dir}">
-                <include name="*" />
-                <include name="**/*" />
-            </fileset>
-        </zip>
-
-        <exec program="${win.dir}\hashMyFiles.exe">
-            <arg value="/file &quot;${webpi.filename}&quot;" />
-            <arg value="/stext &quot;${root.dir}\webPi_sha.txt&quot;" />
-        </exec>
-    </target>
-
-
-    <target name="init" description="init tasks for the build">
-        <delete dir="${build.dir}" />
-        <mkdir dir="${build.dir}" />
-    </target>
-
-
-</project>

build/Nant/umbraco.build

@@ -1,248 +0,0 @@
-<?xml version="1.0" ?>
-<project name="umbraco" default="compile" basedir=".">
-  <description>Build the umbraco 3.1.x Application</description>
-
-  <!-- global properties, generally won't change -->
-
-  <property name="nant.settings.currentframework" value="net-2.0" />
-
-  <!-- filenames and directories, generally won't change -->
-
-  <property name="web.dir" value="D:\inetpub\wwwroot\v4.umbraco.org" />
-  <property name="public.dir" value="D:\inetpub\wwwroot\nightlies\umbraco 4.0" />
-  <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="dlls.dir" value="${root.dir}\foreign dlls" />
-  
-  <property name="build.major" value="4"/>
-  <property name="build.minor" value="0"/>
-  <property name="build.build" value="0"/>
-  <property name="build.revision" value="0"/>
-
-  <property name="docs.dir" value="${root.dir}\docs" />
-
-  <property name="win.dir" value="c:\WINDOWS" />
-  <property name="cc.dir" value="C:\Program Files\CruiseControl.NET\server" />
-  <property name="Webdeploy.dir" value="C:\Program Files\MSBuild\Microsoft\WebDeployment\v8.0" />
-
-  <!-- Sandcastle Directories -->
-  <property name="sandcastle.dir" value="c:\Program Files\Sandcastle" />
-  <property name="sandcastle.workingdir" value="${root.dir}\docs\SandcastleWorkingDir" />
-  <property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
-  <!-- Sandcastle Executables -->
-  <property name="sandcastle.mrefbuilder"  value="${sandcastle.dir}\productiontools\mrefbuilder.exe" />
-  <property name="sandcastle.buildassembler" value="${sandcastle.dir}\productiontools\buildassembler.exe" />
-  <property name="sandcastle.xsltransform" value="${sandcastle.dir}\productiontools\xsltransform.exe" />
-  <!-- Transformations -->
-  <property name="sandcastle.ApplyVSDocModel.xsl" value="${sandcastle.dir}\ProductionTransforms\ApplyVSDocModel.xsl" />
-  <property name="sandcastle.addguidfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddGuidFilenames.xsl" />
-  <property name="sandcastle.addfriendlyfilenames.xsl" value="${sandcastle.dir}\ProductionTransforms\AddFriendlyFilenames.xsl" />
-  <property name="sandcastle.reflectiontomanifest.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToManifest.xsl" />
-  <property name="sandcastle.reflectiontochmproject.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmProject.xsl" />
-  <property name="sandcastle.reflectiontochmcontents.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmContents.xsl" />
-  <property name="sandcastle.reflectiontochmindex.xsl" value="${sandcastle.dir}\ProductionTransforms\ReflectionToChmIndex.xsl" />
-
-  <property name="sandcastle.buildassembler.config" value="${sandcastle.dir}\Presentation\wiki\configuration\sandcastle.config" />
-  
-  <target name="compile" depends="init">
-
-    <attrib normal="true" readonly="false">
-      <fileset basedir="${root.dir}">
-        <include name="**/*" />
-      </fileset>
-    </attrib>
-
-    <exec program="${win.dir}\microsoft.net\framework\v3.5\msbuild.exe">
-      <arg value="${root.dir}\umbraco.sln" />
-    </exec>
-
-    <exec program="${win.dir}\microsoft.net\framework\v2.0.50727\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
-
-    <!-- Moves stuff around and zips the distribution-->
-    <call target="zip"/>
-    
-    <!-- Handles documentation 
-    <call target="docs" />
-    -->
-    
-  </target>
-
-  
-  <target name="clean" description="remove generated files">
-
-
-  </target>
-
-  <target name="docs" description="generates documents">
-    
-    <!-- Create a doc dir and move vs comment files to it-->
-    <mkdir dir="${docs.dir}" />
-    <copy todir="${docs.dir}">
-      <fileset basedir="${build.dir}\bin">
-        <include name="*.xml" />
-      </fileset>
-    </copy>
-
-    <!-- Create or Cleanup Working Directory -->
-    <mkdir dir="${sandcastle.workingdir}" if="${not directory::exists(sandcastle.workingdir)}" />
-    <delete>
-      <fileset basedir="${sandcastle.workingdir}">
-        <include name="**\*" />
-      </fileset>
-    </delete>
-
-    <copy file="${sandcastle.buildassembler.config}" tofile="${sandcastle.workingdir}\Sandcastle.config">
-      <filterchain>
-        <replacestring from="%DXROOT%\" to="${sandcastle.dir}" />
-        <replacestring from=".\comments.xml" to="${docs.dir}\*.xml" />
-      </filterchain>
-    </copy>
-
-    <!-- Run MRefBuilder (introspection on assemblies) to create basic Reflection XML -->
-    <exec program="${sandcastle.mrefbuilder}" workingdir="${sandcastle.workingdir}">
-      <arg value="&quot;${build.dir}\bin\businesslogic.dll&quot; " />
-      <arg value="&quot;${build.dir}\bin\cms.dll&quot; " />
-      <arg value="&quot;${build.dir}\bin\controls.dll&quot; " />
-      <arg value="&quot;${build.dir}\bin\interfaces.dll&quot; " />
-      <arg value="&quot;${build.dir}\bin\umbraco.datalayer.dll&quot; " />
-      <arg value="&quot;${build.dir}\bin\umbraco.dll&quot; " />
-      <arg value="&quot;${build.dir}\bin\umbraco.editorcontrols.dll&quot; " />
-      <arg value="&quot;${build.dir}\bin\umbraco.providers.dll&quot; " />
-      <arg value="&quot;${build.dir}\bin\umbraco.webservices.dll&quot; " />
-      <arg value="/out:reflection.org" />
-    </exec>
-
-    <!-- Regroup overloads -->
-    <exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
-      <arg value="reflection.org" />
-      <arg value="/xsl:&quot;${sandcastle.addfriendlyfilenames.xsl}&quot;" />
-      <arg value="/out:reflection.xml" />
-    </exec> 
-     
-
-    <exec program="${sandcastle.xsltransform}" workingdir="${sandcastle.workingdir}">
-      <arg value="reflection.org" />
-      <arg value="/xsl:&quot;${sandcastle.reflectiontomanifest.xsl}&quot;" />
-      <arg value="/out:manifest.xml" />
-    </exec>
-
-    <exec program="${sandcastle.buildassembler}" workingdir="${sandcastle.workingdir}">
-      <arg value="/config:Sandcastle.config" />
-      <arg value="manifest.xml" />
-    </exec>
-  </target>
-
-  <target name="zip" description="zip the release">
-
-    <mkdir dir="${docs.dir}" />
-    <copy todir="${docs.dir}">
-      <fileset basedir="${build.dir}\bin">
-        <include name="*.xml" />
-      </fileset>
-    </copy>
-    
-    
-    <!--standard web.config-->
-    <copy file="${root.dir}\config templates\web.config" tofile="${build.dir}\web.config" failonerror="false" overwrite="true"/>
-
-    <!--standard /config files-->
-    <copy file="${root.dir}\config templates\config\404handlers.config" tofile="${build.dir}\config\404handlers.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\dashboard.config" tofile="${build.dir}\config\dashboard.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\formhandlers.config" tofile="${build.dir}\config\formhandlers.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\metablogconfig.config" tofile="${build.dir}\config\metablogconfig.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\restextensions.config" tofile="${build.dir}\config\restextensions.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\xsltextensions.config" tofile="${build.dir}\config\xsltextensions.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\tinymceconfig.config" tofile="${build.dir}\config\tinymceconfig.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\umbracosettings.config" tofile="${build.dir}\config\umbracosettings.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\urlrewriting.config" tofile="${build.dir}\config\urlrewriting.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\applications.config" tofile="${build.dir}\config\applications.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\config\trees.config" tofile="${build.dir}\config\trees.config" failonerror="false" overwrite="true"/>
-    
-    <!--standard /data/packages files-->
-    <copy file="${root.dir}\config templates\packages\installedPackages.config" tofile="${build.dir}\data\packages\installed\installedPackages.config" failonerror="false" overwrite="true"/>
-    <copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
-    
-    <!-- Standard access.xml file-->
-    <copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\data\access.xml" failonerror="false" overwrite="true"/>
-    
-    <!-- Standard create UI.xml-->
-    <copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
-    
-    <!-- Standard empty cache file -->
-    <copy file="${root.dir}\config templates\umbraco.config" tofile="${build.dir}\umbraco\data\umbraco.config" failonerror="false" overwrite="true"/>
-    
-    <!-- Baseline Language file for translation tool -->
-    <copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
-
-    <!--
-    <delete dir="${build.dir}\umbraco\webservices\api" />
-    <mkdir dir="${build.dir}\umbraco\webservices\api" />
-    
-    <copy todir="${build.dir}\umbraco\webservices\api">
-      <fileset basedir="${root.dir}\components\umbraco.webservices}">
-        <include name="*.asmx" />
-      </fileset>
-    </copy>
-    -->
-    
-    <!-- standard folders -->
-    <mkdir dir="${build.dir}\App_Code" />
-    <mkdir dir="${build.dir}\media" />
-    <mkdir dir="${build.dir}\masterpages" />
-    <mkdir dir="${build.dir}\scripts" />
-    <mkdir dir="${build.dir}\css" />
-    <mkdir dir="${build.dir}\python" />
-    <mkdir dir="${build.dir}\xslt" />
-    <mkdir dir="${build.dir}\usercontrols" />
-
-    <delete dir="${build.dir}\webservices" />
-    <delete dir="${build.dir}\umbracoBase" />
-    <delete dir="${build.dir}\Web References" />
-    <delete dir="${build.dir}\obj" />
-    <delete dir="${build.dir}\properties" />
-    <delete>
-      <fileset>
-        <include name="${build.dir}/**/*.build" />
-        <include name="${build.dir}/**/*.csproj" />
-        <include name="${build.dir}/**/*.vspscc" />
-        <include name="${build.dir}/**/*.scc" />
-        <include name="${build.dir}/**/*.sln" />
-        <include name="${build.dir}/**/*.compiled" />
-        <include name="${build.dir}/**/*.resx" />
-        <include name="${build.dir}/PrecompiledApp.config" />
-        <include name="${build.dir}/web.config.template" />
-      </fileset>
-    </delete>
-
-
-    <property name="dist.name" value="${ assemblyname::get-version( assemblyname::get-assembly-name('umbraco/presentation/bin/umbraco.dll') ) }"/>
-    
-
-    <zip zipfile="${web.dir}\nightly\umbraco40.zip" includeemptydirs="true" >
-      <fileset basedir="${root.dir}">
-        <include name="build/*" />
-        <include name="build/**/*" />
-      </fileset>
-    </zip>
-
-    <copy file="${web.dir}\nightly\umbraco40.zip" tofile="${public.dir}\${dist.name}_${datetime::get-ticks(datetime::now())}.zip" />
-
-    <copy file="${root.dir}\build.xml"  tofile="${web.dir}\nightly\build.xml">
-      <filterchain>
-        <replacetokens>
-          <token key="assembly" value="${dist.name}" />
-          <token key="date" value="${datetime::now()}" />
-        </replacetokens>
-      </filterchain>
-    </copy>
-    
-  </target>
-
-  <target name="init" description="init tasks for the build">
-    <delete dir="${build.dir}" />
-    <mkdir dir="${build.dir}" />
-  </target>
-
-  
-</project>

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms.Core</id>
-        <version>4.9.0</version>
+        <version>4.11.2</version>
         <title>Umbraco Cms Core Binaries</title>
         <authors>Morten Christensen</authors>
         <owners>Umbraco HQ</owners>

build/NuSpecs/UmbracoCms.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms</id>
-        <version>4.9.0</version>
+        <version>4.11.2</version>
         <title>Umbraco Cms</title>
         <authors>Morten Christensen</authors>
         <owners>Umbraco HQ</owners>
@@ -15,7 +15,7 @@
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-            <dependency id="UmbracoCms.Core" version="4.9.0" />
+            <dependency id="UmbracoCms.Core" version="4.11.2" />
         </dependencies>
     </metadata>
   <files>

src/SQLCE4Umbraco/Sql/Total.sql

@@ -146,7 +146,8 @@ CREATE TABLE [cmsContentType]
 [pk] [int] NOT NULL IDENTITY(1, 1), 
 [nodeId] [int] NOT NULL, 
 [alias] [nvarchar] (255) NULL, 
-[icon] [nvarchar] (255) NULL 
+[icon] [nvarchar] (255) NULL,
+[thumbnail] nvarchar(255) NOT NULL CONSTRAINT [DF_cmsContentType_thumbnail] DEFAULT ('folder.png')
 ) 
  
 ; 
@@ -657,9 +658,9 @@ ALTER TABLE [umbracoNode] DROP CONSTRAINT [FK_umbracoNode_umbracoNode]
 |SET IDENTITY_INSERT [umbracoNode] OFF 
 ;
 !!!SET IDENTITY_INSERT [cmsContentType] ON 
-|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (532, 1031, N'Folder', N'folder.gif') 
-|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (533, 1032, N'Image', N'mediaPhoto.gif') 
-|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon]) VALUES (534, 1033, N'File', N'mediaFile.gif') 
+|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon], [thumbnail]) VALUES (532, 1031, N'Folder', N'folder.gif', N'folder.png') 
+|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon], [thumbnail]) VALUES (533, 1032, N'Image', N'mediaPhoto.gif', N'mediaPhoto.png') 
+|INSERT INTO [cmsContentType] ([pk], [nodeId], [alias], [icon], [thumbnail]) VALUES (534, 1033, N'File', N'mediaFile.gif', N'mediaFile.png') 
 |SET IDENTITY_INSERT [cmsContentType] OFF 
 ;
 !!!SET IDENTITY_INSERT [umbracoUser] ON 
@@ -863,10 +864,10 @@ INSERT INTO [umbracoAppTree]([treeSilent], [treeInitialize], [treeSortOrder], [a
 INSERT INTO [umbracoAppTree]([treeSilent], [treeInitialize], [treeSortOrder], [appAlias], [treeAlias], [treeTitle], [treeIconClosed], [treeIconOpen], [treeHandlerAssembly], [treeHandlerType]) VALUES(0, 1, 2, 'settings', 'scripts', 'Scripts', 'folder.gif', 'folder_o.gif', 'umbraco', 'loadScripts') 
 ;
 */
-alter TABLE [cmsContentType]
+/*alter TABLE [cmsContentType]
 add [thumbnail] nvarchar(255) NOT NULL CONSTRAINT
 [DF_cmsContentType_thumbnail] DEFAULT ('folder.png')
-;
+;*/
 alter TABLE [cmsContentType]
 add [description] nvarchar(1500) NULL
 ;

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -79,6 +79,7 @@
     <EmbeddedResource Include="SqlCEResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>SqlCEResources1.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

src/SQLCE4Umbraco/SqlCEHelper.cs

@@ -51,7 +51,7 @@ namespace SqlCE4Umbraco
         internal void ClearDatabase()
         {
             var localConnection = new SqlCeConnection(ConnectionString);
-            if (!System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
+            if (System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
             {
                 var tables = new List<string>();
                 using (var reader = ExecuteReader("select table_name from information_schema.tables where TABLE_TYPE <> 'VIEW'"))

src/SQLCE4Umbraco/SqlCEResources1.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17626
+//     Runtime Version:4.0.30319.18010
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -73,11 +73,11 @@ namespace SQLCE4Umbraco {
         /// 
         ///IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT IMPORTANT
         /// 
-        ///    Database version: 4.8.0.2
+        ///    Database version: 4.10.0.0
         ///    
         ///    Please increment this version number if ANY change is made to this script,
         ///    so compatibility with scripts for other database systems can be verified easily.
-        ///    The first 3 digits depict the Umbraco  [rest of string was truncated]&quot;;.
+        ///    The first 3 digits depict the Umbraco [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Total {
             get {

src/Umbraco.Core/ActionsResolver.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Umbraco.Core.ObjectResolution;
+using umbraco.interfaces;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// A resolver to return all IAction objects
+	/// </summary>
+	internal sealed class ActionsResolver : ManyObjectsResolverBase<ActionsResolver, IAction>
+	{
+
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="packageActions"></param>		
+		internal ActionsResolver(IEnumerable<Type> packageActions)
+			: base(packageActions)
+		{
+
+		}
+
+		/// <summary>
+		/// Gets the <see cref="IPackageAction"/> implementations.
+		/// </summary>
+		public IEnumerable<IAction> Actions
+		{
+			get
+			{
+				return Values;
+			}
+		}
+
+		protected override IEnumerable<IAction> CreateInstances()
+		{
+			var actions = new List<IAction>();
+			var foundIActions = PluginManager.Current.ResolveActions();
+			foreach (var type in foundIActions)
+			{
+				IAction typeInstance;
+				var instance = type.GetProperty("Instance", BindingFlags.Public | BindingFlags.Static);
+				//if the singletone initializer is not found, try simply creating an instance of the IAction if it supports public constructors
+				if (instance == null)
+					typeInstance = PluginManager.Current.CreateInstance<IAction>(type);
+				else
+					typeInstance = instance.GetValue(null, null) as IAction;
+
+				if (typeInstance != null)
+				{
+					actions.Add(typeInstance);
+				}
+			}
+			return actions;
+		}
+
+	}
+}

src/Umbraco.Core/ActivatorHelper.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// Helper methods for Activation
+	/// </summary>
+	internal static class ActivatorHelper
+	{
+		/// <summary>
+		/// Creates an instance of a type using that type's default constructor.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <returns></returns>
+		public static T CreateInstance<T>() where T : class, new()
+		{
+			return Activator.CreateInstance(typeof(T)) as T;
+		}
+	}
+}

src/Umbraco.Core/ApplicationContext.cs

@@ -0,0 +1,143 @@
+using System;
+using System.Collections;
+using System.Configuration;
+using System.Data;
+using System.Diagnostics;
+using System.Linq;
+using System.Web;
+using System.Web.Caching;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+
+
+namespace Umbraco.Core
+{
+	/// <summary>
+    /// the Umbraco Application context
+    /// </summary>
+    /// <remarks>
+    /// one per AppDomain, represents the global Umbraco application
+    /// </remarks>
+    public class ApplicationContext
+    {
+    	/// <summary>
+        /// Constructor
+        /// </summary>
+        internal ApplicationContext()
+    	{
+			//create a new application cache from the HttpRuntime.Cache
+    		ApplicationCache = HttpRuntime.Cache == null 
+				? new CacheHelper(new Cache()) 
+				: new CacheHelper(HttpRuntime.Cache);
+    	}
+
+		/// <summary>
+    	/// Singleton accessor
+    	/// </summary>
+    	public static ApplicationContext Current { get; internal set; }
+
+		/// <summary>
+		/// Returns the application wide cache accessor
+		/// </summary>
+		/// <remarks>
+		/// Any caching that is done in the application (app wide) should be done through this property
+		/// </remarks>
+		public CacheHelper ApplicationCache { get; private set; }
+
+    	// IsReady is set to true by the boot manager once it has successfully booted
+        // note - the original umbraco module checks on content.Instance in umbraco.dll
+        //   now, the boot task that setup the content store ensures that it is ready
+        bool _isReady = false;
+		readonly System.Threading.ManualResetEventSlim _isReadyEvent = new System.Threading.ManualResetEventSlim(false);
+        public bool IsReady
+        {
+            get
+            {
+                return _isReady;
+            }
+            internal set
+            {
+                AssertIsNotReady();
+                _isReady = value;
+				_isReadyEvent.Set();
+            }
+        }
+
+		public bool WaitForReady(int timeout)
+		{
+			return _isReadyEvent.WaitHandle.WaitOne(timeout);
+		}
+
+
+        // notes
+        //   GlobalSettings.ConfigurationStatus returns the value that's in the web.config, so it's the "configured version"
+        //   GlobalSettings.CurrentVersion returns the hard-coded "current version"
+        //   the system is configured if they match
+        //   if they don't, install runs, updates web.config (presumably) and updates GlobalSettings.ConfiguredStatus
+        //
+        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it...
+        //
+        public bool IsConfigured
+        {
+            // fixme - let's do this for the time being
+            get
+            {
+            	return Configured;
+            }
+        }
+
+		private bool Configured
+		{
+			get
+			{
+				try
+				{
+					string configStatus = ConfigurationStatus;
+					string currentVersion = GlobalSettings.CurrentVersion;
+
+
+					if (currentVersion != configStatus)
+					{
+						LogHelper.Info<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
+					}
+						
+
+					return (configStatus == currentVersion);
+				}
+				catch
+				{
+					return false;
+				}
+			}
+		}
+
+		private string ConfigurationStatus
+		{
+			get
+			{
+				try
+				{
+					return ConfigurationManager.AppSettings["umbracoConfigurationStatus"];
+				}
+				catch
+				{
+					return String.Empty;
+				}
+			}			
+		}
+
+
+        private void AssertIsReady()
+        {
+            if (!this.IsReady)
+                throw new Exception("ApplicationContext is not ready yet.");
+        }
+
+        private void AssertIsNotReady()
+        {
+            if (this.IsReady)
+                throw new Exception("ApplicationContext has already been initialized.");
+        }
+    }
+}

src/Umbraco.Core/AssemblyExtensions.cs

@@ -0,0 +1,36 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Umbraco.Core
+{
+	internal static class AssemblyExtensions
+	{
+		/// <summary>
+		/// Returns the file used to load the assembly
+		/// </summary>
+		/// <param name="assembly"></param>
+		/// <returns></returns>
+		public static FileInfo GetAssemblyFile(this Assembly assembly)
+		{
+			var codeBase = assembly.CodeBase;
+			var uri = new Uri(codeBase);
+			var path = uri.LocalPath;
+			return new FileInfo(path);
+		}
+
+		/// <summary>
+		///  Returns the file used to load the assembly
+		/// </summary>
+		/// <param name="assemblyName"></param>
+		/// <returns></returns>
+		public static FileInfo GetAssemblyFile(this AssemblyName assemblyName)
+		{
+			var codeBase = assemblyName.CodeBase;
+			var uri = new Uri(codeBase);
+			var path = uri.LocalPath;
+			return new FileInfo(path);
+		}
+
+	}
+}

src/Umbraco.Core/Attempt.cs

@@ -0,0 +1,66 @@
+using System;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// Represents the result of an operation attempt
+	/// </summary>
+	/// <typeparam name="T"></typeparam>
+	/// <remarks></remarks>
+	[Serializable]
+	public struct Attempt<T>
+	{
+		private readonly bool _success;
+		private readonly T _result;
+		private readonly Exception _error;
+
+		/// <summary>
+		/// Gets a value indicating whether this <see cref="Attempt{T}"/> represents a successful operation.
+		/// </summary>
+		/// <remarks></remarks>
+		public bool Success
+		{
+			get { return _success; }
+		}
+
+		/// <summary>
+		/// Gets the error associated with an unsuccessful attempt.
+		/// </summary>
+		/// <value>The error.</value>
+		public Exception Error { get { return _error; } }
+
+		/// <summary>
+		/// Gets the parse result.
+		/// </summary>
+		/// <remarks></remarks>
+		public T Result
+		{
+			get { return _result; }
+		}
+
+		/// <summary>
+		/// Represents an unsuccessful parse operation
+		/// </summary>
+		public static readonly Attempt<T> False = new Attempt<T>(false, default(T));
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="Attempt{T}"/> struct.
+		/// </summary>
+		/// <param name="success">If set to <c>true</c> this tuple represents a successful parse result.</param>
+		/// <param name="result">The parse result.</param>
+		/// <remarks></remarks>
+		public Attempt(bool success, T result)
+		{
+			_success = success;
+			_result = result;
+			_error = null;
+		}
+
+		public Attempt(Exception error)
+		{
+			_success = false;
+			_result = default(T);
+			_error = error;
+		}
+	}
+}

src/Umbraco.Core/CacheHelper.cs

@@ -0,0 +1,164 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.Caching;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core
+{
+
+	/// <summary>
+	/// Class that is exposed by the ApplicationContext for application wide caching purposes
+	/// </summary>
+	/// <remarks>
+	/// This class may be opened publicly at some point but needs a review of what is absoletely necessary.
+	/// </remarks>
+	public class CacheHelper
+	{
+		private readonly Cache _cache;
+
+		public CacheHelper(System.Web.Caching.Cache cache)
+		{
+			_cache = cache;
+		}
+
+		private static readonly object Locker = new object();
+
+        /// <summary>
+        /// Clears everything in umbraco's runtime cache, which means that not only
+        /// umbraco content is removed, but also other cache items from pages running in
+        /// the same application / website. Use with care :-)
+        /// </summary>
+        public void ClearAllCache()
+        {                         
+			var cacheEnumerator = _cache.GetEnumerator();
+            while (cacheEnumerator.MoveNext())
+            {
+                _cache.Remove(cacheEnumerator.Key.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache with the given key 
+        /// </summary>
+        /// <param name="key">Key</param>
+        public void ClearCacheItem(string key)
+        {
+            // NH 10 jan 2012
+            // Patch by the always wonderful Stéphane Gay to avoid cache null refs
+            lock (Locker)
+            {
+	            if (_cache[key] == null) return;
+	            _cache.Remove(key);;
+            }
+        }
+
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type name as the
+        /// input parameter. (using [object].GetType())
+        /// </summary>
+        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        public void ClearCacheObjectTypes(string typeName)
+        {
+            try
+            {
+				lock (Locker)
+				{
+					foreach (var c in from DictionaryEntry c in _cache where _cache[c.Key.ToString()] != null && _cache[c.Key.ToString()].GetType().ToString() == typeName select c)
+					{
+						_cache.Remove(c.Key.ToString());
+					}
+				}	            
+            }
+            catch (Exception e)
+            {
+				LogHelper.Error<CacheHelper>("Cache clearing error", e);
+            }
+        }
+
+        /// <summary>
+        /// Clears all cache items that starts with the key passed.
+        /// </summary>
+        /// <param name="keyStartsWith">The start of the key</param>
+        public void ClearCacheByKeySearch(string keyStartsWith)
+        {
+	        foreach (var c in from DictionaryEntry c in _cache where c.Key is string && ((string)c.Key).StartsWith(keyStartsWith) select c)
+	        {
+		        ClearCacheItem((string)c.Key);
+	        }
+        }
+		
+        public TT GetCacheItem<TT>(string cacheKey,
+            TimeSpan timeout, Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, null, timeout, getCacheItem);
+        }
+
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemRemovedCallback refreshAction, TimeSpan timeout,
+            Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, CacheItemPriority.Normal, refreshAction, timeout, getCacheItem);
+        }
+
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
+            Func<TT> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, priority, refreshAction, null, timeout, getCacheItem);
+        }
+
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority, 
+			CacheItemRemovedCallback refreshAction,
+            CacheDependency cacheDependency, 
+			TimeSpan timeout, 
+			Func<TT> getCacheItem)
+        {
+	        return GetCacheItem(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem, Locker);
+        }
+
+		/// <summary>
+		/// This is used only for legacy purposes as I did not want to change all of the locking to one lock found on this object, 
+		/// however, the reason this is used for legacy purposes is because I see zero reason to use different sync locks, just the one
+		/// lock (Locker) on this class should be sufficient.
+		/// </summary>
+		/// <typeparam name="TT"></typeparam>
+		/// <param name="cacheKey"></param>
+		/// <param name="priority"></param>
+		/// <param name="refreshAction"></param>
+		/// <param name="cacheDependency"></param>
+		/// <param name="timeout"></param>
+		/// <param name="getCacheItem"></param>
+		/// <param name="syncLock"></param>
+		/// <returns></returns>
+		internal TT GetCacheItem<TT>(string cacheKey,
+			CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
+			CacheDependency cacheDependency, TimeSpan timeout, Func<TT> getCacheItem, object syncLock)
+		{
+			var result = _cache.Get(cacheKey);
+			if (result == null)
+			{
+				lock (syncLock)
+				{
+					result = _cache.Get(cacheKey);
+					if (result == null)
+					{
+						result = getCacheItem();
+						if (result != null)
+						{
+							//we use Insert instead of add if for some crazy reason there is now a cache with the cache key in there, it will just overwrite it.
+							_cache.Insert(cacheKey, result, cacheDependency, DateTime.Now.Add(timeout), TimeSpan.Zero, priority, refreshAction);
+						}
+					}
+				}
+			}
+			return (TT)result;
+		}
+    }
+
+}

src/Umbraco.Core/CacheRefreshersResolver.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.ObjectResolution;
+using umbraco.interfaces;
+
+namespace Umbraco.Core
+{
+	
+
+	/// <summary>
+	/// A resolver to return all ICacheRefresher objects
+	/// </summary>
+	internal sealed class CacheRefreshersResolver : LegacyTransientObjectsResolver<CacheRefreshersResolver, ICacheRefresher>
+	{
+	
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="refreshers"></param>		
+		internal CacheRefreshersResolver(IEnumerable<Type> refreshers)
+			: base(refreshers)
+		{
+			
+		}
+
+
+		/// <summary>
+		/// Gets the <see cref="ICacheRefresher"/> implementations.
+		/// </summary>
+		public IEnumerable<ICacheRefresher> CacheResolvers
+		{
+			get
+			{
+				EnsureIdsAreTracked();
+				return Values;
+			}
+		}
+
+		protected override Guid GetUniqueIdentifier(ICacheRefresher obj)
+		{
+			return obj.UniqueIdentifier;
+		}
+	}
+}

src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs

@@ -0,0 +1,35 @@
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+	/// <summary>
+	/// Marks the program elements that Umbraco is experimenting with and could become public.
+	/// </summary>
+	/// <remarks>
+	/// <para>Indicates that Umbraco  is experimenting with code that potentially could become
+	/// public, but we're not sure, and the code is not stable and can be refactored at any time.</para>
+	/// <para>The issue tracker should contain more details, discussion, and planning.</para>
+	/// </remarks>
+	[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
+	internal sealed class UmbracoExperimentalFeatureAttribute : Attribute
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="UmbracoExperimentalFeatureAttribute"/> class with a description.
+		/// </summary>
+		/// <param name="description">The text string that describes what is intended.</param>
+		public UmbracoExperimentalFeatureAttribute(string description)
+		{
+
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="UmbracoExperimentalFeatureAttribute"/> class with a tracker url and a description.
+		/// </summary>
+		/// <param name="trackerUrl">The url of a tracker issue containing more details, discussion, and planning.</param>
+		/// <param name="description">The text string that describes what is intended.</param>
+		public UmbracoExperimentalFeatureAttribute(string trackerUrl, string description)
+		{
+			
+		}
+	}
+}

src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+	/// <summary>
+	/// Marks the program elements that Umbraco is considering making public.
+	/// </summary>
+	/// <remarks>
+	/// <para>Indicates that Umbraco considers making the (currently internal) program element public
+	/// at some point in the future, but the decision is not fully made yet and is still pending reviews.</para>
+	/// <para>Note that it is not a commitment to make the program element public. It may not ever become public.</para>
+	/// <para>The issue tracker should contain more details, discussion, and planning.</para>
+	/// </remarks>
+	[AttributeUsage(AttributeTargets.All, AllowMultiple=false, Inherited=false)]
+	internal sealed class UmbracoProposedPublicAttribute : Attribute
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="UmbracoProposedPublicAttribute"/> class with a description.
+		/// </summary>
+		/// <param name="description">The text string that describes what is intended.</param>
+		public UmbracoProposedPublicAttribute(string description)
+		{
+
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="UmbracoProposedPublicAttribute"/> class with a tracker url and a description.
+		/// </summary>
+		/// <param name="trackerUrl">The url of a tracker issue containing more details, discussion, and planning.</param>
+		/// <param name="description">The text string that describes what is intended.</param>
+		public UmbracoProposedPublicAttribute(string trackerUrl, string description)
+		{
+			
+		}
+	}
+}

src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+	/// <summary>
+	/// Marks the program elements that Umbraco will obsolete.
+	/// </summary>
+	/// <remarks>
+	/// Indicates that Umbraco will obsolete the program element at some point in the future, but we do not want to
+	/// explicitely mark it [Obsolete] yet to avoid warning messages showing when developers compile Umbraco.
+	/// </remarks>
+	[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
+	internal sealed class UmbracoWillObsoleteAttribute : Attribute
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="UmbracoWillObsoleteAttribute"/> class with a description.
+		/// </summary>
+		/// <param name="description">The text string that describes what is intended.</param>
+		public UmbracoWillObsoleteAttribute(string description)
+		{
+
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="UmbracoWillObsoleteAttribute"/> class with a tracker url and a description.
+		/// </summary>
+		/// <param name="trackerUrl">The url of a tracker issue containing more details, discussion, and planning.</param>
+		/// <param name="description">The text string that describes what is intended.</param>
+		public UmbracoWillObsoleteAttribute(string trackerUrl, string description)
+		{
+			
+		}
+	}
+}

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -1,23 +1,23 @@
 using System;
 using System.Collections.Generic;
 using System.Configuration;
-using System.Diagnostics;
+using System.Linq;
 using System.Web;
 using System.Web.Configuration;
+using System.Web.Routing;
 using System.Xml;
+using System.Xml.Linq;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
 {
 	//NOTE: Do not expose this class ever until we cleanup all configuration including removal of static classes, etc...
 	// we have this two tasks logged:
 	// http://issues.umbraco.org/issue/U4-58
-	// http://issues.umbraco.org/issue/U4-115
-
-	//TODO: Re-enable Logging!!!!
-
-	//TODO: Remove checks for if HttpContext is null, why are we doing this? we should be checking if the config setting
-	// can be read and if not then return the default.
+	// http://issues.umbraco.org/issue/U4-115	
+	
+	//TODO:  Replace checking for if the app settings exist and returning an empty string, instead return the defaults!
 
     /// <summary>
     /// The GlobalSettings Class contains general settings information for the entire Umbraco instance based on information from  web.config appsettings 
@@ -25,38 +25,10 @@ namespace Umbraco.Core.Configuration
     internal class GlobalSettings
     {
 
-		private static HttpContextBase _customHttpContext;
-
-		/// <summary>
-		/// Gets/sets the HttpContext object, this is generally used for unit testing. By default this will 
-		/// use the HttpContext.Current
-		/// </summary>
-		internal static HttpContextBase HttpContext
-		{
-			get
-			{
-				if (_customHttpContext == null && System.Web.HttpContext.Current != null)
-				{
-					//return the current HttpContxt, do NOT store this in the _customHttpContext field
-					//as it will persist across reqeusts!
-					return new HttpContextWrapper(System.Web.HttpContext.Current);
-				}
-
-				if (_customHttpContext == null && System.Web.HttpContext.Current == null)
-				{
-					//throw new NullReferenceException("The HttpContext property has not been set or the object execution is not running inside of an HttpContext");
-					//NOTE: We should throw an exception here but the legacy code checks for null so we need to stick witht he legacy code for now.
-					return null; 
-				}
-				return _customHttpContext;
-			}
-			set { _customHttpContext = value; }
-		}
-
         #region Private static fields
         
 		// CURRENT UMBRACO VERSION ID
-    	private const string CurrentUmbracoVersion = "4.9.1";
+    	private const string CurrentUmbracoVersion = "4.11.2";
 
     	private static string _reservedUrlsCache;
         private static string _reservedPathsCache;
@@ -72,9 +44,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                if (HttpContext != null)
-                    return ConfigurationManager.AppSettings["umbracoReservedUrls"];
-                return String.Empty;
+            	return ConfigurationManager.AppSettings.ContainsKey("umbracoReservedUrls") 
+					? ConfigurationManager.AppSettings["umbracoReservedUrls"] 
+					: string.Empty;
             }
         }
 
@@ -86,9 +58,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                if (HttpContext != null)
-                    return ConfigurationManager.AppSettings["umbracoReservedPaths"];
-                return String.Empty;
+	            return ConfigurationManager.AppSettings.ContainsKey("umbracoReservedPaths")
+		                   ? ConfigurationManager.AppSettings["umbracoReservedPaths"]
+		                   : string.Empty;
             }
         }
 
@@ -96,18 +68,13 @@ namespace Umbraco.Core.Configuration
         /// Gets the name of the content XML file.
         /// </summary>
         /// <value>The content XML.</value>
-        public static string ContentXml
+        public static string ContentXmlFile
         {
             get
-            {
-                try
-                {
-                    return ConfigurationManager.AppSettings["umbracoContentXML"];
-                }
-                catch
-                {
-                    return String.Empty;
-                }
+            {                
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXML")
+					? ConfigurationManager.AppSettings["umbracoContentXML"]
+					: string.Empty;	                    
             }
         }
 
@@ -119,14 +86,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                try
-                {
-                    return ConfigurationManager.AppSettings["umbracoStorageDirectory"];
-                }
-                catch
-                {
-                    return String.Empty;
-                }
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoStorageDirectory")
+					? ConfigurationManager.AppSettings["umbracoStorageDirectory"]
+					: string.Empty;	                    
             }
         }
 
@@ -138,18 +100,35 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-
-                try
-                {
-                    return IOHelper.ResolveUrl(ConfigurationManager.AppSettings["umbracoPath"]);
-                }
-                catch
-                {
-                    return String.Empty;
-                }
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoPath")
+					? IOHelper.ResolveUrl(ConfigurationManager.AppSettings["umbracoPath"])
+					: string.Empty;	                
             }
         }
 
+		/// <summary>
+		/// This returns the string of the MVC Area route.
+		/// </summary>
+		/// <remarks>
+		/// THIS IS TEMPORARY AND SHOULD BE REMOVED WHEN WE MIGRATE/UPDATE THE CONFIG SETTINGS TO BE A REAL CONFIG SECTION
+		/// AND SHOULD PROBABLY BE HANDLED IN A MORE ROBUST WAY.
+		/// 
+		/// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
+		/// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
+		/// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
+		/// </remarks>
+    	internal static string UmbracoMvcArea
+    	{
+    		get 
+			{ 
+				if (Path.IsNullOrWhiteSpace())
+				{
+					throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
+				}
+				return Path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim();
+			}
+    	}
+
         /// <summary>
         /// Gets the path to umbraco's client directory (/umbraco_client by default).
         /// This is a relative path to the Umbraco Path as it always must exist beside the 'umbraco'
@@ -172,14 +151,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                try
-                {
-                    return ConfigurationManager.AppSettings["umbracoDbDSN"];
-                }
-                catch
-                {
-                    return String.Empty;
-                }
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoDbDSN")
+					? ConfigurationManager.AppSettings["umbracoDbDSN"]
+					: string.Empty;	          				
             }
             set
             {
@@ -198,45 +172,16 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                try
-                {
-                    return ConfigurationManager.AppSettings["umbracoConfigurationStatus"];
-                }
-                catch
-                {
-                    return String.Empty;
-                }
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoConfigurationStatus")
+					? ConfigurationManager.AppSettings["umbracoConfigurationStatus"]
+					: string.Empty;	        
             }
             set
             {
                 SaveSetting("umbracoConfigurationStatus", value);
             }
         }
-
-       
-        /// <summary>
-        /// Forces umbraco to be medium trust compatible
-        /// </summary>
-        /// <value>If true, umbraco will be medium-trust compatible, no matter what Permission level the server is on.</value>
-        public static bool UseMediumTrust
-        {
-            get
-            {
-                try
-                {
-                	var trustLevel = SystemUtilities.GetCurrentTrustLevel();
-					if (trustLevel == AspNetHostingPermissionLevel.High || trustLevel == AspNetHostingPermissionLevel.Unrestricted)
-                        return false;
-                    else
-                        return bool.Parse(ConfigurationManager.AppSettings["umbracoUseMediumTrust"]);
-                }
-                catch
-                {
-                    return false;
-                }
-            }
-        }
-
+		
         /// <summary>
         /// Saves a setting into the configuration file.
         /// </summary>
@@ -254,13 +199,19 @@ namespace Umbraco.Core.Configuration
                     vDir = v.PhysicalDirectory;
                 }
             }
-            
-            var doc = new XmlDocument();
-            doc.Load(String.Concat(vDir, "web.config"));
-            var root = doc.DocumentElement;
-            var setting = doc.SelectSingleNode(String.Concat("//appSettings/add[@key='", key, "']"));
-            setting.Attributes["value"].InnerText = value;
-            doc.Save(String.Concat(vDir, "web.config"));
+
+            string fileName = String.Concat(vDir, "web.config");
+            var xml = XDocument.Load(fileName);
+            var appSettings = xml.Root.Descendants("appSettings").Single();
+
+            // Update appSetting if it exists, or else create a new appSetting for the given key and value
+            var setting = appSettings.Descendants("add").Where(s => s.Attribute("key").Value == key).FirstOrDefault();
+            if (setting == null)
+                appSettings.Add(new XElement("add", new XAttribute("key", key), new XAttribute("value", value)));
+            else
+                setting.Attribute("value").Value = value;
+
+            xml.Save(fileName);
             ConfigurationManager.RefreshSection("appSettings");
         }
 
@@ -308,9 +259,7 @@ namespace Umbraco.Core.Configuration
 
                     if (currentVersion != configStatus)
                     {
-						//Log.Add(LogTypes.Debug, User.GetUser(0), -1,
-						//        "CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus +
-						//        "'");
+                    	LogHelper.Debug<GlobalSettings>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");                    	
                     }
                         
 
@@ -369,69 +318,17 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                int versionCheckPeriod = 7;
-                if (HttpContext != null)
-                {
-                    if (int.TryParse(ConfigurationManager.AppSettings["umbracoVersionCheckPeriod"], out versionCheckPeriod))
-                        return versionCheckPeriod;
-
-                }
-                return versionCheckPeriod;
+				try
+				{
+					return int.Parse(ConfigurationManager.AppSettings["umbracoVersionCheckPeriod"]);
+				}
+				catch
+				{
+					return 7;
+				}
             }
         }
-
-        /// <summary>
-        /// Gets the URL forbitten characters.
-        /// </summary>
-        /// <value>The URL forbitten characters.</value>
-        public static string UrlForbittenCharacters
-        {
-            get
-            {
-                if (HttpContext != null)
-                    return ConfigurationManager.AppSettings["umbracoUrlForbittenCharacters"];
-                return "";
-            }
-        }
-
-        /// <summary>
-        /// Gets the URL space character.
-        /// </summary>
-        /// <value>The URL space character.</value>
-        public static string UrlSpaceCharacter
-        {
-            get
-            {
-                if (HttpContext != null)
-                    return ConfigurationManager.AppSettings["umbracoUrlSpaceCharacter"];
-                return "";
-            }
-        }
-
-        /// <summary>
-        /// Gets the SMTP server IP-address or hostname.
-        /// </summary>
-        /// <value>The SMTP server.</value>
-        public static string SmtpServer
-        {
-            get
-            {
-                try
-                {
-                    var mailSettings = ConfigurationManager.GetSection("system.net/mailSettings") as System.Net.Configuration.MailSettingsSectionGroup;
-
-                    if (mailSettings != null)
-                        return mailSettings.Smtp.Network.Host;
-                    else
-                        return ConfigurationManager.AppSettings["umbracoSmtpServer"];
-                }
-                catch
-                {
-                    return "";
-                }
-            }
-        }
-
+        
         /// <summary>
         /// Returns a string value to determine if umbraco should disbable xslt extensions
         /// </summary>
@@ -440,9 +337,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                if (HttpContext != null)
-                    return ConfigurationManager.AppSettings["umbracoDisableXsltExtensions"];
-                return "";
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoDisableXsltExtensions")
+					? ConfigurationManager.AppSettings["umbracoDisableXsltExtensions"]
+					: string.Empty;	   
             }
         }
 
@@ -454,9 +351,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                if (HttpContext != null)
-                    return ConfigurationManager.AppSettings["umbracoEditXhtmlMode"];
-                return "";
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoEditXhtmlMode")
+					? ConfigurationManager.AppSettings["umbracoEditXhtmlMode"]
+					: string.Empty;	   
             }
         }
 
@@ -468,9 +365,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                if (HttpContext != null)
-                    return ConfigurationManager.AppSettings["umbracoDefaultUILanguage"];
-                return "";
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoDefaultUILanguage")
+					? ConfigurationManager.AppSettings["umbracoDefaultUILanguage"]
+					: string.Empty;	   
             }
         }
 
@@ -482,9 +379,9 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                if (HttpContext != null)
-                    return ConfigurationManager.AppSettings["umbracoProfileUrl"];
-                return "";
+				return ConfigurationManager.AppSettings.ContainsKey("umbracoProfileUrl")
+					? ConfigurationManager.AppSettings["umbracoProfileUrl"]
+					: string.Empty;	   
             }
         }
 
@@ -498,9 +395,14 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                if (HttpContext != null)
-                    return bool.Parse(ConfigurationManager.AppSettings["umbracoHideTopLevelNodeFromPath"]);
-                return false;
+				try
+				{
+					return bool.Parse(ConfigurationManager.AppSettings["umbracoHideTopLevelNodeFromPath"]);
+				}
+				catch
+				{
+					return false;
+				}
             }
         }
 
@@ -617,74 +519,60 @@ namespace Umbraco.Core.Configuration
             {
                 string license =
                     "<A href=\"http://umbraco.org/redir/license\" target=\"_blank\">the open source license MIT</A>. The umbraco UI is freeware licensed under the umbraco license.";
-                if (HttpContext != null)
-                {
-                    var versionDoc = new XmlDocument();
-                    var versionReader = new XmlTextReader(IOHelper.MapPath(SystemDirectories.Umbraco + "/version.xml"));
-                    versionDoc.Load(versionReader);
-                    versionReader.Close();
 
-                    // check for license
-                    try
-                    {
-                        string licenseUrl =
-                            versionDoc.SelectSingleNode("/version/licensing/licenseUrl").FirstChild.Value;
-                        string licenseValidation =
-                            versionDoc.SelectSingleNode("/version/licensing/licenseValidation").FirstChild.Value;
-                        string licensedTo =
-                            versionDoc.SelectSingleNode("/version/licensing/licensedTo").FirstChild.Value;
+				var versionDoc = new XmlDocument();
+				var versionReader = new XmlTextReader(IOHelper.MapPath(SystemDirectories.Umbraco + "/version.xml"));
+				versionDoc.Load(versionReader);
+				versionReader.Close();
+
+				// check for license
+				try
+				{
+					string licenseUrl =
+						versionDoc.SelectSingleNode("/version/licensing/licenseUrl").FirstChild.Value;
+					string licenseValidation =
+						versionDoc.SelectSingleNode("/version/licensing/licenseValidation").FirstChild.Value;
+					string licensedTo =
+						versionDoc.SelectSingleNode("/version/licensing/licensedTo").FirstChild.Value;
+
+					if (licensedTo != "" && licenseUrl != "")
+					{
+						license = "umbraco Commercial License<br/><b>Registered to:</b><br/>" +
+								  licensedTo.Replace("\n", "<br/>") + "<br/><b>For use with domain:</b><br/>" +
+								  licenseUrl;
+					}
+				}
+				catch
+				{
+				}
 
-                        if (licensedTo != "" && licenseUrl != "")
-                        {
-                            license = "umbraco Commercial License<br/><b>Registered to:</b><br/>" +
-                                      licensedTo.Replace("\n", "<br/>") + "<br/><b>For use with domain:</b><br/>" +
-                                      licenseUrl;
-                        }
-                    }
-                    catch
-                    {
-                    }
-                }
                 return license;
             }
         }
 
+	    /// <summary>
+	    /// Determines whether the current request is reserved based on the route table and 
+	    /// whether the specified URL is reserved or is inside a reserved path.
+	    /// </summary>
+	    /// <param name="url"></param>
+	    /// <param name="httpContext"></param>
+	    /// <param name="routes">The route collection to lookup the request in</param>
+	    /// <returns></returns>
+	    public static bool IsReservedPathOrUrl(string url, HttpContextBase httpContext, RouteCollection routes)
+		{
+			if (httpContext == null) throw new ArgumentNullException("httpContext");
+		    if (routes == null) throw new ArgumentNullException("routes");
 
-        /// <summary>
-        /// Developer method to test if configuration settings are loaded properly.
-        /// </summary>
-        /// <value><c>true</c> if succesfull; otherwise, <c>false</c>.</value>
-        internal static bool Test
-        {
-            get
-            {            
-				if (HttpContext != null)
-				{
-					HttpContext.Response.Write("ContentXML :" + ContentXml + "\n");
-					HttpContext.Response.Write("DbDSN :" + DbDsn + "\n");
-					HttpContext.Response.Write("DebugMode :" + DebugMode + "\n");
-					HttpContext.Response.Write("DefaultUILanguage :" + DefaultUILanguage + "\n");
-					HttpContext.Response.Write("VersionCheckPeriod :" + VersionCheckPeriod + "\n");
-					HttpContext.Response.Write("DisableXsltExtensions :" + DisableXsltExtensions + "\n");
-					HttpContext.Response.Write("EditXhtmlMode :" + EditXhtmlMode + "\n");
-					HttpContext.Response.Write("HideTopLevelNodeFromPath :" + HideTopLevelNodeFromPath + "\n");
-					HttpContext.Response.Write("Path :" + Path + "\n");
-					HttpContext.Response.Write("ProfileUrl :" + ProfileUrl + "\n");
-					HttpContext.Response.Write("ReservedPaths :" + ReservedPaths + "\n");
-					HttpContext.Response.Write("ReservedUrls :" + ReservedUrls + "\n");
-					HttpContext.Response.Write("StorageDirectory :" + StorageDirectory + "\n");
-					HttpContext.Response.Write("TimeOutInMinutes :" + TimeOutInMinutes + "\n");
-					HttpContext.Response.Write("UrlForbittenCharacters :" + UrlForbittenCharacters + "\n");
-					HttpContext.Response.Write("UrlSpaceCharacter :" + UrlSpaceCharacter + "\n");
-					HttpContext.Response.Write("UseDirectoryUrls :" + UseDirectoryUrls + "\n");
-					return true;
-				}
-                return false;
-            }
-        }
+		    //check if the current request matches a route, if so then it is reserved.
+			var route = routes.GetRouteData(httpContext);
+			if (route != null)
+				return true;
 
+			//continue with the standard ignore routine
+		    return IsReservedPathOrUrl(url);
+		}
 
-        /// <summary>
+	    /// <summary>
         /// Determines whether the specified URL is reserved or is inside a reserved path.
         /// </summary>
         /// <param name="url">The URL to check.</param>
@@ -692,7 +580,7 @@ namespace Umbraco.Core.Configuration
         /// 	<c>true</c> if the specified URL is reserved; otherwise, <c>false</c>.
         /// </returns>
         public static bool IsReservedPathOrUrl(string url)
-        {
+        {			
             // check if GlobalSettings.ReservedPaths and GlobalSettings.ReservedUrls are unchanged
             if (!object.ReferenceEquals(_reservedPathsCache, GlobalSettings.ReservedPaths)
                 || !object.ReferenceEquals(_reservedUrlsCache, GlobalSettings.ReservedUrls))
@@ -727,14 +615,17 @@ namespace Umbraco.Core.Configuration
                 _reservedList = _newReservedList;
             }
 
-            string res = "";
-            foreach (string st in _reservedList._list.Keys)
-                res += st + ",";
-
-			Debug.Write("reserverd urls: '" + res + "'");
+			//The url should be cleaned up before checking:
+			// * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
+			// * We shouldn't be comparing the query at all
+			var pathPart = url.Split('?')[0];
+			if (!pathPart.Contains(".") && !pathPart.EndsWith("/"))
+			{
+				pathPart += "/";
+			}
 
             // return true if url starts with an element of the reserved list
-            return _reservedList.StartsWith(url.ToLower());
+			return _reservedList.StartsWith(pathPart.ToLowerInvariant());
         }
 
 		/// <summary>
@@ -809,14 +700,11 @@ namespace Umbraco.Core.Configuration
 					if (part == null || whole == null || part.Length >= whole.Length)
 						return _stringComparer.Compare(part, whole);
 
-                    // Reverted changeset 4d5a20d6124d because it will match with
-                    // anything starting with install and umbraco see issue U4-741 
-
-                    ////trim the end '/' of each
-                    //part = part.TrimEnd('/');
-                    //whole = whole.TrimEnd('/');
-                    //if (part.Length >= whole.Length)
-                    //    return _stringComparer.Compare(part, whole);
+					////ensure both have a / on the end
+					//part = part.EndsWith("/") ? part : part + "/"; 
+					//whole = whole.EndsWith("/") ? whole : whole + "/";
+					//if (part.Length >= whole.Length)
+					//    return _stringComparer.Compare(part, whole);
 
 					// loop through all characters that part and whole have in common
 					int pos = 0;

src/Umbraco.Core/Configuration/RazorDataTypeModelStaticMappingItem.cs

@@ -1,12 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-namespace Umbraco.Core
+namespace Umbraco.Core.Configuration
 {
-	//NOTE: I'm not sure what this does or what it is used for, have emailed Gareth about it as the name really means nothing to me 
-	// and don't know where this class actually belongs.
+
+	//NOTE: This is used in the old DynamicNode for performing value conversions/mappings for certain data types.
+	// it has been obsoleted because we've replaced this with the PropertyEditorValueConvertersResolver which can 
+	// have converters registered in code so we don't have to rely on even more config sections. 
+	// These things probably won't need to be created all that often and in code is much easier to do.
 
     internal class RazorDataTypeModelStaticMappingItem
     {

src/Umbraco.Core/CoreBootManager.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Umbraco.Core.Logging;
+using Umbraco.Core.ObjectResolution;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// A bootstrapper for the Umbraco application which initializes all objects for the Core of the application 
+	/// </summary>
+	/// <remarks>
+	/// This does not provide any startup functionality relating to web objects
+	/// </remarks>
+	internal class CoreBootManager : IBootManager
+	{
+
+		private DisposableTimer _timer;
+		private bool _isInitialized = false;
+		private bool _isStarted = false;
+		private bool _isComplete = false;
+
+		protected ApplicationContext ApplicationContext { get; private set; }
+
+		public virtual IBootManager Initialize()
+		{
+			if (_isInitialized)
+				throw new InvalidOperationException("The boot manager has already been initialized");
+
+			LogHelper.Info<CoreBootManager>("Umbraco application starting");
+			_timer = DisposableTimer.Start(x => LogHelper.Info<CoreBootManager>("Umbraco application startup complete" + " (took " + x + "ms)"));
+
+			//create the ApplicationContext
+			ApplicationContext = ApplicationContext.Current = new ApplicationContext();
+
+			InitializeResolvers();
+
+			_isInitialized = true;
+
+			return this;
+		}
+
+		/// <summary>
+		/// Fires after initialization and calls the callback to allow for customizations to occur
+		/// </summary>
+		/// <param name="afterStartup"></param>
+		/// <returns></returns>
+		public virtual IBootManager Startup(Action<ApplicationContext> afterStartup)
+		{
+			if (_isStarted)
+				throw new InvalidOperationException("The boot manager has already been initialized");
+
+			if (afterStartup != null)
+			{
+				afterStartup(ApplicationContext.Current);	
+			}
+
+			_isStarted = true;
+
+			return this;
+		}
+
+		/// <summary>
+		/// Fires after startup and calls the callback once customizations are locked
+		/// </summary>
+		/// <param name="afterComplete"></param>
+		/// <returns></returns>
+		public virtual IBootManager Complete(Action<ApplicationContext> afterComplete)
+		{
+			if (_isComplete)
+				throw new InvalidOperationException("The boot manager has already been completed");
+
+			//freeze resolution to not allow Resolvers to be modified
+			Resolution.Freeze();
+
+			//stop the timer and log the output
+			_timer.Dispose();
+
+			if (afterComplete != null)
+			{
+				afterComplete(ApplicationContext.Current);	
+			}
+
+			_isComplete = true;
+
+			return this;
+		}
+
+		/// <summary>
+		/// Create the resolvers
+		/// </summary>
+		protected virtual void InitializeResolvers()
+		{
+			CacheRefreshersResolver.Current = new CacheRefreshersResolver(
+				PluginManager.Current.ResolveCacheRefreshers());
+
+			DataTypesResolver.Current = new DataTypesResolver(
+				PluginManager.Current.ResolveDataTypes());
+
+			MacroFieldEditorsResolver.Current = new MacroFieldEditorsResolver(
+				PluginManager.Current.ResolveMacroRenderings());
+
+			PackageActionsResolver.Current = new PackageActionsResolver(
+				PluginManager.Current.ResolvePackageActions());
+
+			ActionsResolver.Current = new ActionsResolver(
+				PluginManager.Current.ResolveActions());
+
+			PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
+				PluginManager.Current.ResolvePropertyEditorValueConverters());
+			//add the internal ones, these are not public currently so need to add them manually
+			PropertyEditorValueConvertersResolver.Current.AddType<DatePickerPropertyEditorValueConverter>();
+			PropertyEditorValueConvertersResolver.Current.AddType<TinyMcePropertyEditorValueConverter>();
+			PropertyEditorValueConvertersResolver.Current.AddType<YesNoPropertyEditorValueConverter>();
+		}
+	}
+}

src/Umbraco.Core/CustomBooleanTypeConverter.cs

@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// Allows for converting string representations of 0 and 1 to boolean
+	/// </summary>
+	internal class CustomBooleanTypeConverter : BooleanConverter
+	{
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+		{
+			if (sourceType == typeof(string))
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+
+		public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value)
+		{
+			if (value is string)
+			{
+				var str = (string)value;
+				if (str == "1") return true;
+				if (str == "0" || str == "") return false;
+			}
+
+			return base.ConvertFrom(context, culture, value);
+		}
+	}
+}

src/Umbraco.Core/DataTableExtensions.cs

@@ -0,0 +1,120 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using umbraco.interfaces;
+
+namespace Umbraco.Core
+{
+	
+
+	/// <summary>
+	/// Static and extension methods for the DataTable object
+	/// </summary>
+	internal static class DataTableExtensions
+	{
+		
+
+		/// <summary>
+		/// Creates a DataTable with the specified alias and columns and uses a callback to populate the headers.
+		/// </summary>
+		/// <param name="tableAlias"></param>
+		/// <param name="getHeaders"></param>
+		/// <param name="rowData"> </param>
+		/// <returns></returns>
+		/// <remarks>
+		/// This has been migrated from the Node class and uses proper locking now. It is now used by the Node class and the 
+		/// DynamicPublishedContent extensions for legacy reasons.
+		/// </remarks>
+		public static DataTable GenerateDataTable(
+			string tableAlias, 						
+			Func<string, IEnumerable<KeyValuePair<string, string>>> getHeaders,
+			Func<IEnumerable<Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>>> rowData)
+		{			
+			var dt = new DataTable(tableAlias);
+			
+			//get all row data
+			var tableData = rowData().ToArray();
+			
+			//get all headers
+			var propertyHeaders = GetPropertyHeaders(tableAlias, getHeaders);
+			foreach(var h in propertyHeaders)
+			{
+				dt.Columns.Add(new DataColumn(h.Value));
+			}
+						
+			//add row data
+			foreach(var r in tableData)
+			{
+				dt.PopulateRow(
+					propertyHeaders,
+					r.Item1,
+					r.Item2);
+			}
+
+			return dt;
+		}
+
+		/// <summary>
+		/// Helper method to return this ugly object
+		/// </summary>
+		/// <returns></returns>
+		/// <remarks>
+		/// This is for legacy code, I didn't want to go creating custom classes for these
+		/// </remarks>
+		internal static List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>> CreateTableData()
+		{
+			return new List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>>();
+		}
+
+		/// <summary>
+		/// Helper method to deal with these ugly objects
+		/// </summary>
+		/// <param name="rowData"></param>
+		/// <param name="standardVals"></param>
+		/// <param name="userVals"></param>
+		/// <remarks>
+		/// This is for legacy code, I didn't want to go creating custom classes for these
+		/// </remarks>
+		internal static void AddRowData(
+			List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>> rowData,
+			IEnumerable<KeyValuePair<string, object>> standardVals,
+			IEnumerable<KeyValuePair<string, object>> userVals)
+		{
+			rowData.Add(new System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>(
+			            	standardVals,
+			            	userVals
+			            	));
+		}
+
+		private static IDictionary<string, string> GetPropertyHeaders(string alias, Func<string, IEnumerable<KeyValuePair<string, string>>> getHeaders)
+		{			
+			var headers = getHeaders(alias);
+			var def = headers.ToDictionary(pt => pt.Key, pt => pt.Value);			
+			return def;
+		}
+
+		private static void PopulateRow(
+			this DataTable dt, 
+			IDictionary<string, string> aliasesToNames, 
+			IEnumerable<KeyValuePair<string, object>> standardVals,
+			IEnumerable<KeyValuePair<string, object>> userPropertyVals)
+		{
+			var dr = dt.NewRow();
+			foreach (var r in standardVals)
+			{
+				dr[r.Key] = r.Value;
+			}
+			foreach (var p in userPropertyVals.Where(p => p.Value != null))
+			{
+				dr[aliasesToNames[p.Key]] = p.Value;
+			}
+			dt.Rows.Add(dr);
+		}
+
+	}
+}

src/Umbraco.Core/DataTypesResolver.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.ObjectResolution;
+using umbraco.interfaces;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// A resolver to return all IDataType objects
+	/// </summary>
+	internal sealed class DataTypesResolver : LegacyTransientObjectsResolver<DataTypesResolver, IDataType>
+	{
+
+	
+		/// <summary>
+		/// Constructor
+		/// </summary>
+		/// <param name="dataTypes"></param>		
+		internal DataTypesResolver(IEnumerable<Type> dataTypes)
+			: base(dataTypes)
+		{
+
+		}
+
+		/// <summary>
+		/// Gets the <see cref="ICacheRefresher"/> implementations.
+		/// </summary>
+		public IEnumerable<IDataType> DataTypes
+		{
+			get
+			{
+				EnsureIdsAreTracked();
+				return Values;
+			}
+		}
+
+		protected override Guid GetUniqueIdentifier(IDataType obj)
+		{
+			return obj.Id;
+		}
+	}
+}

src/Umbraco.Core/Dictionary/CultureDictionaryFactoryResolver.cs

@@ -0,0 +1,32 @@
+using Umbraco.Core.ObjectResolution;
+
+namespace Umbraco.Core.Dictionary
+{
+	/// <summary>
+	/// Resolves the current CultureDictionaryFactory
+	/// </summary>
+	internal class CultureDictionaryFactoryResolver : SingleObjectResolverBase<CultureDictionaryFactoryResolver, ICultureDictionaryFactory>
+	{
+		internal CultureDictionaryFactoryResolver(ICultureDictionaryFactory factory)
+			: base(factory)
+		{
+		}
+
+		/// <summary>
+		/// Can be used by developers at runtime to set their ICultureDictionaryFactory at app startup
+		/// </summary>
+		/// <param name="factory"></param>
+		public void SetContentStore(ICultureDictionaryFactory factory)
+		{
+			Value = factory;
+		}
+
+		/// <summary>
+		/// Returns the ICultureDictionaryFactory
+		/// </summary>
+		public ICultureDictionaryFactory Factory
+		{
+			get { return Value; }
+		}
+	}
+}

src/Umbraco.Core/Dictionary/ICultureDictionary.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Globalization;
+
+namespace Umbraco.Core.Dictionary
+{
+	/// <summary>
+	/// Represents a dictionary based on a specific culture
+	/// </summary>
+	internal interface ICultureDictionary
+	{
+		/// <summary>
+		/// Returns the dictionary value based on the key supplied
+		/// </summary>
+		/// <param name="key"></param>
+		/// <returns></returns>
+		string this[string key] { get; }
+
+		/// <summary>
+		/// Returns the current culture
+		/// </summary>
+		CultureInfo Culture { get; }
+	}
+}

src/Umbraco.Core/Dictionary/ICultureDictionaryFactory.cs

@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Dictionary
+{
+	internal interface ICultureDictionaryFactory
+	{
+		ICultureDictionary CreateDictionary();
+	}
+}

src/Umbraco.Core/DictionaryExtensions.cs

@@ -0,0 +1,191 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Web.Mvc;
+
+namespace Umbraco.Core
+{
+	///<summary>
+	/// Extension methods for dictionary
+	///</summary>
+	internal static class DictionaryExtensions
+	{
+		/// <summary>
+		/// Converts a dictionary to another type by only using direct casting
+		/// </summary>
+		/// <typeparam name="TKeyOut"></typeparam>
+		/// <typeparam name="TValOut"></typeparam>
+		/// <param name="d"></param>
+		/// <returns></returns>
+		public static IDictionary<TKeyOut, TValOut> ConvertTo<TKeyOut, TValOut>(this IDictionary d)
+		{
+			var result = new Dictionary<TKeyOut, TValOut>();
+			foreach (DictionaryEntry v in d)
+			{
+				result.Add((TKeyOut)v.Key, (TValOut)v.Value);
+			}
+			return result;
+		}
+
+		/// <summary>
+		/// Converts a dictionary to another type using the specified converters
+		/// </summary>
+		/// <typeparam name="TKeyOut"></typeparam>
+		/// <typeparam name="TValOut"></typeparam>
+		/// <param name="d"></param>
+		/// <param name="keyConverter"></param>
+		/// <param name="valConverter"></param>
+		/// <returns></returns>
+		public static IDictionary<TKeyOut, TValOut> ConvertTo<TKeyOut, TValOut>(this IDictionary d, Func<object, TKeyOut> keyConverter, Func<object, TValOut> valConverter)
+		{
+			var result = new Dictionary<TKeyOut, TValOut>();
+			foreach (DictionaryEntry v in d)
+			{
+				result.Add(keyConverter(v.Key), valConverter(v.Value));
+			}
+			return result;
+		}
+
+		/// <summary>
+		/// Converts a dictionary to a NameValueCollection
+		/// </summary>
+		/// <param name="d"></param>
+		/// <returns></returns>
+		public static NameValueCollection ToNameValueCollection(this IDictionary<string, string> d)
+		{
+			var n = new NameValueCollection();
+			foreach (var i in d)
+			{
+				n.Add(i.Key, i.Value);
+			}
+			return n;
+		}
+
+		/// <summary>
+		/// Converts a dictionary to a FormCollection
+		/// </summary>
+		/// <param name="d"></param>
+		/// <returns></returns>
+		public static FormCollection ToFormCollection(this IDictionary<string, object> d)
+		{
+			var n = new FormCollection();
+			foreach (var i in d)
+			{
+				n.Add(i.Key, Convert.ToString(i.Value));
+			}
+			return n;
+		}
+
+		/// <summary>
+		/// Returns a new dictionary of this ... others merged leftward.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <typeparam name="TK"></typeparam>
+		/// <typeparam name="TV"></typeparam>
+		/// <param name="me"></param>
+		/// <param name="others"></param>
+		/// <returns></returns>
+		/// <remarks>
+		/// Reference: http://stackoverflow.com/questions/294138/merging-dictionaries-in-c
+		/// </remarks>
+		public static T MergeLeft<T, TK, TV>(this T me, params IDictionary<TK, TV>[] others)
+			where T : IDictionary<TK, TV>, new()
+		{
+			var newMap = new T();
+			foreach (var p in (new List<IDictionary<TK, TV>> { me }).Concat(others).SelectMany(src => src))
+			{
+				newMap[p.Key] = p.Value;
+			}
+			return newMap;
+		}
+
+		/// <summary>
+		/// Returns the value of the key value based on the key, if the key is not found, a null value is returned
+		/// </summary>
+		/// <typeparam name="TKey">The type of the key.</typeparam>
+		/// <typeparam name="TVal">The type of the val.</typeparam>
+		/// <param name="d">The d.</param>
+		/// <param name="key">The key.</param>
+		/// <param name="defaultValue">The default value.</param>
+		/// <returns></returns>
+		public static TVal GetValue<TKey, TVal>(this IDictionary<TKey, TVal> d, TKey key, TVal defaultValue = default(TVal))
+		{
+			if (d.ContainsKey(key))
+			{
+				return d[key];
+			}
+			return defaultValue;
+		}
+
+		/// <summary>
+		/// Returns the value of the key value based on the key as it's string value, if the key is not found, then an empty string is returned
+		/// </summary>
+		/// <param name="d"></param>
+		/// <param name="key"></param>
+		/// <returns></returns>
+		public static string GetValueAsString<TKey, TVal>(this IDictionary<TKey, TVal> d, TKey key)
+		{
+			if (d.ContainsKey(key))
+			{
+				return d[key].ToString();
+			}
+			return String.Empty;
+		}
+
+		/// <summary>contains key ignore case.</summary>
+		/// <param name="dictionary">The dictionary.</param>
+		/// <param name="key">The key.</param>
+		/// <typeparam name="TValue">Value Type</typeparam>
+		/// <returns>The contains key ignore case.</returns>
+		public static bool ContainsKeyIgnoreCase<TValue>(this IDictionary<string, TValue> dictionary, string key)
+		{
+			return dictionary.Keys.Any(i => i.Equals(key, StringComparison.CurrentCultureIgnoreCase));
+		}
+
+		/// <summary>
+		/// Converts a dictionary object to a query string representation such as:
+		/// firstname=shannon&lastname=deminick
+		/// </summary>
+		/// <param name="d"></param>
+		/// <returns></returns>
+		public static string ToQueryString(this IDictionary<string, object> d)
+		{
+			if (!d.Any()) return "";
+
+			var builder = new StringBuilder();
+			foreach (var i in d)
+			{
+				builder.Append(String.Format("{0}={1}&", i.Key, i.Value));
+			}
+			return builder.ToString().TrimEnd('&');
+		}
+
+		/// <summary>The get entry ignore case.</summary>
+		/// <param name="dictionary">The dictionary.</param>
+		/// <param name="key">The key.</param>
+		/// <typeparam name="TValue">The type</typeparam>
+		/// <returns>The entry</returns>
+		public static TValue GetEntryIgnoreCase<TValue>(this IDictionary<string, TValue> dictionary, string key)
+		{
+			return dictionary.GetEntryIgnoreCase(key, default(TValue));
+		}
+
+		/// <summary>The get entry ignore case.</summary>
+		/// <param name="dictionary">The dictionary.</param>
+		/// <param name="key">The key.</param>
+		/// <param name="defaultValue">The default value.</param>
+		/// <typeparam name="TValue">The type</typeparam>
+		/// <returns>The entry</returns>
+		public static TValue GetEntryIgnoreCase<TValue>(this IDictionary<string, TValue> dictionary, string key, TValue defaultValue)
+		{
+			key = dictionary.Keys.Where(i => i.Equals(key, StringComparison.CurrentCultureIgnoreCase)).FirstOrDefault();
+
+			return !key.IsNullOrWhiteSpace()
+			       	? dictionary[key]
+			       	: defaultValue;
+		}
+	}
+}

src/Umbraco.Core/DisposableObject.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Threading;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// Abstract implementation of logic commonly required to safely handle disposable unmanaged resources.
+	/// </summary>
+	public abstract class DisposableObject : IDisposable
+	{
+		private bool _disposed;
+		private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
+
+		/// <summary>
+		/// Gets a value indicating whether this instance is disposed.
+		/// </summary>
+		/// <value>
+		/// 	<c>true</c> if this instance is disposed; otherwise, <c>false</c>.
+		/// </value>
+		public bool IsDisposed
+		{
+			get { return _disposed; }
+		}
+
+		/// <summary>
+		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+		/// </summary>
+		/// <filterpriority>2</filterpriority>
+		public void Dispose()
+		{
+			Dispose(true);
+
+			// Use SupressFinalize in case a subclass of this type implements a finalizer.
+			GC.SuppressFinalize(this);
+		}
+
+		~DisposableObject()
+		{
+			// Run dispose but let the class know it was due to the finalizer running.
+			Dispose(false);
+		}
+
+		protected virtual void Dispose(bool disposing)
+		{
+			// Only operate if we haven't already disposed
+			if (IsDisposed || !disposing) return;
+
+			using (new WriteLock(_disposalLocker))
+			{
+				// Check again now we're inside the lock
+				if (IsDisposed) return;
+
+				// Call to actually release resources. This method is only
+				// kept separate so that the entire disposal logic can be used as a VS snippet
+				DisposeResources();
+
+				// Indicate that the instance has been disposed.
+				_disposed = true;
+			}
+		}
+
+		/// <summary>
+		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
+		/// </summary>
+		protected abstract void DisposeResources();
+
+		protected virtual void DisposeUnmanagedResources()
+		{
+
+		}
+	}
+}

src/Umbraco.Core/DisposableTimer.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Diagnostics;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Starts the timer and invokes a  callback upon disposal. Provides a simple way of timing an operation by wrapping it in a <code>using</code> (C#) statement.
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// Console.WriteLine("Testing Stopwatchdisposable, should be 567:");
+    //  using (var timer = new DisposableTimer(result => Console.WriteLine("Took {0}ms", result)))
+    //  {
+    //      Thread.Sleep(567);
+    //  }
+    /// </code>
+    /// </example>
+    public class DisposableTimer : DisposableObject
+    {
+        private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
+        private readonly Action<long> _callback;
+
+        protected DisposableTimer(Action<long> callback)
+        {
+            _callback = callback;
+        }
+
+        public Stopwatch Stopwatch
+        {
+            get { return _stopwatch; }
+        }
+
+        /// <summary>
+        /// Starts the timer and invokes the specified callback upon disposal.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        /// <returns></returns>
+        public static DisposableTimer Start(Action<long> callback)
+        {
+            return new DisposableTimer(callback);
+        }
+
+        public static DisposableTimer TraceDuration<T>(Func<string> startMessage, Func<string> completeMessage)
+        {
+            return TraceDuration(typeof(T), startMessage, completeMessage);
+        }
+
+        public static DisposableTimer TraceDuration(Type loggerType, Func<string> startMessage, Func<string> completeMessage)
+        {
+            LogHelper.Debug(loggerType, startMessage);
+            return new DisposableTimer(x => LogHelper.Info(loggerType, () => completeMessage() + " (took " + x + "ms)"));
+        }
+
+        /// <summary>
+        /// Adds a start and end log entry as Info and tracks how long it takes until disposed.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer TraceDuration<T>(string startMessage, string completeMessage)
+        {
+            return TraceDuration(typeof(T), startMessage, completeMessage);
+        }
+
+        /// <summary>
+        /// Adds a start and end log entry as Info and tracks how long it takes until disposed.
+        /// </summary>
+        /// <param name="loggerType"></param>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer TraceDuration(Type loggerType, string startMessage, string completeMessage)
+        {
+            LogHelper.Info(loggerType, () => startMessage);
+            return new DisposableTimer(x => LogHelper.Info(loggerType, () => completeMessage + " (took " + x + "ms)"));
+        }
+
+        /// <summary>
+        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer DebugDuration<T>(string startMessage, string completeMessage)
+        {
+            return DebugDuration(typeof(T), startMessage, completeMessage);
+        }
+
+        /// <summary>
+        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer DebugDuration<T>(Func<string> startMessage, Func<string> completeMessage)
+        {
+            return DebugDuration(typeof(T), startMessage, completeMessage);
+        }
+
+        /// <summary>
+        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
+        /// </summary>
+        /// <param name="loggerType"></param>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer DebugDuration(Type loggerType, string startMessage, string completeMessage)
+        {
+            LogHelper.Debug(loggerType, () => startMessage);
+            return new DisposableTimer(x => LogHelper.Debug(loggerType, () => completeMessage + " (took " + x + "ms)"));
+        }
+
+        /// <summary>
+        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
+        /// </summary>
+        /// <param name="loggerType"></param>
+        /// <param name="startMessage"></param>
+        /// <param name="completeMessage"></param>
+        /// <returns></returns>
+        public static DisposableTimer DebugDuration(Type loggerType, Func<string> startMessage, Func<string> completeMessage)
+        {
+            LogHelper.Debug(loggerType, startMessage);
+            return new DisposableTimer(x => LogHelper.Debug(loggerType, () => completeMessage() + " (took " + x + "ms)"));
+        }
+
+        /// <summary>
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
+        /// </summary>
+        protected override void DisposeResources()
+        {
+            _callback.Invoke(Stopwatch.ElapsedMilliseconds);
+        }
+    }
+}

src/Umbraco.Core/DynamicWrapper.cs

@@ -1,178 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Threading;
-
-namespace Umbraco.Core
-{
-    internal class DynamicWrapper
-    {
-        public class DynamicWrapperBase
-        {
-            internal protected object RealObject;
-        }
-
-        private static readonly ModuleBuilder _moduleBuilder;
-
-        static DynamicWrapper()
-        {
-            var name = Assembly.GetExecutingAssembly().GetName();
-            var assembly = Thread.GetDomain().DefineDynamicAssembly(name, AssemblyBuilderAccess.Run);
-            _moduleBuilder = assembly.DefineDynamicModule("DynamicWrapperModule", false);
-        }
-
-        private static readonly WrapperDictionary _wrapperDictionary = new WrapperDictionary();
-
-        public static Type GetWrapper(Type interfaceType, Type realObjectType)
-        {
-            Type wrapperType = _wrapperDictionary.GetType(interfaceType, realObjectType);
-
-            if (wrapperType == null)
-            {
-                wrapperType = GenerateWrapperType(interfaceType, realObjectType);
-                _wrapperDictionary.SetType(interfaceType, realObjectType, wrapperType);
-            }
-
-            return wrapperType;
-        }
-
-        private static Type GenerateWrapperType(Type InterfaceType, Type RealObjectType)
-        {
-            var wrapperName = string.Format("{0}_{1}_Wrapper", InterfaceType.Name, RealObjectType.Name);
-
-            TypeBuilder wrapperBuilder = _moduleBuilder.DefineType(
-                wrapperName,
-                TypeAttributes.NotPublic | TypeAttributes.Sealed,
-                typeof(DynamicWrapperBase),
-                new[] { InterfaceType });
-
-            var wrapperMethod = new WrapperMethodBuilder(RealObjectType, wrapperBuilder);
-
-            foreach (MethodInfo method in InterfaceType.AllMethods())
-            {
-                wrapperMethod.Generate(method);
-            }
-
-            return wrapperBuilder.CreateType();
-        }
-
-        public static T CreateWrapper<T>(object realObject) where T : class 
-        {
-            var dynamicType = GetWrapper(typeof(T), realObject.GetType());
-            var dynamicWrapper = (DynamicWrapperBase)Activator.CreateInstance(dynamicType);
-
-            dynamicWrapper.RealObject = realObject;
-
-            return dynamicWrapper as T;
-        }
-    }
-
-    internal class WrapperMethodBuilder
-    {
-        private readonly Type _realObjectType;
-        private readonly TypeBuilder _wrapperBuilder;
-
-        public WrapperMethodBuilder(Type realObjectType, TypeBuilder proxyBuilder)
-        {
-            _realObjectType = realObjectType;
-            _wrapperBuilder = proxyBuilder;
-        }
-
-        public void Generate(MethodInfo newMethod)
-        {
-            if (newMethod.IsGenericMethod)
-                newMethod = newMethod.GetGenericMethodDefinition();
-
-            FieldInfo srcField = typeof(DynamicWrapper.DynamicWrapperBase).GetField("RealObject", BindingFlags.Instance | BindingFlags.NonPublic);
-
-            var parameters = newMethod.GetParameters();
-            var parameterTypes = parameters.Select(parameter => parameter.ParameterType).ToArray();
-
-            var methodBuilder = _wrapperBuilder.DefineMethod(
-                newMethod.Name,
-                MethodAttributes.Public | MethodAttributes.Virtual,
-                newMethod.ReturnType,
-                parameterTypes);
-
-            if (newMethod.IsGenericMethod)
-            {
-                methodBuilder.DefineGenericParameters(
-                    newMethod.GetGenericArguments().Select(arg => arg.Name).ToArray());
-            }
-
-            ILGenerator ilGenerator = methodBuilder.GetILGenerator();
-
-            LoadRealObject(ilGenerator, srcField);
-            PushParameters(parameters, ilGenerator);
-            ExecuteMethod(newMethod, parameterTypes, ilGenerator);
-            Return(ilGenerator);
-        }
-
-        private static void Return(ILGenerator ilGenerator)
-        {
-            ilGenerator.Emit(OpCodes.Ret);
-        }
-
-        private void ExecuteMethod(MethodBase newMethod, Type[] parameterTypes, ILGenerator ilGenerator)
-        {
-            MethodInfo srcMethod = GetMethod(newMethod, parameterTypes);
-
-            if (srcMethod == null) throw new MissingMethodException("Unable to find method " + newMethod.Name + " in " + _realObjectType.FullName);
-
-            ilGenerator.Emit(OpCodes.Call, srcMethod);
-        }
-
-        private MethodInfo GetMethod(MethodBase realMethod, Type[] parameterTypes)
-        {
-            if (realMethod.IsGenericMethod)
-                return _realObjectType.GetGenericMethod(realMethod.Name, parameterTypes);
-
-            return _realObjectType.GetMethod(realMethod.Name, parameterTypes);
-        }
-
-        private static void PushParameters(ICollection<ParameterInfo> parameters, ILGenerator ilGenerator)
-        {
-            for (int i = 1; i < parameters.Count + 1; i++)
-                ilGenerator.Emit(OpCodes.Ldarg, i);
-        }
-
-        private static void LoadRealObject(ILGenerator ilGenerator, FieldInfo srcField)
-        {
-            ilGenerator.Emit(OpCodes.Ldarg_0);
-            ilGenerator.Emit(OpCodes.Ldfld, srcField);
-        }
-    }
-
-    internal class WrapperDictionary
-    {
-        private readonly Dictionary<string, Type> _wrapperTypes = new Dictionary<string, Type>();
-
-        private static string GenerateKey(Type interfaceType, Type realObjectType)
-        {
-            return interfaceType.Name + "->" + realObjectType.Name;
-        }
-
-        public Type GetType(Type interfaceType, Type realObjectType)
-        {
-            string key = GenerateKey(interfaceType, realObjectType);
-
-            if (_wrapperTypes.ContainsKey(key))
-                return _wrapperTypes[key];
-
-            return null;
-        }
-
-        public void SetType(Type interfaceType, Type realObjectType, Type wrapperType)
-        {
-            string key = GenerateKey(interfaceType, realObjectType);
-
-            if (_wrapperTypes.ContainsKey(key))
-                _wrapperTypes[key] = wrapperType;
-            else
-                _wrapperTypes.Add(key, wrapperType);
-        }
-
-    }
-}

src/Umbraco.Core/Dynamics/ClassFactory.cs

@@ -0,0 +1,182 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Threading;
+
+namespace Umbraco.Core.Dynamics
+{
+	internal class ClassFactory
+	{
+		public static readonly ClassFactory Instance = new ClassFactory();
+
+		static ClassFactory() { }  // Trigger lazy initialization of static fields
+
+		ModuleBuilder module;
+		Dictionary<Signature, Type> classes;
+		int classCount;
+		ReaderWriterLock rwLock;
+
+		protected ClassFactory()
+		{
+			AssemblyName name = new AssemblyName("DynamicClasses");
+			AssemblyBuilder assembly = AppDomain.CurrentDomain.DefineDynamicAssembly(name, AssemblyBuilderAccess.Run);
+#if ENABLE_LINQ_PARTIAL_TRUST
+            new ReflectionPermission(PermissionState.Unrestricted).Assert();
+#endif
+			try
+			{
+				module = assembly.DefineDynamicModule("Module");
+			}
+			finally
+			{
+#if ENABLE_LINQ_PARTIAL_TRUST
+                PermissionSet.RevertAssert();
+#endif
+			}
+			classes = new Dictionary<Signature, Type>();
+			rwLock = new ReaderWriterLock();
+		}
+
+		public Type GetDynamicClass(IEnumerable<DynamicProperty> properties)
+		{
+			rwLock.AcquireReaderLock(Timeout.Infinite);
+			try
+			{
+				Signature signature = new Signature(properties);
+				Type type;
+				if (!classes.TryGetValue(signature, out type))
+				{
+					type = CreateDynamicClass(signature.Properties);
+					classes.Add(signature, type);
+				}
+				return type;
+			}
+			finally
+			{
+				rwLock.ReleaseReaderLock();
+			}
+		}
+
+		Type CreateDynamicClass(DynamicProperty[] properties)
+		{
+			LockCookie cookie = rwLock.UpgradeToWriterLock(Timeout.Infinite);
+			try
+			{
+				string typeName = "DynamicClass" + (classCount + 1);
+#if ENABLE_LINQ_PARTIAL_TRUST
+                new ReflectionPermission(PermissionState.Unrestricted).Assert();
+#endif
+				try
+				{
+					TypeBuilder tb = this.module.DefineType(typeName, TypeAttributes.Class |
+					                                                  TypeAttributes.Public, typeof(DynamicClass));
+					FieldInfo[] fields = GenerateProperties(tb, properties);
+					GenerateEquals(tb, fields);
+					GenerateGetHashCode(tb, fields);
+					Type result = tb.CreateType();
+					classCount++;
+					return result;
+				}
+				finally
+				{
+#if ENABLE_LINQ_PARTIAL_TRUST
+                    PermissionSet.RevertAssert();
+#endif
+				}
+			}
+			finally
+			{
+				rwLock.DowngradeFromWriterLock(ref cookie);
+			}
+		}
+
+		FieldInfo[] GenerateProperties(TypeBuilder tb, DynamicProperty[] properties)
+		{
+			FieldInfo[] fields = new FieldBuilder[properties.Length];
+			for (int i = 0; i < properties.Length; i++)
+			{
+				DynamicProperty dp = properties[i];
+				FieldBuilder fb = tb.DefineField("_" + dp.Name, dp.Type, FieldAttributes.Private);
+				PropertyBuilder pb = tb.DefineProperty(dp.Name, PropertyAttributes.HasDefault, dp.Type, null);
+				MethodBuilder mbGet = tb.DefineMethod("get_" + dp.Name,
+				                                      MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
+				                                      dp.Type, Type.EmptyTypes);
+				ILGenerator genGet = mbGet.GetILGenerator();
+				genGet.Emit(OpCodes.Ldarg_0);
+				genGet.Emit(OpCodes.Ldfld, fb);
+				genGet.Emit(OpCodes.Ret);
+				MethodBuilder mbSet = tb.DefineMethod("set_" + dp.Name,
+				                                      MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
+				                                      null, new Type[] { dp.Type });
+				ILGenerator genSet = mbSet.GetILGenerator();
+				genSet.Emit(OpCodes.Ldarg_0);
+				genSet.Emit(OpCodes.Ldarg_1);
+				genSet.Emit(OpCodes.Stfld, fb);
+				genSet.Emit(OpCodes.Ret);
+				pb.SetGetMethod(mbGet);
+				pb.SetSetMethod(mbSet);
+				fields[i] = fb;
+			}
+			return fields;
+		}
+
+		void GenerateEquals(TypeBuilder tb, FieldInfo[] fields)
+		{
+			MethodBuilder mb = tb.DefineMethod("Equals",
+			                                   MethodAttributes.Public | MethodAttributes.ReuseSlot |
+			                                   MethodAttributes.Virtual | MethodAttributes.HideBySig,
+			                                   typeof(bool), new Type[] { typeof(object) });
+			ILGenerator gen = mb.GetILGenerator();
+			LocalBuilder other = gen.DeclareLocal(tb);
+			Label next = gen.DefineLabel();
+			gen.Emit(OpCodes.Ldarg_1);
+			gen.Emit(OpCodes.Isinst, tb);
+			gen.Emit(OpCodes.Stloc, other);
+			gen.Emit(OpCodes.Ldloc, other);
+			gen.Emit(OpCodes.Brtrue_S, next);
+			gen.Emit(OpCodes.Ldc_I4_0);
+			gen.Emit(OpCodes.Ret);
+			gen.MarkLabel(next);
+			foreach (FieldInfo field in fields)
+			{
+				Type ft = field.FieldType;
+				Type ct = typeof(EqualityComparer<>).MakeGenericType(ft);
+				next = gen.DefineLabel();
+				gen.EmitCall(OpCodes.Call, ct.GetMethod("get_Default"), null);
+				gen.Emit(OpCodes.Ldarg_0);
+				gen.Emit(OpCodes.Ldfld, field);
+				gen.Emit(OpCodes.Ldloc, other);
+				gen.Emit(OpCodes.Ldfld, field);
+				gen.EmitCall(OpCodes.Callvirt, ct.GetMethod("Equals", new Type[] { ft, ft }), null);
+				gen.Emit(OpCodes.Brtrue_S, next);
+				gen.Emit(OpCodes.Ldc_I4_0);
+				gen.Emit(OpCodes.Ret);
+				gen.MarkLabel(next);
+			}
+			gen.Emit(OpCodes.Ldc_I4_1);
+			gen.Emit(OpCodes.Ret);
+		}
+
+		void GenerateGetHashCode(TypeBuilder tb, FieldInfo[] fields)
+		{
+			MethodBuilder mb = tb.DefineMethod("GetHashCode",
+			                                   MethodAttributes.Public | MethodAttributes.ReuseSlot |
+			                                   MethodAttributes.Virtual | MethodAttributes.HideBySig,
+			                                   typeof(int), Type.EmptyTypes);
+			ILGenerator gen = mb.GetILGenerator();
+			gen.Emit(OpCodes.Ldc_I4_0);
+			foreach (FieldInfo field in fields)
+			{
+				Type ft = field.FieldType;
+				Type ct = typeof(EqualityComparer<>).MakeGenericType(ft);
+				gen.EmitCall(OpCodes.Call, ct.GetMethod("get_Default"), null);
+				gen.Emit(OpCodes.Ldarg_0);
+				gen.Emit(OpCodes.Ldfld, field);
+				gen.EmitCall(OpCodes.Callvirt, ct.GetMethod("GetHashCode", new Type[] { ft }), null);
+				gen.Emit(OpCodes.Xor);
+			}
+			gen.Emit(OpCodes.Ret);
+		}
+	}
+}

src/Umbraco.Core/Dynamics/DynamicClass.cs

@@ -0,0 +1,24 @@
+using System.Reflection;
+using System.Text;
+
+namespace Umbraco.Core.Dynamics
+{
+	public abstract class DynamicClass
+	{
+		public override string ToString()
+		{
+			PropertyInfo[] props = this.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
+			StringBuilder sb = new StringBuilder();
+			sb.Append("{");
+			for (int i = 0; i < props.Length; i++)
+			{
+				if (i > 0) sb.Append(", ");
+				sb.Append(props[i].Name);
+				sb.Append("=");
+				sb.Append(props[i].GetValue(this, null));
+			}
+			sb.Append("}");
+			return sb.ToString();
+		}
+	}
+}

src/Umbraco.Core/Dynamics/DynamicDictionary.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Dynamic;
+
+namespace Umbraco.Core.Dynamics
+{
+    public class DynamicDictionary : DynamicObject
+    {
+    	internal readonly Dictionary<string, object> SourceItems;
+
+        public DynamicDictionary(Dictionary<string, object> sourceItems)
+        {
+            SourceItems = sourceItems;
+        }
+        public override bool TrySetMember(SetMemberBinder binder, object value)
+        {
+            if (SourceItems.ContainsKey(binder.Name))
+            {
+                SourceItems[binder.Name.ToLower()] = value;
+            }
+            else
+            {
+                SourceItems.Add(binder.Name.ToLower(), value);
+            }
+            return true;
+        }
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            if (SourceItems != null)
+            {
+                if (SourceItems.TryGetValue(binder.Name.ToLower(), out result))
+                {
+                    return true;
+                }
+            }
+            result = null;
+            return true;
+        }
+    }
+}

src/Umbraco.Core/Dynamics/DynamicInstanceHelper.cs

@@ -0,0 +1,178 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Dynamics
+{
+	/// <summary>
+	/// A helper class to try invoke members, find properties, etc...
+	/// </summary>
+	internal class DynamicInstanceHelper
+	{
+
+		internal class TryInvokeMemberResult
+		{
+			public object ObjectResult { get; private set; }
+			public TryInvokeMemberSuccessReason Reason { get; private set; }
+
+			public TryInvokeMemberResult(object result, TryInvokeMemberSuccessReason reason)
+			{
+				ObjectResult = result;
+				Reason = reason;
+			}
+		}
+
+		internal enum TryInvokeMemberSuccessReason
+		{
+			FoundProperty,
+			FoundMethod,
+			FoundExtensionMethod
+		}
+
+		/// <summary>
+		/// Attempts to invoke a member based on the dynamic instance
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="thisObject">The object instance to invoke the extension method for</param>
+		/// <param name="binder"></param>
+		/// <param name="args"></param>
+		/// <returns></returns>
+		/// <remarks>
+		/// First tries to find a property with the binder name, if that fails it will try to find a static or instance method
+		/// on the object that matches the binder name
+		/// </remarks>
+		public static Attempt<TryInvokeMemberResult> TryInvokeMember<T>(T thisObject, InvokeMemberBinder binder, object[] args)
+		{
+			return TryInvokeMember<T>(thisObject, binder, args, null);
+		}
+
+		/// <summary>
+		/// Attempts to invoke a member based on the dynamic instance
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="thisObject">The object instance to invoke the extension method for</param>
+		/// <param name="binder"></param>
+		/// <param name="args"></param>
+		/// <param name="findExtensionMethodsOnTypes">The types to scan for extension methods </param>
+		/// <returns></returns>
+		/// <remarks>
+		/// First tries to find a property with the binder name, if that fails it will try to find a static or instance method
+		/// on the object that matches the binder name, if that fails it will then attempt to invoke an extension method
+		/// based on the binder name and the extension method types to scan.
+		/// </remarks>
+		public static Attempt<TryInvokeMemberResult> TryInvokeMember<T>(T thisObject, 
+			InvokeMemberBinder binder, 
+			object[] args, 
+			IEnumerable<Type> findExtensionMethodsOnTypes)
+		{
+			//TODO: We MUST cache the result here, it is very expensive to keep finding extension methods!
+			object result;
+			try
+			{
+				//Property?
+				result = typeof(T).InvokeMember(binder.Name,
+				                                System.Reflection.BindingFlags.Instance |
+				                                System.Reflection.BindingFlags.Public |
+				                                System.Reflection.BindingFlags.GetProperty,
+				                                null,
+				                                thisObject,
+				                                args);
+				return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundProperty));
+			}
+			catch (MissingMethodException)
+			{
+				try
+				{
+					//Static or Instance Method?
+					result = typeof(T).InvokeMember(binder.Name,
+					                                System.Reflection.BindingFlags.Instance |
+					                                System.Reflection.BindingFlags.Public |
+					                                System.Reflection.BindingFlags.Static |
+					                                System.Reflection.BindingFlags.InvokeMethod,
+					                                null,
+					                                thisObject,
+					                                args);
+					return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundMethod));
+				}
+				catch (MissingMethodException)
+				{
+					if (findExtensionMethodsOnTypes != null)
+					{
+						try
+						{
+							result = FindAndExecuteExtensionMethod(thisObject, args, binder.Name, findExtensionMethodsOnTypes);
+							return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundExtensionMethod));
+						}
+						catch (TargetInvocationException ext)
+						{
+							//don't log here, we return this exception because the caller may need to do something specific when
+							//this exception occurs.
+							return new Attempt<TryInvokeMemberResult>(ext);
+						}
+						catch (Exception ex)
+						{
+							var sb = new StringBuilder("An error occurred finding an executing an extension method for type ");
+							sb.Append(typeof (T));
+							sb.Append("Types searched for extension methods were ");
+							foreach(var t in findExtensionMethodsOnTypes)
+							{
+								sb.Append(t + ",");
+							}
+							LogHelper.Error<DynamicInstanceHelper>(sb.ToString(), ex);
+							return new Attempt<TryInvokeMemberResult>(ex);
+						}	
+					}
+					return Attempt<TryInvokeMemberResult>.False;
+				}
+			}
+			catch (Exception ex)
+			{
+				LogHelper.Error<DynamicInstanceHelper>("An unhandled exception occurred in method TryInvokeMember", ex);
+				return new Attempt<TryInvokeMemberResult>(ex);
+			}
+		}
+
+		/// <summary>
+		/// Attempts to find an extension method that matches the name and arguments based on scanning the Type's passed in
+		/// to the findMethodsOnTypes parameter
+		/// </summary>
+		/// <param name="thisObject">The instance object to execute the extension method for</param>
+		/// <param name="args"></param>
+		/// <param name="name"></param>
+		/// <param name="findMethodsOnTypes"></param>
+		/// <returns></returns>
+		internal static object FindAndExecuteExtensionMethod<T>(T thisObject, 
+			object[] args, 
+			string name, 
+			IEnumerable<Type> findMethodsOnTypes)
+		{
+			object result = null;
+			
+			//find known extension methods that match the first type in the list
+			MethodInfo toExecute = null;
+			foreach (var t in findMethodsOnTypes)
+			{
+				toExecute = ExtensionMethodFinder.FindExtensionMethod(t, args, name, false);
+				if (toExecute != null)
+					break;
+			}
+
+			if (toExecute != null)
+			{
+				var genericArgs = (new[] { (object)thisObject }).Concat(args);
+				result = toExecute.Invoke(null, genericArgs.ToArray());	
+			}
+			else
+			{
+				throw new MissingMethodException();
+			}			
+			return result;
+		}
+
+	}
+}

src/Umbraco.Core/Dynamics/DynamicNull.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Dynamic;
+using System.Web;
+
+namespace Umbraco.Core.Dynamics
+{
+    //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, IHtmlString
+    {
+        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;
+        }
+        public int Count()
+        {
+            return 0;
+        }
+        public override string ToString()
+        {
+            return string.Empty;
+        }
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            result = this;
+            return true;
+        }
+        public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+        {
+            result = this;
+            return true;
+        }
+        public override bool TryInvoke(InvokeBinder binder, object[] args, out object result)
+        {
+            result = this;
+            return true;
+        }
+        public bool IsNull()
+        {
+            return true;
+        }
+        public bool HasValue()
+        {
+            return false;
+        }
+        public string Name
+        {
+            get
+            {
+                return string.Empty;
+            }
+        }
+        public int Id
+        {
+            get
+            {
+                return 0;
+            }
+        }
+
+        public static implicit operator bool(DynamicNull n)
+        {
+            return false;
+        }
+        public static implicit operator DateTime(DynamicNull n)
+        {
+            return DateTime.MinValue;
+        }
+        public static implicit operator int(DynamicNull n)
+        {
+            return 0;
+        }
+        public static implicit operator string(DynamicNull n)
+        {
+            return string.Empty;
+        }
+
+        public string ToHtmlString()
+        {
+            return string.Empty;
+        }
+
+    }
+}

src/Umbraco.Core/Dynamics/DynamicOrdering.cs

@@ -0,0 +1,10 @@
+using System.Linq.Expressions;
+
+namespace Umbraco.Core.Dynamics
+{
+	internal class DynamicOrdering
+	{
+		public Expression Selector;
+		public bool Ascending;
+	}
+}

src/Umbraco.Core/Dynamics/DynamicProperty.cs

@@ -0,0 +1,28 @@
+using System;
+
+namespace Umbraco.Core.Dynamics
+{
+	internal class DynamicProperty
+	{
+		readonly string _name;
+		readonly Type _type;
+
+		public DynamicProperty(string name, Type type)
+		{
+			if (name == null) throw new ArgumentNullException("name");
+			if (type == null) throw new ArgumentNullException("type");
+			this._name = name;
+			this._type = type;
+		}
+
+		public string Name
+		{
+			get { return _name; }
+		}
+
+		public Type Type
+		{
+			get { return _type; }
+		}
+	}
+}

src/Umbraco.Core/Dynamics/DynamicQueryableGetMemberBinder.cs

@@ -1,12 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Dynamic;
 
-namespace umbraco.MacroEngines
+namespace Umbraco.Core.Dynamics
 {
-    public class DynamicQueryableGetMemberBinder : GetMemberBinder
+    internal class DynamicQueryableGetMemberBinder : GetMemberBinder
     {
         public DynamicQueryableGetMemberBinder(string name, bool ignoreCase) : base(name, ignoreCase) { }
 

src/Umbraco.Core/Dynamics/DynamicXml.cs

@@ -0,0 +1,735 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Dynamic;
+using System.Reflection;
+using System.Xml.Linq;
+using System.Xml.XPath;
+using System.Collections;
+using System.IO;
+using System.Web;
+
+namespace Umbraco.Core.Dynamics
+{
+    public class DynamicXml : DynamicObject, IEnumerable<DynamicXml>, IEnumerable<XElement>
+    {
+        public XElement BaseElement { get; set; }
+
+        public DynamicXml(XElement baseElement)
+        {
+            this.BaseElement = baseElement;
+        }
+        public DynamicXml(string xml)
+        {
+            var baseElement = XElement.Parse(xml);
+            this.BaseElement = baseElement;
+        }
+        public DynamicXml(XPathNodeIterator xpni)
+        {
+            if (xpni != null)
+            {
+                if (xpni.Current != null)
+                {
+                    var xml = xpni.Current.OuterXml;
+                    var baseElement = XElement.Parse(xml);
+                    this.BaseElement = baseElement;
+                }
+            }
+        }
+        public string InnerText
+        {
+            get
+            {
+                return BaseElement.Value;
+            }
+        }
+        public string ToXml()
+        {
+            return BaseElement.ToString(SaveOptions.DisableFormatting);
+        }
+        public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+        {
+            int index = 0;
+            if (indexes.Length > 0)
+            {
+                index = (int)indexes[0];
+                result = new DynamicXml(this.BaseElement.Elements().ToList()[index]);
+                return true;
+            }
+            return base.TryGetIndex(binder, indexes, out result);
+        }
+        public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+        {
+            if (args.Length == 0 && binder.Name == "ToXml")
+            {
+                result = this.BaseElement.ToString();
+                return true;
+            }
+            if (args.Length == 1 && binder.Name == "XPath")
+            {
+                var elements = this.BaseElement.XPathSelectElements(args[0].ToString());
+                HandleIEnumerableXElement(elements, out result);
+                return true; //anyway
+            }
+
+			//ok, now lets try to match by member, property, extensino method
+			var attempt = DynamicInstanceHelper.TryInvokeMember(this, binder, args, new[]
+				{
+					typeof (IEnumerable<DynamicXml>),
+					typeof (IEnumerable<XElement>),
+					typeof (DynamicXml)
+				});
+
+			if (attempt.Success)
+			{
+				result = attempt.Result.ObjectResult;
+
+				//need to check the return type and possibly cast if result is from an extension method found
+				if (attempt.Result.Reason == DynamicInstanceHelper.TryInvokeMemberSuccessReason.FoundExtensionMethod)
+				{
+					//if the result is already a DynamicXml instance, then we do not need to cast
+					if (attempt.Result.ObjectResult != null && !(attempt.Result.ObjectResult is DynamicXml))
+					{
+						if (attempt.Result.ObjectResult is XElement)
+						{
+							result = new DynamicXml((XElement)attempt.Result.ObjectResult);
+						}
+						else if (attempt.Result.ObjectResult is IEnumerable<XElement>)
+						{
+							result = ((IEnumerable<XElement>)attempt.Result.ObjectResult).Select(x => new DynamicXml(x));
+						}
+						else if (attempt.Result.ObjectResult is IEnumerable<DynamicXml>)
+						{
+							result = ((IEnumerable<DynamicXml>)attempt.Result.ObjectResult).Select(x => new DynamicXml(x.BaseElement));
+						}
+					}
+				}
+				return true;
+			}
+
+			//this is the result of an extension method execution gone wrong so we return dynamic null
+			if (attempt.Result.Reason == DynamicInstanceHelper.TryInvokeMemberSuccessReason.FoundExtensionMethod
+				&& attempt.Error != null && attempt.Error is TargetInvocationException)
+			{
+				result = new DynamicNull();
+				return true;
+			}
+
+			result = null;
+			return false;
+
+        }
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            if (BaseElement == null || binder == null)
+            {
+                result = null;
+                return false;
+            }
+            //Go ahead and try to fetch all of the elements matching the member name, and wrap them
+            var elements = BaseElement.Elements(binder.Name);
+            if (!elements.Any() && BaseElement.Name == "root" && BaseElement.Elements().Count() == 1)
+            {
+                //no elements matched, lets try first child
+                elements = BaseElement.Elements().ElementAt(0).Elements(binder.Name);
+            }
+            if (HandleIEnumerableXElement(elements, out result))
+            {
+                return true;
+            }
+            else
+            {
+
+                //Ok, so no elements matched, so lets try attributes
+                IEnumerable<string> attributes = BaseElement.Attributes(binder.Name).Select(attr => attr.Value);
+                int count = attributes.Count();
+
+                if (count > 0)
+                {
+                    if (count > 1)
+                        result = attributes; //more than one attribute matched, lets return the collection
+                    else
+                        result = attributes.FirstOrDefault(); //only one attribute matched, lets just return it
+
+                    return true; // return true because we matched
+                }
+                else
+                {
+                    //no attributes matched, lets try first child
+                    if (BaseElement.Name == "root" && BaseElement.Elements().Count() == 1)
+                    {
+                        attributes = BaseElement.Elements().ElementAt(0).Attributes(binder.Name).Select(attr => attr.Value);
+                        count = attributes.Count();
+                        if (count > 1)
+                            result = attributes; //more than one attribute matched, lets return the collection
+                        else
+                            result = attributes.FirstOrDefault(); //only one attribute matched, lets just return it
+
+                        return true; // return true because we matched
+                    }
+                }
+            }
+            return base.TryGetMember(binder, out result);
+        }
+
+        private bool HandleIEnumerableXElement(IEnumerable<XElement> elements, out object result)
+        {
+            //Get the count now, so we don't have to call it twice
+            int count = elements.Count();
+            if (count > 0)
+            {
+                var firstElement = elements.FirstOrDefault();
+                //we have a single element, does it have any children?
+                if (firstElement != null && firstElement.Elements().Count() == 0 && !firstElement.HasAttributes)
+                {
+                    //no, return the text
+                    result = firstElement.Value;
+                    return true;
+                }
+                else
+                {
+                    //We have more than one matching element, so let's return the collection
+                    //elements is IEnumerable<DynamicXml>
+                    //but we want to be able to re-enter this code
+                    XElement root = new XElement(XName.Get("root"));
+                    root.Add(elements);
+                    result = new DynamicXml(root);
+
+                    //From here, you'll either end up back here (because you have <root><node><node>)
+                    //or you use [] indexing and you end up with a single element
+                    return true;
+                }
+            }
+            result = null;
+            return false;
+        }
+        public DynamicXml XPath(string expression)
+        {
+            var matched = this.BaseElement.XPathSelectElements(expression);
+            DynamicXml root = new DynamicXml("<results/>");
+            foreach (var element in matched)
+            {
+                root.BaseElement.Add(element);
+            }
+            return root;
+        }
+        public IHtmlString ToHtml()
+        {
+            return new HtmlString(this.ToXml());
+        }
+        public DynamicXml Find(string expression)
+        {
+            return new DynamicXml(this.BaseElement.XPathSelectElements(expression).FirstOrDefault());
+        }
+
+        public DynamicXml Find(string attributeName, object value)
+        {
+            string expression = string.Format("//*[{0}='{1}']", attributeName, value);
+            return new DynamicXml(this.BaseElement.XPathSelectElements(expression).FirstOrDefault());
+        }
+
+	    IEnumerator<XElement> IEnumerable<XElement>.GetEnumerator()
+	    {
+			return this.BaseElement.Elements().GetEnumerator();
+	    }
+
+	    public IEnumerator<DynamicXml> GetEnumerator()
+	    {
+			return this.BaseElement.Elements().Select(e => new DynamicXml(e)).GetEnumerator();
+	    }
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return GetEnumerator();
+		}
+	    
+        public int Count()
+        {
+			return ((IEnumerable<XElement>)this).Count();
+        }
+
+        public bool Any()
+        {
+			return ((IEnumerable<XElement>)this).Any();
+        }
+
+		public IEnumerable<DynamicXml> Take(int count)
+		{
+			return ((IEnumerable<DynamicXml>)this).Take(count);
+		}
+
+		public IEnumerable<DynamicXml> Skip(int count)
+		{
+			return ((IEnumerable<DynamicXml>)this).Skip(count);
+		} 
+
+        public bool IsNull()
+        {
+            return false;
+        }
+        public bool HasValue()
+        {
+            return true;
+        }
+
+        public bool IsFirst()
+        {
+            return IsHelper(n => n.Index() == 0);
+        }
+        public HtmlString IsFirst(string valueIfTrue)
+        {
+            return IsHelper(n => n.Index() == 0, valueIfTrue);
+        }
+        public HtmlString IsFirst(string valueIfTrue, string valueIfFalse)
+        {
+            return IsHelper(n => n.Index() == 0, valueIfTrue, valueIfFalse);
+        }
+        public bool IsNotFirst()
+        {
+            return !IsHelper(n => n.Index() == 0);
+        }
+        public HtmlString IsNotFirst(string valueIfTrue)
+        {
+            return IsHelper(n => n.Index() != 0, valueIfTrue);
+        }
+        public HtmlString IsNotFirst(string valueIfTrue, string valueIfFalse)
+        {
+            return IsHelper(n => n.Index() != 0, valueIfTrue, valueIfFalse);
+        }
+        public bool IsPosition(int index)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return false;
+            }
+            return IsHelper(n => n.Index() == index);
+        }
+        public HtmlString IsPosition(int index, string valueIfTrue)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(string.Empty);
+            }
+            return IsHelper(n => n.Index() == index, valueIfTrue);
+        }
+        public HtmlString IsPosition(int index, string valueIfTrue, string valueIfFalse)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(valueIfFalse);
+            }
+            return IsHelper(n => n.Index() == index, valueIfTrue, valueIfFalse);
+        }
+        public bool IsModZero(int modulus)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return false;
+            }
+            return IsHelper(n => n.Index() % modulus == 0);
+        }
+        public HtmlString IsModZero(int modulus, string valueIfTrue)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(string.Empty);
+            }
+            return IsHelper(n => n.Index() % modulus == 0, valueIfTrue);
+        }
+        public HtmlString IsModZero(int modulus, string valueIfTrue, string valueIfFalse)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(valueIfFalse);
+            }
+            return IsHelper(n => n.Index() % modulus == 0, valueIfTrue, valueIfFalse);
+        }
+
+        public bool IsNotModZero(int modulus)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return false;
+            }
+            return IsHelper(n => n.Index() % modulus != 0);
+        }
+        public HtmlString IsNotModZero(int modulus, string valueIfTrue)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(string.Empty);
+            }
+            return IsHelper(n => n.Index() % modulus != 0, valueIfTrue);
+        }
+        public HtmlString IsNotModZero(int modulus, string valueIfTrue, string valueIfFalse)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(valueIfFalse);
+            }
+            return IsHelper(n => n.Index() % modulus != 0, valueIfTrue, valueIfFalse);
+        }
+        public bool IsNotPosition(int index)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return false;
+            }
+            return !IsHelper(n => n.Index() == index);
+        }
+        public HtmlString IsNotPosition(int index, string valueIfTrue)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(string.Empty);
+            }
+            return IsHelper(n => n.Index() != index, valueIfTrue);
+        }
+        public HtmlString IsNotPosition(int index, string valueIfTrue, string valueIfFalse)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(valueIfFalse);
+            }
+            return IsHelper(n => n.Index() != index, valueIfTrue, valueIfFalse);
+        }
+        public bool IsLast()
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return false;
+            }
+            int count = this.BaseElement.Parent.Elements().Count();
+            return IsHelper(n => n.Index() == count - 1);
+        }
+        public HtmlString IsLast(string valueIfTrue)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(string.Empty);
+            }
+            int count = this.BaseElement.Parent.Elements().Count();
+            return IsHelper(n => n.Index() == count - 1, valueIfTrue);
+        }
+        public HtmlString IsLast(string valueIfTrue, string valueIfFalse)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(valueIfFalse);
+            }
+            int count = this.BaseElement.Parent.Elements().Count();
+            return IsHelper(n => n.Index() == count - 1, valueIfTrue, valueIfFalse);
+        }
+        public bool IsNotLast()
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return false;
+            }
+            int count = this.BaseElement.Parent.Elements().Count();
+            return !IsHelper(n => n.Index() == count - 1);
+        }
+        public HtmlString IsNotLast(string valueIfTrue)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(string.Empty);
+            }
+            int count = this.BaseElement.Parent.Elements().Count();
+            return IsHelper(n => n.Index() != count - 1, valueIfTrue);
+        }
+        public HtmlString IsNotLast(string valueIfTrue, string valueIfFalse)
+        {
+            if (this.BaseElement == null || this.BaseElement.Parent == null)
+            {
+                return new HtmlString(valueIfFalse);
+            }
+            int count = this.BaseElement.Parent.Elements().Count();
+            return IsHelper(n => n.Index() != count - 1, valueIfTrue, valueIfFalse);
+        }
+        public bool IsEven()
+        {
+            return IsHelper(n => n.Index() % 2 == 0);
+        }
+        public HtmlString IsEven(string valueIfTrue)
+        {
+            return IsHelper(n => n.Index() % 2 == 0, valueIfTrue);
+        }
+        public HtmlString IsEven(string valueIfTrue, string valueIfFalse)
+        {
+            return IsHelper(n => n.Index() % 2 == 0, valueIfTrue, valueIfFalse);
+        }
+        public bool IsOdd()
+        {
+            return IsHelper(n => n.Index() % 2 == 1);
+        }
+        public HtmlString IsOdd(string valueIfTrue)
+        {
+            return IsHelper(n => n.Index() % 2 == 1, valueIfTrue);
+        }
+        public HtmlString IsOdd(string valueIfTrue, string valueIfFalse)
+        {
+            return IsHelper(n => n.Index() % 2 == 1, valueIfTrue, valueIfFalse);
+        }
+        public bool IsEqual(DynamicXml other)
+        {
+            return IsHelper(n => n.BaseElement == other.BaseElement);
+        }
+        public HtmlString IsEqual(DynamicXml other, string valueIfTrue)
+        {
+            return IsHelper(n => n.BaseElement == other.BaseElement, valueIfTrue);
+        }
+        public HtmlString IsEqual(DynamicXml other, string valueIfTrue, string valueIfFalse)
+        {
+            return IsHelper(n => n.BaseElement == other.BaseElement, valueIfTrue, valueIfFalse);
+        }
+        public bool IsNotEqual(DynamicXml other)
+        {
+            return IsHelper(n => n.BaseElement != other.BaseElement);
+        }
+        public HtmlString IsNotEqual(DynamicXml other, string valueIfTrue)
+        {
+            return IsHelper(n => n.BaseElement != other.BaseElement, valueIfTrue);
+        }
+        public HtmlString IsNotEqual(DynamicXml other, string valueIfTrue, string valueIfFalse)
+        {
+            return IsHelper(n => n.BaseElement != other.BaseElement, valueIfTrue, valueIfFalse);
+        }
+        public bool IsDescendant(DynamicXml other)
+        {
+            var ancestors = this.Ancestors();
+            return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null);
+        }
+        public HtmlString IsDescendant(DynamicXml other, string valueIfTrue)
+        {
+            var ancestors = this.Ancestors();
+			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue);
+        }
+        public HtmlString IsDescendant(DynamicXml other, string valueIfTrue, string valueIfFalse)
+        {
+            var ancestors = this.Ancestors();
+			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
+        }
+        public bool IsDescendantOrSelf(DynamicXml other)
+        {
+            var ancestors = this.AncestorsOrSelf();
+			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null);
+        }
+        public HtmlString IsDescendantOrSelf(DynamicXml other, string valueIfTrue)
+        {
+            var ancestors = this.AncestorsOrSelf();
+			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue);
+        }
+        public HtmlString IsDescendantOrSelf(DynamicXml other, string valueIfTrue, string valueIfFalse)
+        {
+            var ancestors = this.AncestorsOrSelf();
+			return IsHelper(n => ancestors.FirstOrDefault(ancestor => ancestor.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
+        }
+        public bool IsAncestor(DynamicXml other)
+        {
+            var descendants = this.Descendants();
+			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null);
+        }
+        public HtmlString IsAncestor(DynamicXml other, string valueIfTrue)
+        {
+            var descendants = this.Descendants();
+			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue);
+        }
+        public HtmlString IsAncestor(DynamicXml other, string valueIfTrue, string valueIfFalse)
+        {
+            var descendants = this.Descendants();
+			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
+        }
+        public bool IsAncestorOrSelf(DynamicXml other)
+        {
+            var descendants = this.DescendantsOrSelf();
+			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null);
+        }
+        public HtmlString IsAncestorOrSelf(DynamicXml other, string valueIfTrue)
+        {
+            var descendants = this.DescendantsOrSelf();
+			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue);
+        }
+        public HtmlString IsAncestorOrSelf(DynamicXml other, string valueIfTrue, string valueIfFalse)
+        {
+            var descendants = this.DescendantsOrSelf();
+			return IsHelper(n => descendants.FirstOrDefault(descendant => descendant.BaseElement == other.BaseElement) != null, valueIfTrue, valueIfFalse);
+        }
+        public IEnumerable<DynamicXml> Descendants()
+        {
+            return Descendants(n => true);
+        }
+		public IEnumerable<DynamicXml> Descendants(Func<XElement, bool> func)
+        {
+            var flattenedNodes = this.BaseElement.Elements().Map(func, (XElement n) => { return n.Elements(); });
+            return flattenedNodes.ToList().ConvertAll(n => new DynamicXml(n));
+        }
+		public IEnumerable<DynamicXml> DescendantsOrSelf()
+        {
+            return DescendantsOrSelf(n => true);
+        }
+		public IEnumerable<DynamicXml> DescendantsOrSelf(Func<XElement, bool> func)
+        {
+            var flattenedNodes = this.BaseElement.Elements().Map(func, (XElement n) => { return n.Elements(); });
+            var list = new List<DynamicXml>();
+            list.Add(this);
+            list.AddRange(flattenedNodes.ToList().ConvertAll(n => new DynamicXml(n)));
+            return list;
+        }
+		public IEnumerable<DynamicXml> Ancestors()
+        {
+            return Ancestors(item => true);
+        }
+		public IEnumerable<DynamicXml> Ancestors(Func<XElement, bool> func)
+        {
+            var ancestorList = new List<XElement>();
+            var node = this.BaseElement;
+            while (node != null)
+            {
+                if (node.Parent == null) break;
+                XElement parent = node.Parent;
+                if (parent != null)
+                {
+                    if (this.BaseElement != parent)
+                    {
+                        node = parent;
+                        if (func(node))
+                        {
+                            ancestorList.Add(node);
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    break;
+                }
+            }
+            ancestorList.Reverse();
+            return ancestorList.ConvertAll(item => new DynamicXml(item));
+        }
+		public IEnumerable<DynamicXml> AncestorsOrSelf()
+        {
+            return AncestorsOrSelf(item => true);
+        }
+		public IEnumerable<DynamicXml> AncestorsOrSelf(Func<XElement, bool> func)
+        {
+            List<XElement> ancestorList = new List<XElement>();
+            var node = this.BaseElement;
+            ancestorList.Add(node);
+            while (node != null)
+            {
+                if (node.Parent == null) break;
+                XElement parent = node.Parent;
+                if (parent != null)
+                {
+                    if (this.BaseElement != parent)
+                    {
+                        node = parent;
+                        if (func(node))
+                        {
+                            ancestorList.Add(node);
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    break;
+                }
+            }
+            ancestorList.Reverse();
+            return ancestorList.ConvertAll(item => new DynamicXml(item));
+        }
+
+        public int Index()
+        {
+            if (this.BaseElement != null && this.BaseElement.Parent != null)
+            {
+                var elements = this.BaseElement.Parent.Elements();
+                int index = 0;
+                foreach (var element in elements)
+                {
+                    if (element == this.BaseElement) break;
+                    index++;
+                }
+                return index;
+            }
+            return 0;
+        }
+
+        public bool IsHelper(Func<DynamicXml, bool> test)
+        {
+            return test(this);
+        }
+        public HtmlString IsHelper(Func<DynamicXml, bool> test, string valueIfTrue)
+        {
+            return IsHelper(test, valueIfTrue, string.Empty);
+        }
+        public HtmlString IsHelper(Func<DynamicXml, bool> test, string valueIfTrue, string valueIfFalse)
+        {
+            return test(this) ? new HtmlString(valueIfTrue) : new HtmlString(valueIfFalse);
+        }
+
+        public static string StripDashesInElementOrAttributeNames(string xml)
+        {
+            using (MemoryStream outputms = new MemoryStream())
+            {
+                using (TextWriter outputtw = new StreamWriter(outputms))
+                {
+                    using (MemoryStream ms = new MemoryStream())
+                    {
+                        using (TextWriter tw = new StreamWriter(ms))
+                        {
+                            tw.Write(xml);
+                            tw.Flush();
+                            ms.Position = 0;
+                            using (TextReader tr = new StreamReader(ms))
+                            {
+                                bool IsInsideElement = false, IsInsideQuotes = false;
+                                int ic = 0;
+                                while ((ic = tr.Read()) != -1)
+                                {
+                                    if (ic == (int)'<' && !IsInsideQuotes)
+                                    {
+                                        if (tr.Peek() != (int)'!')
+                                        {
+                                            IsInsideElement = true;
+                                        }
+                                    }
+                                    if (ic == (int)'>' && !IsInsideQuotes)
+                                    {
+                                        IsInsideElement = false;
+                                    }
+                                    if (ic == (int)'"')
+                                    {
+                                        IsInsideQuotes = !IsInsideQuotes;
+                                    }
+                                    if (!IsInsideElement || ic != (int)'-' || IsInsideQuotes)
+                                    {
+                                        outputtw.Write((char)ic);
+                                    }
+                                }
+
+                            }
+                        }
+                    }
+                    outputtw.Flush();
+                    outputms.Position = 0;
+                    using (TextReader outputtr = new StreamReader(outputms))
+                    {
+                        return outputtr.ReadToEnd();
+                    }
+                }
+            }
+        }
+
+	    
+    }
+}

src/Umbraco.Core/Dynamics/ExtensionMethodFinder.cs

@@ -0,0 +1,198 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Web.Compilation;
+using System.Runtime.CompilerServices;
+using System.Collections;
+using System.Linq.Expressions;
+
+namespace Umbraco.Core.Dynamics
+{
+	/// <summary>
+	/// Utility class for finding extension methods on a type to execute
+	/// </summary>
+    internal static class ExtensionMethodFinder
+    {	
+		/// <summary>
+		/// Returns all extension methods found matching the definition
+		/// </summary>
+		/// <param name="thisType"></param>
+		/// <param name="name"></param>
+		/// <param name="argumentCount"></param>
+		/// <param name="argsContainsThis"></param>
+		/// <returns></returns>
+		/// <remarks>
+		/// TODO: NOTE: This will be an intensive method to call!! Results should be cached!
+		/// </remarks>
+        private static IEnumerable<MethodInfo> GetAllExtensionMethods(Type thisType, string name, int argumentCount, bool argsContainsThis)
+        {
+			//only scan assemblies we know to contain extension methods (user assemblies)
+        	var assembliesToScan = TypeFinder.GetAssembliesWithKnownExclusions();        	
+
+            //get extension methods from runtime
+            var candidates = (
+				from assembly in assembliesToScan
+                where assembly.IsDefined(typeof(ExtensionAttribute), false)
+                from type in assembly.GetTypes()
+                where (type.IsDefined(typeof(ExtensionAttribute), false)
+                    && type.IsSealed && !type.IsGenericType && !type.IsNested)
+                from method in type.GetMethods(BindingFlags.Static | BindingFlags.Public)
+                // this filters extension methods
+                where method.IsDefined(typeof(ExtensionAttribute), false)
+                select method
+                );
+
+            //add the extension methods defined in IEnumerable
+            candidates = candidates.Concat(typeof(Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public));            
+
+            //filter by name	
+            var methodsByName = candidates.Where(m => m.Name == name);
+
+            var isGenericAndRightParamCount = methodsByName.Where(m => m.GetParameters().Length == argumentCount + (argsContainsThis ? 0 : 1));
+
+            //find the right overload that can take genericParameterType
+            //which will be either DynamicNodeList or List<DynamicNode> which is IEnumerable`
+
+            var withGenericParameterType = isGenericAndRightParamCount.Select(m => new { m, t = FirstParameterType(m) });
+
+            var methodsWhereArgZeroIsTargetType = (from method in withGenericParameterType
+                                                   where
+                                                   method.t != null && MethodArgZeroHasCorrectTargetType(method.m, method.t, thisType)
+                                                   select method);
+
+            return methodsWhereArgZeroIsTargetType.Select(mt => mt.m);
+        }
+        
+		private static bool MethodArgZeroHasCorrectTargetType(MethodInfo method, Type firstArgumentType, Type thisType)
+        {
+            //This is done with seperate method calls because you can't debug/watch lamdas - if you're trying to figure
+            //out why the wrong method is returned, it helps to be able to see each boolean result
+
+            return
+
+            // is it defined on me?
+            MethodArgZeroHasCorrectTargetTypeTypeMatchesExactly(method, firstArgumentType, thisType) ||
+
+            // or on any of my interfaces?
+           MethodArgZeroHasCorrectTargetTypeAnInterfaceMatches(method, firstArgumentType, thisType) ||
+
+            // or on any of my base types?
+            MethodArgZeroHasCorrectTargetTypeIsASubclassOf(method, firstArgumentType, thisType) ||
+
+           //share a common interface (e.g. IEnumerable)
+            MethodArgZeroHasCorrectTargetTypeShareACommonInterface(method, firstArgumentType, thisType);
+
+
+        }
+
+        private static bool MethodArgZeroHasCorrectTargetTypeShareACommonInterface(MethodInfo method, Type firstArgumentType, Type thisType)
+        {
+            Type[] interfaces = firstArgumentType.GetInterfaces();
+            if (interfaces.Length == 0)
+            {
+                return false;
+            }
+            bool result = interfaces.All(i => thisType.GetInterfaces().Contains(i));
+            return result;
+        }
+
+        private static bool MethodArgZeroHasCorrectTargetTypeIsASubclassOf(MethodInfo method, Type firstArgumentType, Type thisType)
+        {
+            bool result = thisType.IsSubclassOf(firstArgumentType);
+            return result;
+        }
+
+        private static bool MethodArgZeroHasCorrectTargetTypeAnInterfaceMatches(MethodInfo method, Type firstArgumentType, Type thisType)
+        {
+            bool result = thisType.GetInterfaces().Contains(firstArgumentType);
+            return result;
+        }
+
+        private static bool MethodArgZeroHasCorrectTargetTypeTypeMatchesExactly(MethodInfo method, Type firstArgumentType, Type thisType)
+        {
+            bool result = (thisType == firstArgumentType);
+            return result;
+        }
+        
+		private static Type FirstParameterType(MethodInfo m)
+        {
+            ParameterInfo[] p = m.GetParameters();
+            if (p.Any())
+            {
+                return p.First().ParameterType;
+            }
+            return null;
+        }
+
+		private static MethodInfo DetermineMethodFromParams(IEnumerable<MethodInfo> methods, Type genericType, IEnumerable<object> args)
+		{
+			if (!methods.Any())
+			{
+				return null;
+			}
+			MethodInfo methodToExecute = null;
+			if (methods.Count() > 1)
+			{
+				//Given the args, lets get the types and compare the type sequence to try and find the correct overload
+				var argTypes = args.ToList().ConvertAll(o =>
+				{
+					var oe = (o as Expression);
+					if (oe != null)
+					{
+						return oe.Type.FullName;
+					}
+					return o.GetType().FullName;
+				});
+				var methodsWithArgTypes = methods.Select(method => new { method, types = method.GetParameters().Select(pi => pi.ParameterType.FullName) });
+				var firstMatchingOverload = methodsWithArgTypes.FirstOrDefault(m => m.types.SequenceEqual(argTypes));
+				if (firstMatchingOverload != null)
+				{
+					methodToExecute = firstMatchingOverload.method;
+				}
+			}
+
+			if (methodToExecute == null)
+			{
+				var firstMethod = methods.FirstOrDefault();
+				// NH: this is to ensure that it's always the correct one being chosen when using the LINQ extension methods
+				if (methods.Count() > 1)
+				{
+					var firstGenericMethod = methods.FirstOrDefault(x => x.IsGenericMethodDefinition);
+					if (firstGenericMethod != null)
+					{
+						firstMethod = firstGenericMethod;
+					}
+				}
+
+				if (firstMethod != null)
+				{
+					if (firstMethod.IsGenericMethodDefinition)
+					{
+						if (genericType != null)
+						{
+							methodToExecute = firstMethod.MakeGenericMethod(genericType);
+						}
+					}
+					else
+					{
+						methodToExecute = firstMethod;
+					}
+				}
+			}
+			return methodToExecute;
+		}
+
+        public static MethodInfo FindExtensionMethod(Type thisType, object[] args, string name, bool argsContainsThis)
+        {
+            Type genericType = null;
+            if (thisType.IsGenericType)
+            {
+                genericType = thisType.GetGenericArguments()[0];
+            }			
+
+        	var methods = GetAllExtensionMethods(thisType, name, args.Length, argsContainsThis).ToArray();
+			return DetermineMethodFromParams(methods, genericType, args);
+        }
+    }
+}

src/Umbraco.Core/Dynamics/ExtensionMethods.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core.Dynamics
+{
+    internal static class ExtensionMethods
+    {
+        public static IEnumerable<TSource> Map<TSource>(
+            this IEnumerable<TSource> source,
+            Func<TSource, bool> selectorFunction,
+            Func<TSource, IEnumerable<TSource>> getChildrenFunction)
+        {
+            if (!source.Any())
+            {
+                return source;
+            }
+            // Add what we have to the stack   
+            var flattenedList = source.Where(selectorFunction);
+            // Go through the input enumerable looking for children,   
+            // and add those if we have them   
+            foreach (TSource element in source)
+            {
+                var secondInner = getChildrenFunction(element);
+                if (secondInner.Any())
+                {
+                    secondInner = secondInner.Map(selectorFunction, getChildrenFunction);
+                }
+                flattenedList = flattenedList.Concat(secondInner);
+            }
+            return flattenedList;
+        }
+
+
+        
+
+        public static bool ContainsAny(this string haystack, IEnumerable<string> needles)
+        {
+        	if (haystack == null) throw new ArgumentNullException("haystack");
+        	if (!string.IsNullOrEmpty(haystack) || needles.Any())
+            {
+            	return needles.Any(haystack.Contains);
+            }
+            return false;
+        }
+        public static bool ContainsAny(this string haystack, params string[] needles)
+        {
+        	if (haystack == null) throw new ArgumentNullException("haystack");
+        	if (!string.IsNullOrEmpty(haystack) || needles.Length > 0)
+            {
+            	return needles.Any(haystack.Contains);
+            }
+            return false;
+        }
+		public static bool ContainsAny(this string haystack, StringComparison comparison, IEnumerable<string> needles)
+        {
+        	if (haystack == null) throw new ArgumentNullException("haystack");
+        	if (!string.IsNullOrEmpty(haystack) || needles.Any())
+            {
+            	return needles.Any(value => haystack.IndexOf(value, comparison) >= 0);
+            }
+            return false;
+        }
+        public static bool ContainsAny(this string haystack, StringComparison comparison, params string[] needles)
+        {
+        	if (haystack == null) throw new ArgumentNullException("haystack");
+        	if (!string.IsNullOrEmpty(haystack) || needles.Length > 0)
+            {
+            	return needles.Any(value => haystack.IndexOf(value, comparison) >= 0);
+            }
+            return false;
+        }
+        public static bool ContainsInsensitive(this string haystack, string needle)
+        {
+        	if (haystack == null) throw new ArgumentNullException("haystack");
+        	return haystack.IndexOf(needle, StringComparison.CurrentCultureIgnoreCase) >= 0;
+        }
+
+    	public static bool HasValue(this string s)
+        {
+            return !string.IsNullOrWhiteSpace(s);
+        }
+
+    }
+}

src/Umbraco.Core/Dynamics/ParseException.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace Umbraco.Core.Dynamics
+{
+	internal sealed class ParseException : Exception
+	{
+		readonly int _position;
+
+		public ParseException(string message, int position)
+			: base(message)
+		{
+			this._position = position;
+		}
+
+		public int Position
+		{
+			get { return _position; }
+		}
+
+		public override string ToString()
+		{
+			return string.Format(Res.ParseExceptionFormat, Message, _position);
+		}
+	}
+}

src/Umbraco.Core/Dynamics/PropertyResult.cs

@@ -0,0 +1,65 @@
+using System;
+using Umbraco.Core.Models;
+using umbraco.interfaces;
+using System.Web;
+
+namespace Umbraco.Core.Dynamics
+{
+	internal class PropertyResult : IPublishedContentProperty, IHtmlString
+    {
+		internal PropertyResult(IPublishedContentProperty source, PropertyResultType type)
+        {
+    		if (source == null) throw new ArgumentNullException("source");
+
+    		Alias = source.Alias;
+			Value = source.Value;
+			Version = source.Version;
+			PropertyType = type;
+        }
+		internal PropertyResult(string alias, object value, Guid version, PropertyResultType type)
+        {
+        	if (alias == null) throw new ArgumentNullException("alias");
+        	if (value == null) throw new ArgumentNullException("value");
+
+        	Alias = alias;
+			Value = value;
+            Version = version;
+        	PropertyType = type;
+        }
+
+		internal PropertyResultType PropertyType { get; private set; }
+		
+    	public string Alias { get; private set; }
+
+    	public object Value { get; private set; }
+	
+		/// <summary>
+		/// Returns the value as a string output, this is used in the final rendering process of a property
+		/// </summary>
+		internal string ValueAsString
+		{
+			get
+			{
+				return Value == null ? "" : Convert.ToString(Value);
+			}
+		}
+
+    	public Guid Version { get; private set; }
+
+
+		/// <summary>
+		/// The Id of the document for which this property belongs to
+		/// </summary>
+        public int DocumentId { get; set; }
+
+		/// <summary>
+		/// The alias of the document type alias for which this property belongs to
+		/// </summary>
+        public string DocumentTypeAlias { get; set; }
+
+        public string ToHtmlString()
+        {
+			return ValueAsString;
+        }
+    }
+}

src/Umbraco.Core/Dynamics/PropertyResultType.cs

@@ -0,0 +1,23 @@
+namespace Umbraco.Core.Dynamics
+{
+	/// <summary>
+	/// Currently just used for informational purposes as to where a PropertyResult object was created from.
+	/// </summary>
+	internal enum PropertyResultType
+	{
+		/// <summary>
+		/// The property resolved was a normal document property
+		/// </summary>
+		UserProperty,
+
+		/// <summary>
+		/// The property resolved was a property defined as a member on the document object (IPublishedContent) itself
+		/// </summary>
+		ReflectedProperty,
+
+		/// <summary>
+		/// The property was created manually for a custom purpose
+		/// </summary>
+		CustomProperty
+	}
+}

src/Umbraco.Core/Dynamics/Res.cs

@@ -0,0 +1,50 @@
+namespace Umbraco.Core.Dynamics
+{
+	internal static class Res
+	{
+		public const string DuplicateIdentifier = "The identifier '{0}' was defined more than once";
+		public const string ExpressionTypeMismatch = "Expression of type '{0}' expected";
+		public const string ExpressionExpected = "Expression expected";
+		public const string InvalidCharacterLiteral = "Character literal must contain exactly one character";
+		public const string InvalidIntegerLiteral = "Invalid integer literal '{0}'";
+		public const string InvalidRealLiteral = "Invalid real literal '{0}'";
+		public const string UnknownIdentifier = "Unknown identifier '{0}'";
+		public const string NoItInScope = "No 'it' is in scope";
+		public const string IifRequiresThreeArgs = "The 'iif' function requires three arguments";
+		public const string FirstExprMustBeBool = "The first expression must be of type 'Boolean'";
+		public const string BothTypesConvertToOther = "Both of the types '{0}' and '{1}' convert to the other";
+		public const string NeitherTypeConvertsToOther = "Neither of the types '{0}' and '{1}' converts to the other";
+		public const string MissingAsClause = "Expression is missing an 'as' clause";
+		public const string ArgsIncompatibleWithLambda = "Argument list incompatible with lambda expression";
+		public const string TypeHasNoNullableForm = "Type '{0}' has no nullable form";
+		public const string NoMatchingConstructor = "No matching constructor in type '{0}'";
+		public const string AmbiguousConstructorInvocation = "Ambiguous invocation of '{0}' constructor";
+		public const string CannotConvertValue = "A value of type '{0}' cannot be converted to type '{1}'";
+		public const string NoApplicableMethod = "No applicable method '{0}' exists in type '{1}'";
+		public const string MethodsAreInaccessible = "Methods on type '{0}' are not accessible";
+		public const string MethodIsVoid = "Method '{0}' in type '{1}' does not return a value";
+		public const string AmbiguousMethodInvocation = "Ambiguous invocation of method '{0}' in type '{1}'";
+		public const string UnknownPropertyOrField = "No property or field '{0}' exists in type '{1}'";
+		public const string NoApplicableAggregate = "No applicable aggregate method '{0}' exists";
+		public const string CannotIndexMultiDimArray = "Indexing of multi-dimensional arrays is not supported";
+		public const string InvalidIndex = "Array index must be an integer expression";
+		public const string NoApplicableIndexer = "No applicable indexer exists in type '{0}'";
+		public const string AmbiguousIndexerInvocation = "Ambiguous invocation of indexer in type '{0}'";
+		public const string IncompatibleOperand = "Operator '{0}' incompatible with operand type '{1}'";
+		public const string IncompatibleOperands = "Operator '{0}' incompatible with operand types '{1}' and '{2}'";
+		public const string UnterminatedStringLiteral = "Unterminated string literal";
+		public const string InvalidCharacter = "Syntax error '{0}'";
+		public const string DigitExpected = "Digit expected";
+		public const string SyntaxError = "Syntax error";
+		public const string TokenExpected = "{0} expected";
+		public const string ParseExceptionFormat = "{0} (at index {1})";
+		public const string ColonExpected = "':' expected";
+		public const string OpenParenExpected = "'(' expected";
+		public const string CloseParenOrOperatorExpected = "')' or operator expected";
+		public const string CloseParenOrCommaExpected = "')' or ',' expected";
+		public const string DotOrOpenParenExpected = "'.' or '(' expected";
+		public const string OpenBracketExpected = "'[' expected";
+		public const string CloseBracketOrCommaExpected = "']' or ',' expected";
+		public const string IdentifierExpected = "Identifier expected";
+	}
+}

src/Umbraco.Core/Dynamics/Signature.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Dynamics
+{
+	internal class Signature : IEquatable<Signature>
+	{
+		public DynamicProperty[] Properties { get; set; }
+		public int HashCode { get; set; }
+
+		public Signature(IEnumerable<DynamicProperty> properties)
+		{
+			this.Properties = properties.ToArray();
+			HashCode = 0;
+			foreach (DynamicProperty p in this.Properties)
+			{
+				HashCode ^= p.Name.GetHashCode() ^ p.Type.GetHashCode();
+			}
+		}
+
+		public override int GetHashCode()
+		{
+			return HashCode;
+		}
+
+		public override bool Equals(object obj)
+		{
+			return obj is Signature && Equals((Signature)obj);
+		}
+
+		public bool Equals(Signature other)
+		{
+			if (Properties.Length != other.Properties.Length) return false;
+			for (int i = 0; i < Properties.Length; i++)
+			{
+				if (Properties[i].Name != other.Properties[i].Name ||
+				    Properties[i].Type != other.Properties[i].Type) return false;
+			}
+			return true;
+		}
+	}
+}

src/Umbraco.Core/Enum.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// A very useful class for parsing, enumerating and querying Enum objects
+	/// </summary>
+	/// <typeparam name="T"></typeparam>
+	/// <remarks>
+	/// Taken from http://damieng.com/blog/2010/10/17/enums-better-syntax-improved-performance-and-tryparse-in-net-3-5
+	/// </remarks>
+	internal static class Enum<T> where T : struct
+	{
+		private static readonly IEnumerable<T> All = Enum.GetValues(typeof(T)).Cast<T>();
+		private static readonly Dictionary<string, T> InsensitiveNames = All.ToDictionary(k => Enum.GetName(typeof(T), k).ToLowerInvariant());
+		private static readonly Dictionary<string, T> SensitiveNames = All.ToDictionary(k => Enum.GetName(typeof(T), k));
+		private static readonly Dictionary<int, T> Values = All.ToDictionary(k => Convert.ToInt32(k));
+		private static readonly Dictionary<T, string> Names = All.ToDictionary(k => k, v => v.ToString());
+
+		public static bool IsDefined(T value)
+		{
+			return Names.Keys.Contains(value);
+		}
+
+		public static bool IsDefined(string value)
+		{
+			return SensitiveNames.Keys.Contains(value);
+		}
+
+		public static bool IsDefined(int value)
+		{
+			return Values.Keys.Contains(value);
+		}
+
+		public static IEnumerable<T> GetValues()
+		{
+			return All;
+		}
+
+		public static string[] GetNames()
+		{
+			return Names.Values.ToArray();
+		}
+
+		public static string GetName(T value)
+		{
+			string name;
+			Names.TryGetValue(value, out name);
+			return name;
+		}
+
+		public static T Parse(string value)
+		{
+			T parsed = default(T);
+			if (!SensitiveNames.TryGetValue(value, out parsed))
+				throw new ArgumentException("Value is not one of the named constants defined for the enumeration", "value");
+			return parsed;
+		}
+
+		public static T Parse(string value, bool ignoreCase)
+		{
+			if (!ignoreCase)
+				return Parse(value);
+
+			T parsed = default(T);
+			if (!InsensitiveNames.TryGetValue(value.ToLowerInvariant(), out parsed))
+				throw new ArgumentException("Value is not one of the named constants defined for the enumeration", "value");
+			return parsed;
+		}
+
+		public static bool TryParse(string value, out T returnValue)
+		{
+			return SensitiveNames.TryGetValue(value, out returnValue);
+		}
+
+		public static bool TryParse(string value, bool ignoreCase, out T returnValue)
+		{
+			if (!ignoreCase)
+				return TryParse(value, out returnValue);
+
+			return InsensitiveNames.TryGetValue(value.ToLowerInvariant(), out returnValue);
+		}
+
+		public static T? ParseOrNull(string value)
+		{
+			if (String.IsNullOrEmpty(value))
+				return null;
+
+			T foundValue;
+			if (InsensitiveNames.TryGetValue(value.ToLowerInvariant(), out foundValue))
+				return foundValue;
+
+			return null;
+		}
+
+		public static T? CastOrNull(int value)
+		{
+			T foundValue;
+			if (Values.TryGetValue(value, out foundValue))
+				return foundValue;
+
+			return null;
+		}
+	}
+}

src/Umbraco.Core/ExpressionExtensions.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Umbraco.Core
+{
+	internal static class ExpressionExtensions
+	{
+		public static Expression<Func<T, bool>> True<T>() { return f => true; }
+		public static Expression<Func<T, bool>> False<T>() { return f => false; }
+
+		public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> left,
+		                                              Expression<Func<T, bool>> right)
+		{
+			var invokedExpr = Expression.Invoke(right, left.Parameters.Cast<Expression>());
+			return Expression.Lambda<Func<T, bool>>
+				(Expression.OrElse(left.Body, invokedExpr), left.Parameters);
+		}
+
+		public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> left,
+		                                               Expression<Func<T, bool>> right)
+		{
+			var invokedExpr = Expression.Invoke(right, left.Parameters.Cast<Expression>());
+			return Expression.Lambda<Func<T, bool>>
+				(Expression.AndAlso(left.Body, invokedExpr), left.Parameters);
+		}
+	}
+}

src/Umbraco.Core/ExpressionHelper.cs

@@ -0,0 +1,306 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// A set of helper methods for dealing with expressions
+	/// </summary>
+	/// <remarks></remarks>
+	internal static class ExpressionHelper
+	{
+		private static readonly ConcurrentDictionary<LambdaExpressionCacheKey, PropertyInfo> PropertyInfoCache = new ConcurrentDictionary<LambdaExpressionCacheKey, PropertyInfo>();
+
+		/// <summary>
+		/// Gets a <see cref="PropertyInfo"/> object from an expression.
+		/// </summary>
+		/// <typeparam name="TSource">The type of the source.</typeparam>
+		/// <typeparam name="TProperty">The type of the property.</typeparam>
+		/// <param name="source">The source.</param>
+		/// <param name="propertyLambda">The property lambda.</param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		public static PropertyInfo GetPropertyInfo<TSource, TProperty>(this TSource source, Expression<Func<TSource, TProperty>> propertyLambda)
+		{
+			return GetPropertyInfo(propertyLambda);
+		}
+
+		/// <summary>
+		/// Gets a <see cref="PropertyInfo"/> object from an expression.
+		/// </summary>
+		/// <typeparam name="TSource">The type of the source.</typeparam>
+		/// <typeparam name="TProperty">The type of the property.</typeparam>
+		/// <param name="propertyLambda">The property lambda.</param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		public static PropertyInfo GetPropertyInfo<TSource, TProperty>(Expression<Func<TSource, TProperty>> propertyLambda)
+		{
+			return PropertyInfoCache.GetOrAdd(
+				new LambdaExpressionCacheKey(propertyLambda),
+				x =>
+					{
+						var type = typeof(TSource);
+
+						var member = propertyLambda.Body as MemberExpression;
+						if (member == null)
+						{
+							if (propertyLambda.Body.GetType().Name == "UnaryExpression")
+							{
+								// The expression might be for some boxing, e.g. representing a value type like HiveId as an object
+								// in which case the expression will be Convert(x.MyProperty)
+								var unary = propertyLambda.Body as UnaryExpression;
+								if (unary != null)
+								{
+									var boxedMember = unary.Operand as MemberExpression;
+									if (boxedMember == null)
+										throw new ArgumentException("The type of property could not be infered, try specifying the type parameters explicitly. This can happen if you have tried to access PropertyInfo where the property's return type is a value type, but the expression is trying to convert it to an object");
+									else member = boxedMember;
+								}
+							}
+							else throw new ArgumentException(string.Format("Expression '{0}' refers to a method, not a property.", propertyLambda));
+						}
+
+
+						var propInfo = member.Member as PropertyInfo;
+						if (propInfo == null)
+							throw new ArgumentException(string.Format(
+								"Expression '{0}' refers to a field, not a property.",
+								propertyLambda));
+
+						if (type != propInfo.ReflectedType &&
+						    !type.IsSubclassOf(propInfo.ReflectedType))
+							throw new ArgumentException(string.Format(
+								"Expresion '{0}' refers to a property that is not from type {1}.",
+								propertyLambda,
+								type));
+
+						return propInfo;
+					});
+		}
+
+		public static IDictionary<string, object> GetMethodParams<T1, T2>(Expression<Func<T1, T2>> fromExpression)
+		{
+			if (fromExpression == null) return null;
+			var body = fromExpression.Body as MethodCallExpression;
+			if (body == null)
+				return new Dictionary<string, object>();
+
+			var rVal = new Dictionary<string, object>();
+			var parameters = body.Method.GetParameters().Select(x => x.Name).ToArray();
+			var i = 0;
+			foreach (var argument in body.Arguments)
+			{
+				var lambda = Expression.Lambda(argument, fromExpression.Parameters);
+				var d = lambda.Compile();
+				var value = d.DynamicInvoke(new object[1]);
+				rVal.Add(parameters[i], value);
+				i++;
+			}
+			return rVal;
+		}
+
+		/// <summary>
+		/// Gets a <see cref="MethodInfo"/> from an <see cref="Expression{Action{T}}"/> provided it refers to a method call.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="fromExpression">From expression.</param>
+		/// <returns>The <see cref="MethodInfo"/> or null if <paramref name="fromExpression"/> is null or cannot be converted to <see cref="MethodCallExpression"/>.</returns>
+		/// <remarks></remarks>
+		public static MethodInfo GetMethodInfo<T>(Expression<Action<T>> fromExpression)
+		{
+			if (fromExpression == null) return null;
+			var body = fromExpression.Body as MethodCallExpression;
+			return body != null ? body.Method : null;
+		}
+
+		/// <summary>
+		/// Gets the method info.
+		/// </summary>
+		/// <typeparam name="TReturn">The return type of the method.</typeparam>
+		/// <param name="fromExpression">From expression.</param>
+		/// <returns></returns>
+		public static MethodInfo GetMethodInfo<TReturn>(Expression<Func<TReturn>> fromExpression)
+		{
+			if (fromExpression == null) return null;
+			var body = fromExpression.Body as MethodCallExpression;
+			return body != null ? body.Method : null;
+		}
+
+		/// <summary>
+		/// Gets the method info.
+		/// </summary>
+		/// <typeparam name="T1">The type of the 1.</typeparam>
+		/// <typeparam name="T2">The type of the 2.</typeparam>
+		/// <param name="fromExpression">From expression.</param>
+		/// <returns></returns>
+		public static MethodInfo GetMethodInfo<T1, T2>(Expression<Func<T1, T2>> fromExpression)
+		{
+			if (fromExpression == null) return null;
+			var body = fromExpression.Body as MethodCallExpression;
+			return body != null ? body.Method : null;
+		}
+
+		/// <summary>
+		/// Gets a <see cref="MethodInfo"/> from an <see cref="Expression"/> provided it refers to a method call.
+		/// </summary>
+		/// <param name="expression">The expression.</param>
+		/// <returns>The <see cref="MethodInfo"/> or null if <paramref name="expression"/> cannot be converted to <see cref="MethodCallExpression"/>.</returns>
+		/// <remarks></remarks>
+		public static MethodInfo GetMethod(Expression expression)
+		{
+			if (expression == null) return null;
+			return IsMethod(expression) ? (((MethodCallExpression)expression).Method) : null;
+		}
+
+		/// <summary>
+		/// Gets a <see cref="MemberInfo"/> from an <see cref="Expression{Func{T, TReturn}}"/> provided it refers to member access.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <typeparam name="TReturn">The type of the return.</typeparam>
+		/// <param name="fromExpression">From expression.</param>
+		/// <returns>The <see cref="MemberInfo"/> or null if <paramref name="fromExpression"/> cannot be converted to <see cref="MemberExpression"/>.</returns>
+		/// <remarks></remarks>
+		public static MemberInfo GetMemberInfo<T, TReturn>(Expression<Func<T, TReturn>> fromExpression)
+		{
+			if (fromExpression == null) return null;
+			var body = fromExpression.Body as MemberExpression;
+			return body != null ? body.Member : null;
+		}
+
+		/// <summary>
+		/// Determines whether the MethodInfo is the same based on signature, not based on the equality operator or HashCode.
+		/// </summary>
+		/// <param name="left">The left.</param>
+		/// <param name="right">The right.</param>
+		/// <returns>
+		///   <c>true</c> if [is method signature equal to] [the specified left]; otherwise, <c>false</c>.
+		/// </returns>
+		/// <remarks>
+		/// This is useful for comparing Expression methods that may contain different generic types
+		/// </remarks>
+		public static bool IsMethodSignatureEqualTo(this MethodInfo left, MethodInfo right)
+		{
+			if (left.Equals(right))
+				return true;
+			if (left.DeclaringType != right.DeclaringType)
+				return false;
+			if (left.Name != right.Name)
+				return false;
+			var leftParams = left.GetParameters();
+			var rightParams = right.GetParameters();
+			if (leftParams.Length != rightParams.Length)
+				return false;
+			for (int i = 0; i < leftParams.Length; i++)
+			{
+				//if they are delegate parameters, then assume they match as they could be anything
+				if (typeof(Delegate).IsAssignableFrom(leftParams[i].ParameterType) && typeof(Delegate).IsAssignableFrom(rightParams[i].ParameterType))
+					continue;
+				//if they are not delegates, then compare the types
+				if (leftParams[i].ParameterType != rightParams[i].ParameterType)
+					return false;
+			}
+			if (left.ReturnType != right.ReturnType)
+				return false;
+			return true;
+		}
+
+		/// <summary>
+		/// Gets a <see cref="MemberInfo"/> from an <see cref="Expression"/> provided it refers to member access.
+		/// </summary>
+		/// <param name="expression">The expression.</param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		public static MemberInfo GetMember(Expression expression)
+		{
+			if (expression == null) return null;
+			return IsMember(expression) ? (((MemberExpression)expression).Member) : null;
+		}
+
+		/// <summary>
+		/// Gets a <see cref="MethodInfo"/> from a <see cref="Delegate"/>
+		/// </summary>
+		/// <param name="fromMethodGroup">From method group.</param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		public static MethodInfo GetStaticMethodInfo(Delegate fromMethodGroup)
+		{
+			if (fromMethodGroup == null) throw new ArgumentNullException("fromMethodGroup");
+
+
+			return fromMethodGroup.Method;
+		}
+
+		///// <summary>
+		///// Formats an unhandled item for representing the expression as a string.
+		///// </summary>
+		///// <typeparam name="T"></typeparam>
+		///// <param name="unhandledItem">The unhandled item.</param>
+		///// <returns></returns>
+		///// <remarks></remarks>
+		//public static string FormatUnhandledItem<T>(T unhandledItem) where T : class
+		//{
+		//    if (unhandledItem == null) throw new ArgumentNullException("unhandledItem");
+
+
+		//    var itemAsExpression = unhandledItem as Expression;
+		//    return itemAsExpression != null
+		//               ? FormattingExpressionTreeVisitor.Format(itemAsExpression)
+		//               : unhandledItem.ToString();
+		//}
+
+		/// <summary>
+		/// Determines whether the specified expression is a method.
+		/// </summary>
+		/// <param name="expression">The expression.</param>
+		/// <returns><c>true</c> if the specified expression is method; otherwise, <c>false</c>.</returns>
+		/// <remarks></remarks>
+		public static bool IsMethod(Expression expression)
+		{
+			return expression != null && typeof(MethodCallExpression).IsAssignableFrom(expression.GetType());
+		}
+
+
+
+
+
+		/// <summary>
+		/// Determines whether the specified expression is a member.
+		/// </summary>
+		/// <param name="expression">The expression.</param>
+		/// <returns><c>true</c> if the specified expression is member; otherwise, <c>false</c>.</returns>
+		/// <remarks></remarks>
+		public static bool IsMember(Expression expression)
+		{
+			return expression != null && typeof(MemberExpression).IsAssignableFrom(expression.GetType());
+		}
+
+		/// <summary>
+		/// Determines whether the specified expression is a constant.
+		/// </summary>
+		/// <param name="expression">The expression.</param>
+		/// <returns><c>true</c> if the specified expression is constant; otherwise, <c>false</c>.</returns>
+		/// <remarks></remarks>
+		public static bool IsConstant(Expression expression)
+		{
+			return expression != null && typeof(ConstantExpression).IsAssignableFrom(expression.GetType());
+		}
+
+		/// <summary>
+		/// Gets the first value from the supplied arguments of an expression, for those arguments that can be cast to <see cref="ConstantExpression"/>.
+		/// </summary>
+		/// <param name="arguments">The arguments.</param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		public static object GetFirstValueFromArguments(IEnumerable<Expression> arguments)
+		{
+			if (arguments == null) return false;
+			return
+				arguments.Where(x => typeof(ConstantExpression).IsAssignableFrom(x.GetType())).Cast
+					<ConstantExpression>().Select(x => x.Value).DefaultIfEmpty(null).FirstOrDefault();
+		}
+	}
+}

src/Umbraco.Core/HashCodeCombiner.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// Used to create a hash code from multiple objects.
+	/// </summary>
+	/// <remarks>
+	/// .Net has a class the same as this: System.Web.Util.HashCodeCombiner and of course it works for all sorts of things
+	/// which we've not included here as we just need a quick easy class for this in order to create a unique
+	/// hash of directories/files to see if they have changed.
+	/// </remarks>
+	internal class HashCodeCombiner
+	{
+		private long _combinedHash = 5381L;
+
+		internal void AddInt(int i)
+		{
+			_combinedHash = ((_combinedHash << 5) + _combinedHash) ^ i;
+		}
+
+		internal void AddObject(object o)
+		{
+			AddInt(o.GetHashCode());
+		}
+
+		internal void AddDateTime(DateTime d)
+		{
+			AddInt(d.GetHashCode());
+		}
+
+		internal void AddCaseInsensitiveString(string s)
+		{
+			if (s != null)
+				AddInt((StringComparer.InvariantCultureIgnoreCase).GetHashCode(s));
+		}
+
+		internal void AddFileSystemItem(FileSystemInfo f)
+		{
+			//if it doesn't exist, don't proceed.
+			if (!f.Exists)
+				return;
+
+			AddCaseInsensitiveString(f.FullName);
+			AddDateTime(f.CreationTimeUtc);
+			AddDateTime(f.LastWriteTimeUtc);
+			
+			//check if it is a file or folder 
+			var fileInfo = f as FileInfo;
+			if (fileInfo != null)
+			{
+				AddInt(fileInfo.Length.GetHashCode());
+			}
+			
+			var dirInfo = f as DirectoryInfo;
+			if (dirInfo != null)
+			{
+				foreach (var d in dirInfo.GetFiles())
+				{
+					AddFile(d);
+				}
+				foreach (var s in dirInfo.GetDirectories())
+				{
+					AddFolder(s);
+				}
+			}
+		}
+
+		internal void AddFile(FileInfo f)
+		{
+			AddFileSystemItem(f);			
+		}
+
+		internal void AddFolder(DirectoryInfo d)
+		{
+			AddFileSystemItem(d);			
+		}
+
+		/// <summary>
+		/// Returns the hex code of the combined hash code
+		/// </summary>
+		/// <returns></returns>
+		internal string GetCombinedHashCode()
+		{
+			return _combinedHash.ToString("x", CultureInfo.InvariantCulture);
+		}
+
+	}
+}

src/Umbraco.Core/IBootManager.cs

@@ -0,0 +1,31 @@
+using System;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	///  A bootstrapper interface for the Umbraco application
+	/// </summary>
+	internal interface IBootManager
+	{
+		/// <summary>
+		/// Fires first in the application startup process before any customizations can occur
+		/// </summary>
+		/// <returns></returns>
+		IBootManager Initialize();
+
+		/// <summary>
+		/// Fires after initialization and calls the callback to allow for customizations to occur
+		/// </summary>
+		/// <param name="afterStartup"></param>
+		/// <returns></returns>
+		IBootManager Startup(Action<ApplicationContext> afterStartup);
+
+		/// <summary>
+		/// Fires after startup and calls the callback once customizations are locked
+		/// </summary>
+		/// <param name="afterComplete"></param>
+		/// <returns></returns>
+		IBootManager Complete(Action<ApplicationContext> afterComplete);
+
+	}
+}

src/Umbraco.Core/IO/FileSystemExtensions.cs

@@ -2,11 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Umbraco.Core.CodeAnnotations;
 
 namespace Umbraco.Core.IO
 {
-    public static class IFileSystemExtensions
+	[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
+    public static class FileSystemExtensions
     {
+		[UmbracoExperimentalFeature("", "Will be declared public after 4.10")]
         internal static long GetSize(this IFileSystem fs, string path)
         {
             var s = fs.OpenFile(path);
@@ -16,6 +19,7 @@ namespace Umbraco.Core.IO
             return size;
         }
 
+		[UmbracoExperimentalFeature("", "Will be declared public after 4.10")]
         internal static void CopyFile(this IFileSystem fs, string path, string newPath)
         {
             fs.AddFile(newPath, fs.OpenFile(path));

src/Umbraco.Core/IO/FileSystemProvider.cs

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Umbraco.Core.CodeAnnotations;
 
 namespace Umbraco.Core.IO
 {
+	[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
     internal class FileSystemProvider
     {
         public const string Media = "media";

src/Umbraco.Core/IO/FileSystemProviderAttribute.cs

@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Umbraco.Core.CodeAnnotations;
 
 namespace Umbraco.Core.IO
 {
-    [AttributeUsage(AttributeTargets.Interface, AllowMultiple = false, Inherited = false)]
+	[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
     internal class FileSystemProviderAttribute : Attribute
     {
         public string Alias { get; set; }

src/Umbraco.Core/IO/FileSystemProviderManager.cs

@@ -1,12 +1,16 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
+using System.Reflection;
 using System.Text;
+using Umbraco.Core.CodeAnnotations;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.IO
 {
+	[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
     internal class FileSystemProviderManager
     {
         private readonly FileSystemProvidersSection _config;
@@ -31,44 +35,85 @@ namespace Umbraco.Core.IO
 
         #endregion
 
+		/// <summary>
+		/// used to cache the lookup of how to construct this object so we don't have to reflect each time.
+		/// </summary>
+		private class ProviderConstructionInfo
+		{
+			public object[] Parameters { get; set; }
+			public ConstructorInfo Constructor { get; set; }
+			public string ProviderAlias { get; set; }
+		}
+
+		private readonly ConcurrentDictionary<string, ProviderConstructionInfo> _providerLookup = new ConcurrentDictionary<string, ProviderConstructionInfo>();
+		private readonly ConcurrentDictionary<Type, string> _wrappedProviderLookup = new ConcurrentDictionary<Type, string>(); 
+
         public IFileSystem GetFileSystemProvider(string alias)
         {
-            var providerConfig = _config.Providers[alias];
-            if(providerConfig == null)
-                throw new ArgumentException(string.Format("No provider found with the alias '{0}'", alias));
+			//either get the constructor info from cache or create it and add to cache
+	        var ctorInfo = _providerLookup.GetOrAdd(alias, s =>
+		        {
+			        var providerConfig = _config.Providers[s];
+			        if (providerConfig == null)
+				        throw new ArgumentException(string.Format("No provider found with the alias '{0}'", s));
 
-            var providerType = Type.GetType(providerConfig.Type);
-            if(providerType == null)
-                throw new InvalidOperationException(string.Format("Could not find type '{0}'", providerConfig.Type));
+			        var providerType = Type.GetType(providerConfig.Type);
+			        if (providerType == null)
+				        throw new InvalidOperationException(string.Format("Could not find type '{0}'", providerConfig.Type));
 
-            if (providerType.IsAssignableFrom(typeof(IFileSystem)))
-                throw new InvalidOperationException(string.Format("The type '{0}' does not implement IFileSystem", providerConfig.Type));
+			        if (providerType.IsAssignableFrom(typeof (IFileSystem)))
+				        throw new InvalidOperationException(string.Format("The type '{0}' does not implement IFileSystem", providerConfig.Type));
 
-            var paramCount = providerConfig.Parameters != null ? providerConfig.Parameters.Count : 0;
-            var constructor = providerType.GetConstructors()
-                .SingleOrDefault(x => x.GetParameters().Count() == paramCount 
-                    && x.GetParameters().All(y => providerConfig.Parameters.AllKeys.Contains(y.Name)));
-            if(constructor == null)
-                throw new InvalidOperationException(string.Format("Could not find constructor for type '{0}' which accepts {1} parameters", providerConfig.Type, paramCount));
+			        var paramCount = providerConfig.Parameters != null ? providerConfig.Parameters.Count : 0;
+			        var constructor = providerType.GetConstructors()
+				        .SingleOrDefault(x => x.GetParameters().Count() == paramCount
+				                              && x.GetParameters().All(y => providerConfig.Parameters.AllKeys.Contains(y.Name)));
+			        if (constructor == null)
+				        throw new InvalidOperationException(string.Format("Could not find constructor for type '{0}' which accepts {1} parameters", providerConfig.Type, paramCount));
 
-            var parameters = new object[paramCount];
-            for(var i = 0; i < paramCount; i++)
-                parameters[i] = providerConfig.Parameters[providerConfig.Parameters.AllKeys[i]].Value;
+			        var parameters = new object[paramCount];
+			        for (var i = 0; i < paramCount; i++)
+				        parameters[i] = providerConfig.Parameters[providerConfig.Parameters.AllKeys[i]].Value;			
 
-            return (IFileSystem) constructor.Invoke(parameters);
+			        //return the new constructor info class to cache so we don't have to do this again.
+			        return new ProviderConstructionInfo()
+				        {
+					        Constructor = constructor,
+					        Parameters = parameters,
+					        ProviderAlias = s
+				        };
+		        });
+
+			var fs = (IFileSystem)ctorInfo.Constructor.Invoke(ctorInfo.Parameters);
+	        return fs;
         }
 
         public TProviderTypeFilter GetFileSystemProvider<TProviderTypeFilter>()
-            where TProviderTypeFilter : class, IFileSystem
+			where TProviderTypeFilter : FileSystemWrapper
         {
-            var attr =
-                (FileSystemProviderAttribute)typeof(TProviderTypeFilter).GetCustomAttributes(typeof(FileSystemProviderAttribute), false).
-                    SingleOrDefault();
+			//get the alias for the type from cache or look it up and add it to the cache, then we don't have to reflect each time
+	        var alias = _wrappedProviderLookup.GetOrAdd(typeof (TProviderTypeFilter), fsType =>
+		        {
+					//validate the ctor
+					var constructor = fsType.GetConstructors()
+						.SingleOrDefault(x =>
+										 x.GetParameters().Count() == 1 && TypeHelper.IsTypeAssignableFrom<IFileSystem>(x.GetParameters().Single().ParameterType));
+					if (constructor == null)
+						throw new InvalidOperationException("The type of " + fsType + " must inherit from FileSystemWrapper and must have a constructor that accepts one parameter of type " + typeof(IFileSystem));
 
-            if (attr == null)
-                throw new InvalidOperationException(string.Format("The provider type filter '{0}' is missing the required FileSystemProviderAttribute", typeof(FileSystemProviderAttribute).FullName));
+					var attr =
+						(FileSystemProviderAttribute)fsType.GetCustomAttributes(typeof(FileSystemProviderAttribute), false).
+							SingleOrDefault();
 
-            return GetFileSystemProvider(attr.Alias).As<TProviderTypeFilter>();
+					if (attr == null)
+						throw new InvalidOperationException(string.Format("The provider type filter '{0}' is missing the required FileSystemProviderAttribute", typeof(FileSystemProviderAttribute).FullName));
+
+			        return attr.Alias;
+		        });
+			
+            var innerFs = GetFileSystemProvider(alias);
+	        var outputFs = Activator.CreateInstance(typeof (TProviderTypeFilter), innerFs);
+	        return (TProviderTypeFilter)outputFs;
         }
     }
 }

src/Umbraco.Core/IO/FileSystemWrapper.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Umbraco.Core.CodeAnnotations;
+
+namespace Umbraco.Core.IO
+{
+	/// <summary>
+	/// All custom file systems that are based upon another IFileSystem should inherit from FileSystemWrapper
+	/// </summary>
+	/// <remarks>
+	/// An IFileSystem is generally used as a base file system, for example like a PhysicalFileSystem or an S3FileSystem.
+	/// Then, other custom file systems are wrapped upon these files systems like MediaFileSystem, etc... All of the custom
+	/// file systems must inherit from FileSystemWrapper.
+	/// 
+	/// This abstract class just wraps the 'real' IFileSystem object passed in to its constructor.
+	/// </remarks>
+	[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
+	internal abstract class FileSystemWrapper : IFileSystem
+	{
+		private readonly IFileSystem _wrapped;
+
+		protected FileSystemWrapper(IFileSystem wrapped)
+		{
+			_wrapped = wrapped;
+		}
+
+		public IEnumerable<string> GetDirectories(string path)
+		{
+			return _wrapped.GetDirectories(path);
+		}
+
+		public void DeleteDirectory(string path)
+		{
+			_wrapped.DeleteDirectory(path);
+		}
+
+		public void DeleteDirectory(string path, bool recursive)
+		{
+			_wrapped.DeleteDirectory(path, recursive);
+		}
+
+		public bool DirectoryExists(string path)
+		{
+			return _wrapped.DirectoryExists(path);
+		}
+
+		public void AddFile(string path, Stream stream)
+		{
+			_wrapped.AddFile(path, stream);
+		}
+
+		public void AddFile(string path, Stream stream, bool overrideIfExists)
+		{
+			_wrapped.AddFile(path, stream, overrideIfExists);
+		}
+
+		public IEnumerable<string> GetFiles(string path)
+		{
+			return _wrapped.GetFiles(path);
+		}
+
+		public IEnumerable<string> GetFiles(string path, string filter)
+		{
+			return _wrapped.GetFiles(path, filter);
+		}
+
+		public Stream OpenFile(string path)
+		{
+			return _wrapped.OpenFile(path);
+		}
+
+		public void DeleteFile(string path)
+		{
+			_wrapped.DeleteFile(path);
+		}
+
+		public bool FileExists(string path)
+		{
+			return _wrapped.FileExists(path);
+		}
+
+		public string GetRelativePath(string fullPathOrUrl)
+		{
+			return _wrapped.GetRelativePath(fullPathOrUrl);
+		}
+
+		public string GetFullPath(string path)
+		{
+			return _wrapped.GetFullPath(path);
+		}
+
+		public string GetUrl(string path)
+		{
+			return _wrapped.GetUrl(path);
+		}
+
+		public DateTimeOffset GetLastModified(string path)
+		{
+			return _wrapped.GetLastModified(path);
+		}
+
+		public DateTimeOffset GetCreated(string path)
+		{
+			return _wrapped.GetCreated(path);
+		}
+	}
+}

src/Umbraco.Core/IO/IFileSystem.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Umbraco.Core.CodeAnnotations;
 
 namespace Umbraco.Core.IO
 {
+	[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
     internal interface IFileSystem
     {
         IEnumerable<string> GetDirectories(string path);

src/Umbraco.Core/IO/IMediaFileSystem.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.IO
-{
-    [FileSystemProvider("media")]
-    internal interface IMediaFileSystem : IFileSystem
-    { }
-}

src/Umbraco.Core/IO/IOHelper.cs

@@ -9,12 +9,14 @@ using System.Configuration;
 using System.Web;
 using System.Text.RegularExpressions;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.IO
 {
-	internal static class IOHelper
+	public static class IOHelper
     {
         private static string _rootDir = "";
+
         // static compiled regex for faster performance
         private readonly static Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
@@ -49,46 +51,33 @@ namespace Umbraco.Core.IO
                 return VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root);
         }
 
-
-        public static string ResolveUrlsFromTextString(string text)
+		[Obsolete("Use Umbraco.Web.Templates.TemplateUtilities.ResolveUrlsFromTextString instead, this method on this class will be removed in future versions")]
+        internal static string ResolveUrlsFromTextString(string text)
         {
             if (UmbracoSettings.ResolveUrlsFromTextString)
-            {
-                var sw = new Stopwatch();
-                sw.Start();
-                Debug.WriteLine("Start: " + sw.ElapsedMilliseconds);
-
-                // find all relative urls (ie. urls that contain ~)
-                var tags =
-                    ResolveUrlPattern.Matches(text);
-                Debug.WriteLine("After regex: " + sw.ElapsedMilliseconds);
-                foreach (Match tag in tags)
-                {
-                    Debug.WriteLine("-- inside regex: " + sw.ElapsedMilliseconds);
-                    string url = "";
-                    if (tag.Groups[1].Success)
-                        url = tag.Groups[1].Value;
-
-                    // The richtext editor inserts a slash in front of the url. That's why we need this little fix
-                    //                if (url.StartsWith("/"))
-                    //                    text = text.Replace(url, ResolveUrl(url.Substring(1)));
-                    //                else
-                    if (!String.IsNullOrEmpty(url))
-                    {
-                        Debug.WriteLine("---- before resolve: " + sw.ElapsedMilliseconds);
-                        string resolvedUrl = (url.Substring(0, 1) == "/") ? ResolveUrl(url.Substring(1)) : ResolveUrl(url);
-                        Debug.WriteLine("---- after resolve: " + sw.ElapsedMilliseconds);
-                        Debug.WriteLine("---- before replace: " + sw.ElapsedMilliseconds);
-                        text = text.Replace(url, resolvedUrl);
-                        Debug.WriteLine("---- after replace: " + sw.ElapsedMilliseconds);
-                    }
-
-                }
-
-                Debug.WriteLine("total: " + sw.ElapsedMilliseconds);
-                sw.Stop();
-				Debug.WriteLine("Resolve Urls", sw.ElapsedMilliseconds.ToString());
+            {				
+				using (var timer = DisposableTimer.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete"))
+				{
+					// find all relative urls (ie. urls that contain ~)
+					var tags = ResolveUrlPattern.Matches(text);
+					LogHelper.Debug(typeof(IOHelper), "After regex: " + timer.Stopwatch.ElapsedMilliseconds + " matched: " + tags.Count);
+					foreach (Match tag in tags)
+					{						
+						string url = "";
+						if (tag.Groups[1].Success)
+							url = tag.Groups[1].Value;
 
+						// The richtext editor inserts a slash in front of the url. That's why we need this little fix
+						//                if (url.StartsWith("/"))
+						//                    text = text.Replace(url, ResolveUrl(url.Substring(1)));
+						//                else
+						if (!String.IsNullOrEmpty(url))
+						{
+							string resolvedUrl = (url.Substring(0, 1) == "/") ? ResolveUrl(url.Substring(1)) : ResolveUrl(url);
+							text = text.Replace(url, resolvedUrl);
+						}
+					}
+				}
             }
             return text;
         }
@@ -96,7 +85,7 @@ namespace Umbraco.Core.IO
         public static string MapPath(string path, bool useHttpContext)
         {
             // Check if the path is already mapped
-            if (path.Length >= 2 && path[1] == Path.VolumeSeparatorChar)
+            if ((path.Length >= 2 && path[1] == Path.VolumeSeparatorChar) || path.StartsWith("\\"))
                 return path;
 
 			// Check that we even have an HttpContext! otherwise things will fail anyways
@@ -128,7 +117,7 @@ namespace Umbraco.Core.IO
         }
 
         //use a tilde character instead of the complete path
-        public static string ReturnPath(string settingsKey, string standardPath, bool useTilde)
+		internal static string ReturnPath(string settingsKey, string standardPath, bool useTilde)
         {
             string retval = ConfigurationManager.AppSettings[settingsKey];
 
@@ -138,21 +127,19 @@ namespace Umbraco.Core.IO
             return retval.TrimEnd('/');
         }
 
-
-        public static string ReturnPath(string settingsKey, string standardPath)
+        internal static string ReturnPath(string settingsKey, string standardPath)
         {
             return ReturnPath(settingsKey, standardPath, false);
 
         }
 
-
         /// <summary>
         /// Validates if the current filepath matches a directory where the user is allowed to edit a file
         /// </summary>
         /// <param name="filePath">filepath </param>
         /// <param name="validDir"></param>
         /// <returns>true if valid, throws a FileSecurityException if not</returns>
-        public static bool ValidateEditPath(string filePath, string validDir)
+        internal static bool ValidateEditPath(string filePath, string validDir)
         {
             if (!filePath.StartsWith(MapPath(SystemDirectories.Root)))
                 filePath = MapPath(filePath);
@@ -165,7 +152,24 @@ namespace Umbraco.Core.IO
             return true;
         }
 
-        public static bool ValidateFileExtension(string filePath, List<string> validFileExtensions)
+        internal static bool ValidateEditPath(string filePath, IEnumerable<string> validDirs)
+        {
+            foreach (var dir in validDirs)
+            {
+                var validDir = dir;
+                if (!filePath.StartsWith(MapPath(SystemDirectories.Root)))
+                    filePath = MapPath(filePath);
+                if (!validDir.StartsWith(MapPath(SystemDirectories.Root)))
+                    validDir = MapPath(validDir);
+
+                if (filePath.StartsWith(validDir))
+                    return true;
+            }
+
+           throw new FileSecurityException(String.Format("The filepath '{0}' is not within an allowed directory for this type of files", filePath.Replace(MapPath(SystemDirectories.Root), "")));
+        }
+
+        internal static bool ValidateFileExtension(string filePath, List<string> validFileExtensions)
         {
             if (!filePath.StartsWith(MapPath(SystemDirectories.Root)))
                 filePath = MapPath(filePath);
@@ -202,5 +206,48 @@ namespace Umbraco.Core.IO
 
         }
 
+        /// <summary>
+        /// Check to see if filename passed has any special chars in it and strips them to create a safe filename.  Used to overcome an issue when Umbraco is used in IE in an intranet environment.
+        /// </summary>
+        /// <param name="filePath">The filename passed to the file handler from the upload field.</param>
+        /// <returns>A safe filename without any path specific chars.</returns>
+        internal static string SafeFileName(string filePath)
+        {
+            if (String.IsNullOrEmpty(filePath))
+                return String.Empty;
+
+            if (!String.IsNullOrWhiteSpace(filePath))
+            {
+                foreach (var character in Path.GetInvalidFileNameChars())
+                {
+                    filePath = filePath.Replace(character, '-');
+                }
+            }
+            else
+            {
+                filePath = String.Empty;
+            }
+
+            // Adapted from: http://stackoverflow.com/a/4827510/5018
+            // Combined both Reserved Characters and Character Data 
+            // from http://en.wikipedia.org/wiki/Percent-encoding
+            var stringBuilder = new StringBuilder();
+
+            const string reservedCharacters = "!*'();:@&=+$,/?%#[]-~{}\"<>\\^`| ";
+
+            foreach (var character in filePath)
+            {
+                if (reservedCharacters.IndexOf(character) == -1)
+                    stringBuilder.Append(character);
+                else
+                    stringBuilder.Append("-");
+            }
+
+            // Remove repeating dashes
+            // From: http://stackoverflow.com/questions/5111967/regex-to-remove-a-specific-repeated-character
+            var reducedString = Regex.Replace(stringBuilder.ToString(), "-+", "-");
+
+            return reducedString;
+        }
     }
 }

src/Umbraco.Core/IO/MediaFileSystem.cs

@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Umbraco.Core.CodeAnnotations;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Core.IO
+{
+	/// <summary>
+	/// A custom file system provider for media
+	/// </summary>
+	[FileSystemProvider("media")]
+	[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
+	internal class MediaFileSystem : FileSystemWrapper
+	{
+		public MediaFileSystem(IFileSystem wrapped)
+			: base(wrapped)
+		{
+		}
+
+		public string GetRelativePath(int propertyId, string fileName)
+		{
+			var seperator = UmbracoSettings.UploadAllowDirectories
+				? Path.DirectorySeparatorChar
+				: '-';
+
+			return propertyId.ToString() + seperator + fileName;
+		}
+
+		public IEnumerable<string> GetThumbnails(string path)
+		{
+			var parentDirectory = System.IO.Path.GetDirectoryName(path);
+			var extension = System.IO.Path.GetExtension(path);
+
+			return GetFiles(parentDirectory)
+				.Where(x => x.StartsWith(path.TrimEnd(extension) + "_thumb"))
+				.ToList();
+		}
+
+		public void DeleteFile(string path, bool deleteThumbnails)
+		{
+			DeleteFile(path);
+
+			if (!deleteThumbnails)
+				return;
+
+			DeleteThumbnails(path);
+		}
+
+		public void DeleteThumbnails(string path)
+		{
+			GetThumbnails(path)
+				.ForEach(DeleteFile);
+		}
+	}
+}

src/Umbraco.Core/IO/MediaFileSystemExtensions.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Core.IO
-{
-    public static class MediaFileSystemExtensions
-    {
-        internal static string GetRelativePath(this IMediaFileSystem fs, int propertyId, string fileName)
-        {
-            var seperator = UmbracoSettings.UploadAllowDirectories
-                ? Path.DirectorySeparatorChar 
-                : '-';
-
-            return propertyId.ToString() + seperator + fileName;
-        }
-
-        internal static IEnumerable<string> GetThumbnails(this IMediaFileSystem fs, string path)
-        {
-            var parentDirectory = System.IO.Path.GetDirectoryName(path);
-            var extension = System.IO.Path.GetExtension(path);
-
-            return fs.GetFiles(parentDirectory)
-                .Where(x => x.StartsWith(path.TrimEnd(extension) + "_thumb"))
-                .ToList();
-        }
-
-        internal static void DeleteFile(this IMediaFileSystem fs, string path, bool deleteThumbnails)
-        {
-            fs.DeleteFile(path);
-
-            if(!deleteThumbnails)
-                return;
-
-            fs.DeleteThumbnails(path);
-        }
-
-        internal static void DeleteThumbnails(this IMediaFileSystem fs, string path)
-        {
-            fs.GetThumbnails(path)
-                .ForEach(fs.DeleteFile);
-        }
-    }
-}

src/Umbraco.Core/IO/PhysicalFileSystem.cs

@@ -1,12 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.Globalization;
+using System.IO; 
 using System.Linq;
-using System.Text;
 using System.Web;
+using Umbraco.Core.CodeAnnotations;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.IO
 {
+	[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
     internal class PhysicalFileSystem : IFileSystem
     {
         private readonly string _rootPath;
@@ -40,9 +43,13 @@ namespace Umbraco.Core.IO
                     return Directory.EnumerateDirectories(path).Select(GetRelativePath);
             }
             catch (UnauthorizedAccessException ex)
-            { }
+            {
+                LogHelper.Error<PhysicalFileSystem>("Not authorized to get directories", ex);
+            }
             catch (DirectoryNotFoundException ex)
-            { }
+            {
+                LogHelper.Error<PhysicalFileSystem>("Directory not found", ex);
+            }
 
             return Enumerable.Empty<string>();
         }
@@ -62,7 +69,9 @@ namespace Umbraco.Core.IO
                 Directory.Delete(GetFullPath(path), recursive);
             }
             catch (DirectoryNotFoundException ex)
-            { }
+            {
+                LogHelper.Error<PhysicalFileSystem>("Directory not found", ex);
+            }
         }
 
         public bool DirectoryExists(string path)
@@ -77,9 +86,7 @@ namespace Umbraco.Core.IO
 
         public void AddFile(string path, Stream stream, bool overrideIfExists)
         {
-            if (FileExists(path) && !overrideIfExists)
-                throw new InvalidOperationException(string.Format("A file at path '{0}' already exists",
-                    path));
+            if (FileExists(path) && !overrideIfExists) throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
 
             EnsureDirectory(Path.GetDirectoryName(path));
 
@@ -105,9 +112,13 @@ namespace Umbraco.Core.IO
                     return Directory.EnumerateFiles(path, filter).Select(GetRelativePath);
             }
             catch (UnauthorizedAccessException ex)
-            { }
+            {
+                LogHelper.Error<PhysicalFileSystem>("Not authorized to get directories", ex);
+            }
             catch (DirectoryNotFoundException ex)
-            { }
+            {
+                LogHelper.Error<PhysicalFileSystem>("Directory not found", ex);
+            }
 
             return Enumerable.Empty<string>();
         }
@@ -127,7 +138,9 @@ namespace Umbraco.Core.IO
                 File.Delete(GetFullPath(path));
             }
             catch (FileNotFoundException ex)
-            { }
+            {
+                LogHelper.Error<PhysicalFileSystem>("File not found", ex);
+            }
         }
 
         public bool FileExists(string path)
@@ -185,7 +198,7 @@ namespace Umbraco.Core.IO
 
         protected string EnsureTrailingSeparator(string path)
         {
-            if (!path.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal))
+            if (!path.EndsWith(Path.DirectorySeparatorChar.ToString(CultureInfo.InvariantCulture), StringComparison.Ordinal))
                 path = path + Path.DirectorySeparatorChar;
 
             return path;

src/Umbraco.Core/IO/SystemDirectories.cs

@@ -10,8 +10,9 @@ using System.IO;
 namespace Umbraco.Core.IO
 {
     //all paths has a starting but no trailing /
-	internal class SystemDirectories
+	public class SystemDirectories
     {
+		//TODO: Why on earth is this even configurable? You cannot change the /Bin folder in ASP.Net
         public static string Bin
         {
             get
@@ -68,6 +69,24 @@ namespace Umbraco.Core.IO
             }
         }
 
+		public static string AppPlugins
+		{
+			get
+			{
+				//NOTE: this is not configurable and shouldn't need to be
+				return "~/App_Plugins";
+			}
+		}
+
+		public static string MvcViews
+		{
+			get
+			{
+				//NOTE: this is not configurable and shouldn't need to be
+				return "~/Views";
+			}
+		}
+
        
         public static string Media
         {
@@ -77,8 +96,9 @@ namespace Umbraco.Core.IO
             }
         }
 
+		//have changed to internal so nobody uses this anymore since this is a new class.
         [Obsolete("Please use MacroScripts instead!", true)]
-        public static string Python
+        internal static string Python
         {
             get
             {

src/Umbraco.Core/IO/SystemFiles.cs

@@ -8,7 +8,7 @@ using System.Web;
 
 namespace Umbraco.Core.IO
 {
-    internal class SystemFiles
+    public class SystemFiles
     {
 
         public static string AccessXml
@@ -96,7 +96,7 @@ namespace Umbraco.Core.IO
         {
             get
             {
-                if (ContentCacheXmlIsEphemeral)
+                if (ContentCacheXmlIsEphemeral && SystemUtilities.GetCurrentTrustLevel() == AspNetHostingPermissionLevel.Unrestricted)
                 {
                     return Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco.config");
                 }
@@ -104,7 +104,7 @@ namespace Umbraco.Core.IO
             }
         }
 
-        public static bool ContentCacheXmlIsEphemeral
+        internal static bool ContentCacheXmlIsEphemeral
         {
             get
             {

src/Umbraco.Core/IThumbnailProvider.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core
-{
-    internal interface IThumbnailProvider
-    {
-        int Priority { get; }
-        bool CanProvideThumbnail(string fileUrl);
-        string GetThumbnailUrl(string fileUrl);
-    }
-}

src/Umbraco.Core/IntExtensions.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace Umbraco.Core
+{
+	public static class IntExtensions
+	{
+		/// <summary>
+		/// Does something 'x' amount of times
+		/// </summary>
+		/// <param name="n"></param>
+		/// <param name="action"></param>
+		public static void Times(this int n, Action<int> action)
+		{
+			for (int i = 0; i < n; i++)
+			{
+				action(i);
+			}
+		}
+	}
+}

src/Umbraco.Core/LambdaExpressionCacheKey.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// Represents a simple <see cref="LambdaExpression"/> in a form which is suitable for using as a dictionary key
+	/// by exposing the return type, argument types and expression string form in a single concatenated string.
+	/// </summary>
+	internal struct LambdaExpressionCacheKey
+	{
+		public LambdaExpressionCacheKey(string returnType, string expression, params string[] argTypes)
+		{
+			ReturnType = returnType;
+			ExpressionAsString = expression;
+			ArgTypes = new HashSet<string>(argTypes);
+			_toString = null;
+		}
+
+		public LambdaExpressionCacheKey(LambdaExpression obj)
+		{
+			ReturnType = obj.ReturnType.FullName;
+			ExpressionAsString = obj.ToString();
+			ArgTypes = new HashSet<string>(obj.Parameters.Select(x => x.Type.FullName));
+			_toString = null;
+		}
+
+		/// <summary>
+		/// The argument type names of the <see cref="LambdaExpression"/>
+		/// </summary>
+		public readonly HashSet<string> ArgTypes;
+
+		/// <summary>
+		/// The return type of the <see cref="LambdaExpression"/>
+		/// </summary>
+		public readonly string ReturnType;
+
+		/// <summary>
+		/// The original string representation of the <see cref="LambdaExpression"/>
+		/// </summary>
+		public readonly string ExpressionAsString;
+
+		private string _toString;
+
+		/// <summary>
+		/// Returns a <see cref="System.String"/> that represents this instance.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="System.String"/> that represents this instance.
+		/// </returns>
+		public override string ToString()
+		{
+			return _toString ?? (_toString = String.Concat(String.Join("|", ArgTypes), ",", ReturnType, ",", ExpressionAsString));
+		}
+
+		/// <summary>
+		/// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+		/// </summary>
+		/// <param name="obj">The <see cref="System.Object"/> to compare with this instance.</param>
+		/// <returns>
+		/// 	<c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+		/// </returns>
+		public override bool Equals(object obj)
+		{
+			if (ReferenceEquals(obj, null)) return false;
+			var casted = (LambdaExpressionCacheKey)obj;
+			return casted.ToString() == ToString();
+		}
+
+		/// <summary>
+		/// Returns a hash code for this instance.
+		/// </summary>
+		/// <returns>
+		/// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+		/// </returns>
+		public override int GetHashCode()
+		{
+			return ToString().GetHashCode();
+		}
+	}
+}

src/Umbraco.Core/Logging/AsynchronousRollingFileAppender.cs

@@ -0,0 +1,271 @@
+using System;
+using System.Security.Principal;
+using System.Threading;
+using System.Threading.Tasks;
+using log4net.Appender;
+using log4net.Core;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+	/// <summary>
+	/// Based on code by Chris Haines http://cjbhaines.wordpress.com/2012/02/13/asynchronous-log4net-appenders/
+	/// </summary>
+	public class AsynchronousRollingFileAppender : RollingFileAppender
+	{
+		private readonly ManualResetEvent _manualResetEvent;
+		private int _bufferOverflowCounter;
+		private bool _forceStop;
+		private bool _hasFinished;
+		private DateTime _lastLoggedBufferOverflow;
+		private bool _logBufferOverflow;
+		private RingBuffer<LoggingEvent> _pendingAppends;
+		private int _queueSizeLimit = 1000;
+		private bool _shuttingDown;
+
+		public AsynchronousRollingFileAppender()
+		{
+			_manualResetEvent = new ManualResetEvent(false);
+		}
+
+		public int QueueSizeLimit
+		{
+			get { return _queueSizeLimit; }
+			set { _queueSizeLimit = value; }
+		}
+
+		public override void ActivateOptions()
+		{
+			base.ActivateOptions();
+			_pendingAppends = new RingBuffer<LoggingEvent>(QueueSizeLimit);
+			_pendingAppends.BufferOverflow += OnBufferOverflow;
+			StartAppendTask();
+		}
+
+		protected override void Append(LoggingEvent[] loggingEvents)
+		{
+			Array.ForEach(loggingEvents, Append);
+		}
+
+		protected override void Append(LoggingEvent loggingEvent)
+		{
+			if (FilterEvent(loggingEvent))
+			{
+				_pendingAppends.Enqueue(loggingEvent);
+			}
+		}
+
+		protected override void OnClose()
+		{
+			_shuttingDown = true;
+			_manualResetEvent.WaitOne(TimeSpan.FromSeconds(5));
+
+			if (!_hasFinished)
+			{
+				_forceStop = true;
+				var windowsIdentity = WindowsIdentity.GetCurrent();
+				base.Append(new LoggingEvent(new LoggingEventData
+					{
+						Level = Level.Error,
+						Message =
+							"Unable to clear out the AsynchronousRollingFileAppender buffer in the allotted time, forcing a shutdown",
+						TimeStamp = DateTime.UtcNow,
+						Identity = "",
+						ExceptionString = "",
+						UserName = windowsIdentity != null ? windowsIdentity.Name : "",
+						Domain = AppDomain.CurrentDomain.FriendlyName,
+						ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+						LocationInfo =
+							new LocationInfo(this.GetType().Name, "OnClose", "AsynchronousRollingFileAppender.cs", "59"),
+						LoggerName = this.GetType().FullName,
+						Properties = new PropertiesDictionary(),
+					})
+					);
+			}
+
+			base.OnClose();
+		}
+
+		private void StartAppendTask()
+		{
+			if (!_shuttingDown)
+			{
+				Task appendTask = new Task(AppendLoggingEvents, TaskCreationOptions.LongRunning);
+				appendTask.LogErrors(LogAppenderError).ContinueWith(x => StartAppendTask()).LogErrors(LogAppenderError);
+				appendTask.Start();
+			}
+		}
+
+		private void LogAppenderError(string logMessage, Exception exception)
+		{
+			var windowsIdentity = WindowsIdentity.GetCurrent();
+			base.Append(new LoggingEvent(new LoggingEventData
+				{
+					Level = Level.Error,
+					Message = "Appender exception: " + logMessage,
+					TimeStamp = DateTime.UtcNow,
+					Identity = "",
+					ExceptionString = exception.ToString(),
+					UserName = windowsIdentity != null ? windowsIdentity.Name : "",
+					Domain = AppDomain.CurrentDomain.FriendlyName,
+					ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+					LocationInfo =
+						new LocationInfo(this.GetType().Name,
+						                 "LogAppenderError",
+						                 "AsynchronousRollingFileAppender.cs",
+						                 "100"),
+					LoggerName = this.GetType().FullName,
+					Properties = new PropertiesDictionary(),
+				}));
+		}
+
+		private void AppendLoggingEvents()
+		{
+			LoggingEvent loggingEventToAppend;
+			while (!_shuttingDown)
+			{
+				if (_logBufferOverflow)
+				{
+					LogBufferOverflowError();
+					_logBufferOverflow = false;
+					_bufferOverflowCounter = 0;
+					_lastLoggedBufferOverflow = DateTime.UtcNow;
+				}
+
+				while (!_pendingAppends.TryDequeue(out loggingEventToAppend))
+				{
+					Thread.Sleep(10);
+					if (_shuttingDown)
+					{
+						break;
+					}
+				}
+				if (loggingEventToAppend == null)
+				{
+					continue;
+				}
+
+				try
+				{
+					base.Append(loggingEventToAppend);
+				}
+				catch
+				{
+				}
+			}
+
+			while (_pendingAppends.TryDequeue(out loggingEventToAppend) && !_forceStop)
+			{
+				try
+				{
+					base.Append(loggingEventToAppend);
+				}
+				catch
+				{
+				}
+			}
+			_hasFinished = true;
+			_manualResetEvent.Set();
+		}
+
+		private void LogBufferOverflowError()
+		{
+			var windowsIdentity = WindowsIdentity.GetCurrent();
+			base.Append(new LoggingEvent(new LoggingEventData
+				{
+					Level = Level.Error,
+					Message =
+						string.Format(
+							"Buffer overflow. {0} logging events have been lost in the last 30 seconds. [QueueSizeLimit: {1}]",
+							_bufferOverflowCounter,
+							QueueSizeLimit),
+					TimeStamp = DateTime.UtcNow,
+					Identity = "",
+					ExceptionString = "",
+					UserName = windowsIdentity != null ? windowsIdentity.Name : "",
+					Domain = AppDomain.CurrentDomain.FriendlyName,
+					ThreadName = Thread.CurrentThread.ManagedThreadId.ToString(),
+					LocationInfo =
+						new LocationInfo(this.GetType().Name,
+						                 "LogBufferOverflowError",
+						                 "AsynchronousRollingFileAppender.cs",
+						                 "172"),
+					LoggerName = this.GetType().FullName,
+					Properties = new PropertiesDictionary(),
+				}));
+		}
+
+		private void OnBufferOverflow(object sender, EventArgs eventArgs)
+		{
+			_bufferOverflowCounter++;
+			if (_logBufferOverflow == false)
+			{
+				if (_lastLoggedBufferOverflow < DateTime.UtcNow.AddSeconds(-30))
+				{
+					_logBufferOverflow = true;
+				}
+			}
+		}
+
+		private class RingBuffer<T>
+		{
+			private readonly object _lockObject = new object();
+			private readonly T[] _buffer;
+			private readonly int _size;
+			private int _readIndex = 0;
+			private int _writeIndex = 0;
+			private bool _bufferFull = false;
+
+			public event Action<object, EventArgs> BufferOverflow;
+
+			public RingBuffer(int size)
+			{
+				this._size = size;
+				_buffer = new T[size];
+			}
+
+			public void Enqueue(T item)
+			{
+				lock (_lockObject)
+				{
+					_buffer[_writeIndex] = item;
+					_writeIndex = (++_writeIndex) % _size;
+					if (_bufferFull)
+					{
+						if (BufferOverflow != null)
+						{
+							BufferOverflow(this, EventArgs.Empty);
+						}
+						_readIndex = _writeIndex;
+					}
+					else if (_writeIndex == _readIndex)
+					{
+						_bufferFull = true;
+					}
+				}
+			}
+
+			public bool TryDequeue(out T ret)
+			{
+				if (_readIndex == _writeIndex && !_bufferFull)
+				{
+					ret = default(T);
+					return false;
+				}
+				lock (_lockObject)
+				{
+					if (_readIndex == _writeIndex && !_bufferFull)
+					{
+						ret = default(T);
+						return false;
+					}
+
+					ret = _buffer[_readIndex];
+					_readIndex = (++_readIndex) % _size;
+					_bufferFull = false;
+					return true;
+				}
+			}
+		}
+	}
+}

src/Umbraco.Core/Logging/LogHelper.cs

@@ -0,0 +1,261 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Web;
+using log4net;
+
+namespace Umbraco.Core.Logging
+{
+	///<summary>
+	/// Used for logging
+	///</summary>
+	internal static class LogHelper
+	{
+		///<summary>
+		/// Returns a logger for the type specified
+		///</summary>
+		///<typeparam name="T"></typeparam>
+		///<returns></returns>
+		public static ILog LoggerFor<T>()
+		{
+			return LogManager.GetLogger(typeof(T));
+		}
+
+		/// <summary>
+		/// Returns a logger for the object's type
+		/// </summary>
+		/// <param name="getTypeFromInstance"></param>
+		/// <returns></returns>
+		public static ILog LoggerFor(object getTypeFromInstance)
+		{
+			if (getTypeFromInstance == null) throw new ArgumentNullException("getTypeFromInstance");
+			
+			return LogManager.GetLogger(getTypeFromInstance.GetType());
+		}
+
+		/// <summary>
+		/// Useful if the logger itself is running on another thread
+		/// </summary>
+		/// <param name="generateMessageFormat"></param>
+		/// <returns></returns>
+		private static string PrefixThreadId(string generateMessageFormat)
+		{
+			return "[Thread " + Thread.CurrentThread.ManagedThreadId + "] " + generateMessageFormat;
+		}
+
+		#region Error
+		/// <summary>
+		/// Adds an error log
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="message"></param>
+		/// <param name="exception"></param>
+		public static void Error<T>(string message, Exception exception)
+		{
+			var logger = LoggerFor<T>();
+			if (logger != null)
+				logger.Error(PrefixThreadId(message), exception);
+		}
+		#endregion
+
+		#region Warn		
+
+		public static void Warn(Type callingType, string message, params Func<object>[] formatItems)
+		{
+			var logger = LogManager.GetLogger(callingType);
+			if (logger == null || !logger.IsWarnEnabled) return;
+			logger.WarnFormat(PrefixThreadId(message), formatItems.Select(x => x.Invoke()).ToArray());
+		}
+
+		public static void Warn(Type callingType, string message, bool showHttpTrace, params Func<object>[] formatItems)
+		{
+			Mandate.ParameterNotNull(callingType, "callingType");
+			Mandate.ParameterNotNullOrEmpty(message, "message");
+
+			if (showHttpTrace && HttpContext.Current != null)
+			{
+				HttpContext.Current.Trace.Warn(callingType.Name, string.Format(message, formatItems.Select(x => x.Invoke()).ToArray()));
+			}	
+
+			var logger = LogManager.GetLogger(callingType);
+			if (logger == null || !logger.IsWarnEnabled) return;
+			logger.WarnFormat(PrefixThreadId(message), formatItems.Select(x => x.Invoke()).ToArray());
+
+		}
+
+		public static void WarnWithException(Type callingType, string message, Exception e, params Func<object>[] formatItems)
+		{
+			WarnWithException(callingType, message, false, e, formatItems);
+		}
+
+		public static void WarnWithException(Type callingType, string message, bool showHttpTrace, Exception e, params Func<object>[] formatItems)
+		{
+			Mandate.ParameterNotNull(e, "e");
+			Mandate.ParameterNotNull(callingType, "callingType");
+			Mandate.ParameterNotNullOrEmpty(message, "message");
+
+			if (showHttpTrace && HttpContext.Current != null)
+			{
+				HttpContext.Current.Trace.Warn(
+					callingType.Name,
+					string.Format(message, formatItems.Select(x => x.Invoke()).ToArray()), 
+					e);
+			}
+
+			var logger = LogManager.GetLogger(callingType);
+			if (logger == null || !logger.IsWarnEnabled) return;
+			var executedParams = formatItems.Select(x => x.Invoke()).ToArray();
+			logger.WarnFormat(PrefixThreadId(message) + ". Exception: " + e, executedParams);				
+		} 
+
+		/// <summary>
+		/// Adds a warn log
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="message"></param>
+		/// <param name="formatItems"></param>
+		public static void Warn<T>(string message, params Func<object>[] formatItems)
+		{
+			Warn(typeof(T), message, formatItems);
+		}
+
+		public static void Warn<T>(string message, bool showHttpTrace, params Func<object>[] formatItems)
+		{
+			Warn(typeof(T), message, showHttpTrace, formatItems);
+		}
+
+		public static void WarnWithException<T>(string message, Exception e, params Func<object>[] formatItems)
+		{
+			WarnWithException(typeof(T), message, e, formatItems);
+		}
+		public static void WarnWithException<T>(string message, bool showHttpTrace, Exception e, params Func<object>[] formatItems)
+		{
+			WarnWithException(typeof(T), message, showHttpTrace, e, formatItems);
+		} 
+
+		#endregion
+
+		#region Info
+		/// <summary>
+		/// Traces a message, only generating the message if tracing is actually enabled. Use this method to avoid calling any long-running methods such as "ToDebugString" if logging is disabled.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="generateMessage">The delegate to generate a message.</param>
+		/// <remarks></remarks>
+		public static void Info<T>(Func<string> generateMessage)
+		{
+			Info(typeof(T), generateMessage);
+		}
+
+		/// <summary>
+		/// Traces if tracing is enabled.
+		/// </summary>
+		/// <param name="callingType"></param>
+		/// <param name="generateMessage"></param>
+		public static void Info(Type callingType, Func<string> generateMessage)
+		{
+			var logger = LogManager.GetLogger(callingType);
+			if (logger == null || !logger.IsInfoEnabled) return;
+			logger.Info(PrefixThreadId(generateMessage.Invoke()));
+		}
+
+		/// <summary>
+		/// Traces if tracing is enabled.
+		/// </summary>
+		/// <param name="type">The type for the logging namespace.</param>
+		/// <param name="generateMessageFormat">The message format.</param>
+		/// <param name="formatItems">The format items.</param>
+		public static void Info(Type type, string generateMessageFormat, params Func<object>[] formatItems)
+		{
+			var logger = LogManager.GetLogger(type);
+			if (logger == null || !logger.IsInfoEnabled) return;
+			var executedParams = formatItems.Select(x => x.Invoke()).ToArray();
+			logger.InfoFormat(PrefixThreadId(generateMessageFormat), executedParams);
+		}
+
+		/// <summary>
+		/// Traces a message, only generating the message if tracing is actually enabled. Use this method to avoid calling any long-running methods such as "ToDebugString" if logging is disabled.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="generateMessageFormat">The generate message format.</param>
+		/// <param name="formatItems">The format items.</param>
+		/// <remarks></remarks>
+		public static void Info<T>(string generateMessageFormat, params Func<object>[] formatItems)
+		{
+			Info(typeof(T), generateMessageFormat, formatItems);
+		} 
+		#endregion
+
+		#region Debug
+		/// <summary>
+		/// Debugs a message, only generating the message if tracing is actually enabled. Use this method to avoid calling any long-running methods such as "ToDebugString" if logging is disabled.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="generateMessage">The delegate to generate a message.</param>
+		/// <remarks></remarks>
+		public static void Debug<T>(Func<string> generateMessage)
+		{
+			Debug(typeof(T), generateMessage);
+		}
+
+		/// <summary>
+		/// Debugs if tracing is enabled.
+		/// </summary>
+		/// <param name="callingType"></param>
+		/// <param name="generateMessage"></param>
+		public static void Debug(Type callingType, Func<string> generateMessage)
+		{
+			var logger = LogManager.GetLogger(callingType);
+			if (logger == null || !logger.IsDebugEnabled) return;
+			logger.Debug(PrefixThreadId(generateMessage.Invoke()));
+		}
+
+		/// <summary>
+		/// Debugs if tracing is enabled.
+		/// </summary>
+		/// <param name="type">The type for the logging namespace.</param>
+		/// <param name="generateMessageFormat">The message format.</param>
+		/// <param name="formatItems">The format items.</param>
+		public static void Debug(Type type, string generateMessageFormat, params Func<object>[] formatItems)
+		{
+			var logger = LogManager.GetLogger(type);
+			if (logger == null || !logger.IsDebugEnabled) return;
+			var executedParams = formatItems.Select(x => x.Invoke()).ToArray();
+			logger.DebugFormat(PrefixThreadId(generateMessageFormat), executedParams);
+		}
+
+		/// <summary>
+		/// Debugs a message, only generating the message if debug is actually enabled. Use this method to avoid calling any long-running methods such as "ToDebugString" if logging is disabled.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="generateMessageFormat">The generate message format.</param>
+		/// <param name="formatItems">The format items.</param>
+		/// <remarks></remarks>
+		public static void Debug<T>(string generateMessageFormat, params Func<object>[] formatItems)
+		{
+			Debug(typeof(T), generateMessageFormat, formatItems);
+		}
+
+		/// <summary>
+		/// Debugs a message and also writes to the TraceContext specified, useful for when you would like the debug
+		/// output also displayed in the Http trace output.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="generateMessageFormat"></param>
+		/// <param name="showHttpTrace"></param>
+		/// <param name="formatItems"></param>
+		public static void Debug<T>(string generateMessageFormat, bool showHttpTrace, params Func<object>[] formatItems)
+		{
+			if (showHttpTrace && HttpContext.Current != null)
+			{
+				HttpContext.Current.Trace.Write(
+					typeof(T).Name,
+					string.Format(generateMessageFormat, formatItems.Select(x => x()).ToArray()));	
+			}			
+			Debug(typeof(T), generateMessageFormat, formatItems);
+		}
+
+		#endregion
+		
+	}
+}

src/Umbraco.Core/Logging/LoggingTaskExtension.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Logging
+{
+	internal static class LoggingTaskExtension
+	{
+		/// <summary>
+		///     This task shouldn't be waited on (as it's not guaranteed to run), and you shouldn't wait on the parent task either (because it might throw an 
+		///     exception that doesn't get handled). If you want to be waiting on something, use LogErrorsWaitable instead.
+		/// 
+		///     None of these methods are suitable for tasks that return a value. If you're wanting a result, you should probably be handling
+		///     errors yourself.
+		/// </summary>
+		public static Task LogErrors(this Task task, Action<string, Exception> logMethod)
+		{
+			return task.ContinueWith(t => LogErrorsInner(t, logMethod), TaskContinuationOptions.OnlyOnFaulted);
+		}
+
+		/// <summary>
+		///     This task can be waited on (as it's guaranteed to run), and you should wait on this rather than the parent task. Because it's
+		///     guaranteed to run, it may be slower than using LogErrors, and you should consider using that method if you don't want to wait.
+		/// 
+		///     None of these methods are suitable for tasks that return a value. If you're wanting a result, you should probably be handling
+		///     errors yourself.
+		/// </summary>
+		public static Task LogErrorsWaitable(this Task task, Action<string, Exception> logMethod)
+		{
+			return task.ContinueWith(t => LogErrorsInner(t, logMethod));
+		}
+
+		private static void LogErrorsInner(Task task, Action<string, Exception> logAction)
+		{
+			if (task.Exception != null)
+			{
+				logAction("Aggregate Exception with " + task.Exception.InnerExceptions.Count + " inner exceptions: ", task.Exception);
+				foreach (var innerException in task.Exception.InnerExceptions)
+				{
+					logAction("Inner exception from aggregate exception: ", innerException);
+				}
+			}
+		}
+	}
+}

src/Umbraco.Core/Macros/MacroTagParser.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Umbraco.Core.Macros
+{
+	/// <summary>
+	/// Parses the macro syntax in a string and renders out it's contents
+	/// </summary>
+	internal class MacroTagParser
+	{
+		/// <summary>
+		/// This will accept a text block and seach/parse it for macro markup.
+		/// When either a text block or a a macro is found, it will call the callback method.
+		/// </summary>
+		/// <param name="text"> </param>
+		/// <param name="textFoundCallback"></param>
+		/// <param name="macroFoundCallback"></param>
+		/// <returns></returns>
+		/// <remarks>
+		/// This method  simply parses the macro contents, it does not create a string or result, 
+		/// this is up to the developer calling this method to implement this with the callbacks.
+		/// </remarks>
+		internal static void ParseMacros(
+			string text,
+			Action<string> textFoundCallback, 
+			Action<string, Dictionary<string, string>> macroFoundCallback )
+		{
+			if (textFoundCallback == null) throw new ArgumentNullException("textFoundCallback");
+			if (macroFoundCallback == null) throw new ArgumentNullException("macroFoundCallback");
+
+			string elementText = text;
+
+			var fieldResult = new StringBuilder(elementText);
+
+			//NOTE: This is legacy code, this is definitely not the correct way to do a while loop! :)
+			var stop = false;
+			while (!stop)
+			{
+				var tagIndex = fieldResult.ToString().ToLower().IndexOf("<?umbraco");
+				if (tagIndex < 0)
+					tagIndex = fieldResult.ToString().ToLower().IndexOf("<umbraco:macro");
+				if (tagIndex > -1)
+				{
+					var tempElementContent = "";
+
+					//text block found, call the call back method
+					textFoundCallback(fieldResult.ToString().Substring(0, tagIndex));
+
+					fieldResult.Remove(0, tagIndex);
+
+					var tag = fieldResult.ToString().Substring(0, fieldResult.ToString().IndexOf(">") + 1);
+					var attributes = XmlHelper.GetAttributesFromElement(tag);
+
+					// Check whether it's a single tag (<?.../>) or a tag with children (<?..>...</?...>)
+					if (tag.Substring(tag.Length - 2, 1) != "/" && tag.IndexOf(" ") > -1)
+					{
+						String closingTag = "</" + (tag.Substring(1, tag.IndexOf(" ") - 1)) + ">";
+						// Tag with children are only used when a macro is inserted by the umbraco-editor, in the
+						// following format: "<?UMBRACO_MACRO ...><IMG SRC="..."..></?UMBRACO_MACRO>", so we
+						// need to delete extra information inserted which is the image-tag and the closing
+						// umbraco_macro tag
+						if (fieldResult.ToString().IndexOf(closingTag) > -1)
+						{
+							fieldResult.Remove(0, fieldResult.ToString().IndexOf(closingTag));
+						}
+					}
+
+				    var macroAlias = attributes.ContainsKey("macroalias") ? attributes["macroalias"] : attributes["alias"];
+
+					//call the callback now that we have the macro parsed
+					macroFoundCallback(macroAlias, attributes);
+
+					fieldResult.Remove(0, fieldResult.ToString().IndexOf(">") + 1);
+					fieldResult.Insert(0, tempElementContent);
+				}
+				else
+				{
+					//text block found, call the call back method
+					textFoundCallback(fieldResult.ToString());
+
+					stop = true; //break;
+				}
+			}
+		}
+	}
+}

src/Umbraco.Core/Macros/PersistableMacroProperty.cs

@@ -1,10 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections;
 
-namespace umbraco.editorControls.macrocontainer
+namespace Umbraco.Core.Macros
 {
+	/// <summary>
+	/// NOTE: This is legacy code, might require a cleanup
+	/// </summary>
     [Serializable]
     internal class PersistableMacroProperty
     {

src/Umbraco.Core/Mandate.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core
+{
+	/// <summary>
+	/// Helper class for mandating values, for example on method parameters.
+	/// </summary>
+	internal static class Mandate
+	{
+		/// <summary>
+		/// Mandates that the specified parameter is not null.
+		/// </summary>
+		/// <param name="value">The value.</param>
+		/// <param name="paramName">Name of the param.</param>
+		/// <exception cref="ArgumentNullException">If <paramref name="value"/> is null.</exception>
+		public static void ParameterNotNull<T>(T value, string paramName) where T : class
+		{
+			That(value != null, () => new ArgumentNullException(paramName));
+		}
+
+
+		/// <summary>
+		/// Mandates that the specified parameter is not null.
+		/// </summary>
+		/// <param name="value">The value.</param>
+		/// <param name="paramName">Name of the param.</param>
+		/// <exception cref="ArgumentNullException">If <paramref name="value"/> is null or whitespace.</exception>
+		public static void ParameterNotNullOrEmpty(string value, string paramName)
+		{
+			That(!string.IsNullOrWhiteSpace(value), () => new ArgumentNullException(paramName));
+		}
+
+		/// <summary>
+		/// Mandates that the specified sequence is not null and has at least one element.
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="sequence">The sequence.</param>
+		/// <param name="paramName">Name of the param.</param>
+		public static void ParameterNotNullOrEmpty<T>(IEnumerable<T> sequence, string paramName)
+		{
+			ParameterNotNull(sequence, paramName);
+			ParameterCondition(sequence.Any(), paramName);
+		}
+
+
+		/// <summary>
+		/// Mandates that the specified parameter matches the condition.
+		/// </summary>
+		/// <param name="condition">The condition to check.</param>
+		/// <param name="paramName">Name of the param.</param>
+		/// <exception cref="ArgumentException">If the condition is false.</exception>
+		public static void ParameterCondition(bool condition, string paramName)
+		{
+			ParameterCondition(condition, paramName, (string)null);
+		}
+
+		/// <summary>
+		/// Mandates that the specified parameter matches the condition.
+		/// </summary>
+		/// <param name="condition">The condition to check.</param>
+		/// <param name="paramName">Name of the param.</param>
+		/// <param name="message">The message.</param>
+		/// <exception cref="ArgumentException">If the condition is false.</exception>
+		public static void ParameterCondition(bool condition, string paramName, string message)
+		{
+			// Warning: don't make this method have an optional message parameter (removing the other ParameterCondition overload) as it will
+			// make binaries compiled against previous Framework libs incompatible unneccesarily
+			message = message ?? "A parameter passed into a method was not a valid value";
+			That(condition, () => new ArgumentException(message, paramName));
+		}
+
+		/// <summary>
+		/// Mandates that the specified condition is true, otherwise throws an exception specified in <typeparamref name="TException"/>.
+		/// </summary>
+		/// <typeparam name="TException">The type of the exception.</typeparam>
+		/// <param name="condition">if set to <c>true</c>, throws exception <typeparamref name="TException"/>.</param>
+		/// <exception cref="Exception">An exception of type <typeparamref name="TException"/> is raised if the condition is false.</exception>
+		public static void That<TException>(bool condition) where TException : Exception, new()
+		{
+			if (!condition)
+				throw ActivatorHelper.CreateInstance<TException>();
+		}
+
+		/// <summary>
+		/// Mandates that the specified condition is true, otherwise throws an exception specified in <typeparamref name="TException"/>.
+		/// </summary>
+		/// <typeparam name="TException">The type of the exception.</typeparam>
+		/// <param name="condition">if set to <c>true</c>, throws exception <typeparamref name="TException"/>.</param>
+		/// <param name="defer">Deffered expression to call if the exception should be raised.</param>
+		/// <exception cref="Exception">An exception of type <typeparamref name="TException"/> is raised if the condition is false.</exception>
+		public static void That<TException>(bool condition, Func<TException> defer) where TException : Exception, new()
+		{
+			if (!condition)
+			{
+				throw defer.Invoke(); 
+			}
+
+			// Here is an example of how this method is actually called
+			//object myParam = null;
+			//Mandate.That(myParam != null,
+			//     textManager => new ArgumentNullException(textManager.Get("blah", new {User = "blah"})));
+		}
+	}
+}

src/Umbraco.Core/Media/IImageUrlProvider.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Media
+{
+    public interface IImageUrlProvider
+    {
+        string Name { get; }
+        string GetImageUrlFromMedia(int mediaId, IDictionary<string, string> parameters);
+        string GetImageUrlFromFileName(string specifiedSrc, IDictionary<string, string> parameters);
+    }
+}

src/Umbraco.Core/Media/IThumbnailProvider.cs

@@ -0,0 +1,9 @@
+namespace Umbraco.Core.Media
+{
+	public interface IThumbnailProvider
+    {
+        bool CanProvideThumbnail(string fileUrl);
+        string GetThumbnailUrl(string fileUrl);
+    }
+
+}