reverts IQuery

U4-4249 - PetaPocoExtensions CreateTable doesn't recreate the table

.gitignore

@@ -0,0 +1,88 @@
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+[Bb]in
+[Db]ebug*/
+obj/
+[Rr]elease*/
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+*.suo
+[sS]ource
+[sS]andbox
+umbraco.config
+*.vs10x
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+src/Umbraco.Web.UI/[Cc]ss/*
+src/Umbraco.Web.UI/App_Code/*
+src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Tests/App_Data/*
+src/Umbraco.Web.UI/[Mm]edia/*
+src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
+src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
+src/Umbraco.Web.UI/[Xx]slt/*
+src/Umbraco.Web.UI/[Ii]mages/*
+src/Umbraco.Web.UI/[Ss]cripts/*
+src/Umbraco.Web.UI/Web.*.config.transformed
+
+umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
+umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+_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/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+webpihash.txt
+
+node_modules
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+build/_BuildOutput/
+tools/NDepend/
+src/*.vspx
+src/*.psess
+NDependOut/*
+*.ndproj
+QueryResult.htm
+*.ndproj
+src/Umbraco.Tests/Views/web.config

.hgignore

@@ -1,70 +0,0 @@
-syntax: regexp
-^src/packages/(?!repositories.config$)
-web.Template.[a-zA-Z0-9]*.Debug.config
-
-syntax: glob
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-[Bb]in
-[Db]ebug*/
-obj/
-[Rr]elease*/
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-*.suo
-[sS]ource
-[sS]andbox
-umbraco.config
-*.vs10x
-App_Data\TEMP\*
-umbraco\presentation\umbraco\plugins\*
-umbraco\presentation\usercontrols\*
-umbraco\presentation\scripts\*
-umbraco\presentation\fonts\*
-umbraco\presentation\css\*
-
-src\Umbraco.Web.UI\[Cc]ss\*
-src\Umbraco.Web.UI\App_Code\*
-src\Umbraco.Web.UI\App_Data\*
-src\Umbraco.Tests\App_Data\*
-src\Umbraco.Web.UI\[Mm]edia\*
-src\Umbraco.Web.UI\[Mm]aster[Pp]ages\*
-src\Umbraco.Web.UI\[Mm]acro[Ss]cripts\*
-src\Umbraco.Web.UI\[Xx]slt\*
-src\Umbraco.Web.UI\[Ii]mages\*
-src\Umbraco.Web.UI\[Ss]cripts\*
-src\Umbraco.Web.UI\Web.*.config.transformed
-
-umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx
-umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx
-_BuildOutput/*
-*.ncrunchsolution
-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/packages/
-
-src\Umbraco.Web.UI\[W]eb.config
-*.transformed

.hgtags

@@ -1,35 +0,0 @@
-d0aba247db91d1b70c39c6397b965ca370a67497 Sprint-Juno-A
-0b8f67be2ca8faf008151d87f232c698de69e735 Release-4.5.0
-5960c073250926d202861a09472f5f334da6e283 Sprint-Juno-B
-f15d4ff81a8368e9d42788f7e0ae726f7a70a3b1 Release-4.0.3
-283065df4d3c27245267709dd2644a479c4f62a5 Release-4.0.4.2
-ffc34b23e1a03785e4098afa4290d8c03cf10115 Release-4.5.2
-d03fcffb8834a9583a56813bb44b6abbd9f042cc Release-4.6.0
-1809f7b2593270c192cd47bdcfdb392100686f79 4.7.2
-488779dec0ceb1d2874bcef906241b919325c904 4.8.0-beta
-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
-77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1
-54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2
-ff3bb24ea0c915878396a6ae27f1ff164e8ac150 Release-6.0.0-beta
-56015ac26f5ab60e3c61b1d09075297b660afa07 Release-6.0.0-RC
-1719fbd857f28b376639ac2aa0abada0ef2e7560 Release-6.0.0
-e02f5aebb87e3f07d27376647756caa9762931d8 Release-4.11.4
-14338b0ab1738fbd8987677ecdb9a73d79fc229d release-4.11.6
-ce47176bc6b9298741783e20f1fe2672c811f744 release-4.11.7
-b247b35d821144849f551e02da8ba719f91d5fb0 Release-6.0.2
-aed55cba29009ad3db48880a7cfb66407ce9805f release-6.0.3
-87cf618a39e38ec58df916d10e6a924de62ae37d release-6.1.0-beta
-0dee9964687ea51ea797984cf7cce3655d6a6558 release-6.0.4
-7670bb47a671a9ecc15118589d8048907ea76241 release-6.1.0-beta2

LICENSE.md

@@ -0,0 +1,9 @@
+# The MIT License (MIT) #
+
+Copyright (c) 2013 Umbraco
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -0,0 +1,33 @@
+Umbraco CMS
+===========
+## Watch a five minute introduction video ##
+
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+
+## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
+
+**More than 177,000 sites trust Umbraco** 
+
+For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
+
+Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
+
+To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
+
+## Downloading ##
+
+The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
+
+## Forums ##
+
+We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
+
+## Contribute to Umbraco ##
+
+If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
+
+## Found a bug? ##
+
+Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+
+To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)

build/Build.bat

@@ -1,10 +1,12 @@
 @ECHO OFF
-SET release=6.1.0
+SET release=6.2.3
 SET comment=
 SET version=%release%
 
 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
 
+ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
+
 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
 
 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt

build/Build.proj

@@ -82,6 +82,7 @@
     <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
     <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
     <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
+   <ConfigsFolder>$(BuildFolder)Configs\</ConfigsFolder>
     <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
     <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
     <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
@@ -197,7 +198,7 @@
   </Target>
 
   <!-- Copy the transformed web.config file to the root -->
-  <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyXmlDocumentation">
+ <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
     <ItemGroup>
       <WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
     </ItemGroup>
@@ -206,10 +207,28 @@
         DestinationFiles="$(WebAppFolder)Web.config"
         OverwriteReadOnlyFiles="true"
         SkipUnchangedFiles="false" />
+ </Target>
+ 
+ <!-- Copy the config files and rename them to *.config.transform -->
+ <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
+    <ItemGroup>
+     <ConfigFiles Include="$(WebAppFolder)config\*.config" />
+	 <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
+   </ItemGroup>
+   
+   <Copy SourceFiles="@(ConfigFiles)"
+       DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
+       OverwriteReadOnlyFiles="true"
+       SkipUnchangedFiles="false" />
+	   
+   <Copy SourceFiles="@(WebConfigTransformFile)"
+	   DestinationFiles="$(ConfigsFolder)Web.config.transform"
+	   OverwriteReadOnlyFiles="true"
+	   SkipUnchangedFiles="false" />
   </Target>
 
   <!-- Copy the xml documentation to the bin folder -->
-  <Target Name="CopyXmlDocumentation"  DependsOnTargets="CompileProjects">
+  <Target Name="CopyXmlDocumentation"  DependsOnTargets="CleanupPresentation">
     <ItemGroup>
       <XmlDocumentationFiles Include="$(SolutionBinFolder)*.xml" />
     </ItemGroup>
@@ -221,6 +240,17 @@
     <Message Text="CopyXmlDocumentation" />
   </Target>
 
+  <!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
+  <!-- Also, it places umbraco.XmlSerializers.dll in the root, even though it's also in the bin folder. Kill! -->
+  <Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
+	<ItemGroup>
+		<PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
+		<XmlSerializersDll Include="$(WebAppFolder)umbraco.XmlSerializers.dll" />
+    </ItemGroup>
+	<RemoveDir Directories="@(PresentationFolderToDelete)" />
+    <Delete Files="@(XmlSerializersDll)" />
+  </Target>
+
   <Target Name="CompileProjects" DependsOnTargets="CompileExternalExamineProjects">
     
     <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
@@ -269,6 +299,10 @@
   </Target>
 
   <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
+	<PropertyGroup>
+		<NewVersion>$(BUILD_RELEASE)</NewVersion>
+		<NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
+	</PropertyGroup>
     <!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
     <FileUpdate
       Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
@@ -278,5 +312,9 @@
     <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
       Regex="CurrentComment { get { return &quot;([a-zA-Z]+)?&quot;"
       ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>
+	<XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.targets"
+             Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
+			 Query="//x:UmbracoVersion"
+			 Value="$(NewVersion)" />
   </Target>
 </Project>

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-16"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms.Core</id>
-        <version>6.0.0-alpha</version>
+        <version>6.2.3</version>
         <title>Umbraco Cms Core Binaries</title>
-        <authors>Morten Christensen</authors>
+        <authors>Umbraco HQ</authors>
         <owners>Umbraco HQ</owners>
         <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
         <projectUrl>http://umbraco.com/</projectUrl>
@@ -14,58 +14,63 @@
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
-		<dependencies>
-            <dependency id="Microsoft.AspNet.Mvc" version="[4.0.20710.0]" />
-			<dependency id="Microsoft.AspNet.WebApi" version="4.0.20710.0" />
-			<dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
-			<dependency id="MiniProfiler" version="2.1.0" />
+        <dependencies>
+            <dependency id="Microsoft.AspNet.Mvc" version="[4.0.30506.0,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi" version="[4.0.30506,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.WebHost" version="[4.0.30506, 5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.Core" version="[4.0.30506, 5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.Client" version="[4.0.30506, 5.0.0)" />
+            <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" />
+            <dependency id="Microsoft.Net.Http" version="[2.0.20710.0, 3.0.0)" />
+            <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
+            <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
+            <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
+            <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
+            <dependency id="MySql.Data" version="[6.6.5]" />
+            <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
+            <dependency id="ClientDependency" version="[1.7.1.2, 2.0.0)" />
+            <dependency id="ClientDependency-Mvc" version="[1.7.0.4, 2.0.0)" />
+            <dependency id="Newtonsoft.Json" version="[4.5.11, 6.0.0)" />
+            <dependency id="Examine" version="[0.1.57, 1.0.0)" />
         </dependencies>
     </metadata>
-	<files>
-		<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\ClientDependency.Core.Mvc.dll" target="lib\ClientDependency.Core.Mvc.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Examine.dll" target="lib\Examine.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Lucene.Net.xml" target="lib\Lucene.Net.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
-		<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\umbraco.XmlSerializers.dll" target="lib\umbraco.XmlSerializers.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
-		<file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
-	</files>
+    <files>
+        <file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Microsoft.Web.Helpers.dll" target="lib\Microsoft.Web.Helpers.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.47x.dll" target="lib\Our.Umbraco.uGoLive.47x.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.Checks.dll" target="lib\Our.Umbraco.uGoLive.Checks.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Our.Umbraco.uGoLive.dll" target="lib\Our.Umbraco.uGoLive.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />		
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
+        <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\umbraco.XmlSerializers.dll" target="lib\umbraco.XmlSerializers.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
+        <file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
+		<file src="tools\install.core.ps1" target="tools\install.ps1" />
+    </files>
 </package>

build/NuSpecs/UmbracoCms.nuspec

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-16"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms</id>
-        <version>6.0.0-alpha</version>
+        <version>6.2.3</version>
         <title>Umbraco Cms</title>
-        <authors>Morten Christensen</authors>
+        <authors>Umbraco HQ</authors>
         <owners>Umbraco HQ</owners>
         <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
         <projectUrl>http://umbraco.com/</projectUrl>
         <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Installs Umbraco Cms in your Visual Studio ASP.NET Webforms project</description>
-        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET Webforms project</summary>
+        <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
+        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
@@ -19,30 +19,29 @@
         </dependencies>
     </metadata>
   <files>
-	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="Content\bin\amd64" />
-	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
-	<file src="..\_BuildOutput\WebApp\config\*.config" target="Content\config" />
+	<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
 	<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
-	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" />
+	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" exclude="..\_BuildOutput\WebApp\macroScripts\Web.config" />
 	<file src="..\_BuildOutput\WebApp\masterpages\**" target="Content\masterpages" />
 	<file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
 	<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
 	<file src="..\_BuildOutput\WebApp\usercontrols\**" target="Content\usercontrols" />
-	<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" />
+	<file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" exclude="..\_BuildOutput\WebApp\Views\Web.config" />
 	<file src="..\_BuildOutput\WebApp\xslt\**" target="Content\xslt" />
 	<file src="..\_BuildOutput\WebApp\default.aspx" target="Content\default.aspx" />
 	<file src="..\_BuildOutput\WebApp\Web.config" target="Content\Web.config" />
+	<file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
 	<file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-	<file src="..\_BuildOutput\WebApp\App_Code\**" target="UmbracoFiles\App_Code" />
-	<file src="..\_BuildOutput\WebApp\App_Data\**" target="UmbracoFiles\App_Data" />
-	<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
-	<file src="..\_BuildOutput\WebApp\config\**" target="UmbracoFiles\config" />
+	<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />	
+	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
+	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
+	<file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\config\splashes" />
 	<file src="..\_BuildOutput\WebApp\install\**" target="UmbracoFiles\install" />
 	<file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
 	<file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
-	<file src="..\_BuildOutput\WebApp\Global.asax" target="UmbracoFiles\Global.asax" />
 	<file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
     <file src="tools\install.ps1" target="tools\install.ps1" />
     <file src="tools\Readme.txt" target="tools\Readme.txt" />
+    <file src="build\**" target="build" />
   </files>
 </package>

build/NuSpecs/build/UmbracoCms.props

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CopyAllFilesToSingleFolderForPackageDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForPackageDependsOn>
+	
+	<CopyAllFilesToSingleFolderForMsdeployDependsOn>
+      AddUmbracoFilesToOutput;
+      $(CopyAllFilesToSingleFolderForPackageDependsOn);
+    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
+  </PropertyGroup>
+</Project>

build/NuSpecs/build/UmbracoCms.targets

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <UmbracoVersion>6.2.4</UmbracoVersion>
+  </PropertyGroup>
+  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
+    <PropertyGroup>
+      <UmbracoFilesFolder>..\packages\UmbracoCms.$(UmbracoVersion)\UmbracoFiles\</UmbracoFilesFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+  <Target Name="AddUmbracoFilesToOutput">
+    <!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
+    <ItemGroup>
+      <CustomFilesToInclude Include=".\App_Browsers\**\*">
+        <Dir>App_Browsers</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\App_Code\**\*">
+        <Dir>App_Code</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\App_Plugins\**\*">
+        <Dir>App_Plugins</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\bin\amd64\**\*">
+        <Dir>bin\amd64</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\bin\x86\**\*">
+        <Dir>bin\x86</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\Config\Splashes\**\*">
+        <Dir>Config\Splashes</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\umbraco\**\*">
+        <Dir>umbraco</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\umbraco_client\**\*">
+        <Dir>umbraco_client</Dir>
+      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\Global.asax">
+        <Dir>.</Dir>
+      </CustomFilesToInclude>
+      <FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
+        <DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+    </ItemGroup>
+  </Target>
+</Project>

build/NuSpecs/tools/Readme.txt

@@ -1,15 +1,28 @@
 A note about running Umbraco from Visual Studio.
 
-When upgrading your website using nuget a backup of config files and web.config will be created and the files will
-be overwritten with those from the current release. This means that you'll have to merge the files if you made any
-changes to the previous config files.
+When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
+file (and config files in the config folder). 
+We will overwrite Web.config anyway but we keep a backup in the App_Data\NuGetBackup folder. There you'll 
+find a folder with the current date and time in which the backup has been placed. Make sure to merge the 
+new file with the old backup files before you proceed.
+The web.config will be overwritten by default to ensure that it has the necessary settings from the current release. 
 
-It's not possible to create a deploy package from Visual Studio, which contains everything out of the box. This is
-due to a number of files and folders that are not added to the Visual Studio project. These folders include:
-install, umbraco and umbraco_client.
-A custom deploy script will be added in a later release.
+We've also overwritten all the files in the Umbraco and Umbraco_Client folder, these have also been backed up in 
+App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or a package
+might have added. Only the existing files were overwritten. If you customized anything then make sure to do a compare 
+and merge with the NuGetBackup folder.
 
-Please read the release notes on Codeplex:
-http://umbraco.codeplex.com/releases
+The config files found in the config folder will usually not be changed for patch releases, so they can usually be skipped,
+but the web.config will have to have its previous "umbracoConfigurationStatus"-appsetting and "umbracoDbDSN" connection string
+copied over (as a minimum).
+
+This nuget package includes build targets that extends the creation of a deploy package, which is generated by 
+Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
+Publish this won't affect you.
+These things will now be automatically included when creating a deploy package or publishing to the file system:
+umbraco, umbraco_client, config\splashes and global.asax.
+
+Please read the release notes on our.umbraco.org:
+http://our.umbraco.org/contribute/releases
 
 - Umbraco

build/NuSpecs/tools/install.core.ps1

@@ -0,0 +1,24 @@
+param($rootPath, $toolsPath, $package, $project)
+
+if ($project) {
+	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
+	$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	$projectDestinationPath = Split-Path $project.FullName -Parent
+	
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
+	# After backing up, remove all dlls from bin folder in case dll files are included in the VS project
+	# See: http://issues.umbraco.org/issue/U4-4930
+	$umbracoBinFolder = Join-Path $projectDestinationPath "bin"
+	if(Test-Path $umbracoBinFolder) {
+		$umbracoBinBackupPath = Join-Path $backupPath "bin"
+		
+		New-Item -ItemType Directory -Force -Path $umbracoBinBackupPath
+		
+		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
+		Remove-Item $umbracoBinFolder\*.dll -Force -Confirm:$false
+	}
+}

build/NuSpecs/tools/install.ps1

@@ -1,27 +1,47 @@
 param($rootPath, $toolsPath, $package, $project)
 
 if ($project) {	
-	# Create a backup of extisting umbraco config files
-	$configPath = Join-Path (Split-Path $project.FullName -Parent) "\config"
-    $backupPath = Join-Path $configPath "\backup"
-	Get-ChildItem -path $configPath |
-	   Where -filterscript {($_.Name.EndsWith("config"))} | Foreach-Object {
-	    $newFileName = Join-Path $backupPath $_.Name.replace(".config",".config.backup")
-        New-Item -ItemType File -Path $newFileName -Force
-	    Copy-Item $_.FullName $newFileName -Force
-	   }
-		
+    $dateTime = Get-Date -Format yyyyMMdd-HHmmss
+	$backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\NuGetBackup\$dateTime"
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
 	# Create a backup of original web.config
 	$projectDestinationPath = Split-Path $project.FullName -Parent
-	$webConfigSource = Join-Path $projectDestinationPath "web.config"
-	$webConfigDestination = Join-Path $projectDestinationPath "web.config.backup"
-	Copy-Item $webConfigSource $webConfigDestination
-	
-	# Copy umbraco files from package to project folder
-	$projectDestinationPath = Split-Path $project.FullName -Parent
-	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
-	Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
+	$webConfigSource = Join-Path $projectDestinationPath "Web.config"
+	Copy-Item $webConfigSource $backupPath -Force
 	
+	# Copy Web.config from package to project folder
+	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\Web.config"
+	Copy-Item $umbracoFilesPath $projectDestinationPath -Force
+
+	# Copy umbraco and umbraco_files from package to project folder
+	# This is only done when these folders already exist because we 
+	# only want to do this for upgrades
+	$umbracoFolder = Join-Path $projectDestinationPath "Umbraco"
+	if(Test-Path $umbracoFolder) {
+		$umbracoFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco"
+		
+		$umbracoBackupPath = Join-Path $backupPath "Umbraco"
+		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
+		
+		robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
+		robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
+	}
+
+	$umbracoClientFolder = Join-Path $projectDestinationPath "Umbraco_Client"	
+	if(Test-Path $umbracoClientFolder) {
+		$umbracoClientFolderSource = Join-Path $rootPath "UmbracoFiles\Umbraco_Client"
+		
+		$umbracoClientBackupPath = Join-Path $backupPath "Umbraco_Client"
+		New-Item -ItemType Directory -Force -Path $umbracoClientBackupPath
+		
+		robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
+		robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
+	}
 	# Open readme.txt file
 	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
 }

src/.nuget/NuGet.targets

@@ -17,7 +17,8 @@
     </PropertyGroup>
     
     <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
         <!--
             <PackageSource Include="https://nuget.org/api/v2/" />
             <PackageSource Include="https://my-nuget-source/nuget/" />
@@ -54,10 +55,10 @@
         <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
 
         <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
             RestorePackages;
-            $(ResolveReferencesDependsOn);
-        </ResolveReferencesDependsOn>
+            $(BuildDependsOn);
+        </BuildDependsOn>
 
         <!-- Make the build depend on restore packages -->
         <BuildDependsOn Condition="$(BuildPackage) == 'true'">
@@ -75,7 +76,7 @@
         This effectively acts as a lock that makes sure that the download operation will only happen once and all
         parallel builds will have to wait for it to complete.
         -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
     </Target>
 
     <Target Name="_DownloadNuGet">

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -80,6 +80,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Sql\Total.sql" />
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Sql\Version4_1_Upgrade.sql" />
   </ItemGroup>

src/SQLCE4Umbraco/app.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

src/Umbraco.Core/ApplicationContext.cs

@@ -12,7 +12,7 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Core
 {
-	/// <summary>
+    /// <summary>
     /// the Umbraco Application context
     /// </summary>
     /// <remarks>
@@ -20,73 +20,102 @@ namespace Umbraco.Core
     /// </remarks>
     public class ApplicationContext : IDisposable
     {
-    	/// <summary>
-        /// Constructor
-        /// </summary>        
-        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
-            : this(dbContext, serviceContext, true)
-    	{
-    			
-    	}
 
         /// <summary>
         /// Constructor
         /// </summary>
         /// <param name="dbContext"></param>
         /// <param name="serviceContext"></param>
-        /// <param name="enableCache"></param>
-        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, bool enableCache)
-            : this(enableCache)
+        /// <param name="cache"></param>
+        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
         {
             if (dbContext == null) throw new ArgumentNullException("dbContext");
             if (serviceContext == null) throw new ArgumentNullException("serviceContext");
-
+            if (cache == null) throw new ArgumentNullException("cache");
             _databaseContext = dbContext;
-            _services = serviceContext;		
+            _services = serviceContext;
+            ApplicationCache = cache;
         }
 
-		/// <summary>
-		/// Empty constructor normally reserved for unit tests when a DatabaseContext or a ServiceContext is not
-		/// necessarily required or needs to be set after construction.
-		/// </summary>
-		internal ApplicationContext() : this(true)
-		{			
-		}
-
         /// <summary>
-        /// Constructor used to specify if we will enable application cache or not
+        /// Creates a basic app context
         /// </summary>
-        /// <param name="enableCache"></param>
-        internal ApplicationContext(bool enableCache)
+        /// <param name="cache"></param>
+        public ApplicationContext(CacheHelper cache)
         {
-            //create a new application cache from the HttpRuntime.Cache
-            ApplicationCache = HttpRuntime.Cache == null
-                ? new CacheHelper(new System.Web.Caching.Cache(), enableCache)
-                : new CacheHelper(HttpRuntime.Cache, enableCache);
+            ApplicationCache = cache;
         }
 
-		/// <summary>
-    	/// Singleton accessor
-    	/// </summary>
-    	public static ApplicationContext Current { get; internal set; }
+        /// <summary>
+        /// A method used to set and/or ensure that a global ApplicationContext singleton is created.
+        /// </summary>
+        /// <param name="appContext">
+        /// The instance to set on the global application singleton
+        /// </param>
+        /// <param name="replaceContext">If set to true and the singleton is already set, it will be replaced</param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is NOT thread safe 
+        /// </remarks>
+        public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
+        {
+            if (ApplicationContext.Current != null)
+            {
+                if (!replaceContext)
+                    return ApplicationContext.Current;
+            }
+            ApplicationContext.Current = appContext;
+            return ApplicationContext.Current;
+        }
 
-		/// <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; }
+        /// <summary>
+        /// A method used to create and ensure that a global ApplicationContext singleton is created.
+        /// </summary>
+        /// <param name="cache"></param>
+        /// <param name="replaceContext">
+        /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app 
+        /// startup if for some reason the boot manager is not the umbraco boot manager.
+        /// </param>
+        /// <param name="dbContext"></param>
+        /// <param name="serviceContext"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is NOT thread safe 
+        /// </remarks>
+        public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
+        {
+            if (ApplicationContext.Current != null)
+            {
+                if (!replaceContext)
+                    return ApplicationContext.Current;
+            }
+            var ctx = new ApplicationContext(dbContext, serviceContext, cache);
+            ApplicationContext.Current = ctx;
+            return ApplicationContext.Current;
+        }
 
-    	// IsReady is set to true by the boot manager once it has successfully booted
+        /// <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);
-		private DatabaseContext _databaseContext;
-		private ServiceContext _services;
+        readonly ManualResetEventSlim _isReadyEvent = new ManualResetEventSlim(false);
+        private DatabaseContext _databaseContext;
+        private ServiceContext _services;
 
-		public bool IsReady
+        public bool IsReady
         {
             get
             {
@@ -96,14 +125,14 @@ namespace Umbraco.Core
             {
                 AssertIsNotReady();
                 _isReady = value;
-				_isReadyEvent.Set();
+                _isReadyEvent.Set();
             }
         }
 
-		public bool WaitForReady(int timeout)
-		{
-			return _isReadyEvent.WaitHandle.WaitOne(timeout);
-		}
+        public bool WaitForReady(int timeout)
+        {
+            return _isReadyEvent.WaitHandle.WaitOne(timeout);
+        }
 
 
         // notes
@@ -112,14 +141,14 @@ namespace Umbraco.Core
         //   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...
+        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it... SD: I have actually remove that now!
         //
         public bool IsConfigured
         {
-            // fixme - let's do this for the time being
+            // todo - we should not do this - ok for now
             get
             {
-            	return Configured;
+                return Configured;
             }
         }
 
@@ -135,45 +164,45 @@ namespace Umbraco.Core
         /// </remarks>
         internal string OriginalRequestUrl { get; set; }
 
-		private bool Configured
-		{
-			get
-			{
-				try
-				{
-					string configStatus = ConfigurationStatus;
-					string currentVersion = UmbracoVersion.Current.ToString(3);
+        private bool Configured
+        {
+            get
+            {
+                try
+                {
+                    string configStatus = ConfigurationStatus;
+                    string currentVersion = UmbracoVersion.Current.ToString(3);
 
 
-					if (currentVersion != configStatus)
-					{
-						LogHelper.Info<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
-					}
-						
+                    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;
-				}
-			}			
-		}
+                    return (configStatus == currentVersion);
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
+        private string ConfigurationStatus
+        {
+            get
+            {
+                try
+                {
+                    return ConfigurationManager.AppSettings["umbracoConfigurationStatus"];
+                }
+                catch
+                {
+                    return String.Empty;
+                }
+            }
+        }
 
         private void AssertIsReady()
         {
@@ -187,39 +216,39 @@ namespace Umbraco.Core
                 throw new Exception("ApplicationContext has already been initialized.");
         }
 
-		/// <summary>
-		/// Gets the current DatabaseContext
-		/// </summary>
-		/// <remarks>
-		/// Internal set is generally only used for unit tests
-		/// </remarks>
-		public DatabaseContext DatabaseContext
-		{
-			get
-			{
-				if (_databaseContext == null)
-					throw new InvalidOperationException("The DatabaseContext has not been set on the ApplicationContext");
-				return _databaseContext;
-			}
-			internal set { _databaseContext = value; }
-		}
-		
-		/// <summary>
-		/// Gets the current ServiceContext
-		/// </summary>
-		/// <remarks>
-		/// Internal set is generally only used for unit tests
-		/// </remarks>
-		public ServiceContext Services
-		{
-			get
-			{
-				if (_services == null)
-					throw new InvalidOperationException("The ServiceContext has not been set on the ApplicationContext");
-				return _services;
-			}
-			internal set { _services = value; }
-		}
+        /// <summary>
+        /// Gets the current DatabaseContext
+        /// </summary>
+        /// <remarks>
+        /// Internal set is generally only used for unit tests
+        /// </remarks>
+        public DatabaseContext DatabaseContext
+        {
+            get
+            {
+                if (_databaseContext == null)
+                    throw new InvalidOperationException("The DatabaseContext has not been set on the ApplicationContext");
+                return _databaseContext;
+            }
+            internal set { _databaseContext = value; }
+        }
+
+        /// <summary>
+        /// Gets the current ServiceContext
+        /// </summary>
+        /// <remarks>
+        /// Internal set is generally only used for unit tests
+        /// </remarks>
+        public ServiceContext Services
+        {
+            get
+            {
+                if (_services == null)
+                    throw new InvalidOperationException("The ServiceContext has not been set on the ApplicationContext");
+                return _services;
+            }
+            internal set { _services = value; }
+        }
 
 
         private volatile bool _disposed;
@@ -245,26 +274,26 @@ namespace Umbraco.Core
                 //clear the cache
                 if (ApplicationCache != null)
                 {
-                    ApplicationCache.ClearAllCache();    
+                    ApplicationCache.ClearAllCache();
                 }
                 //reset all resolvers
                 ResolverCollection.ResetAll();
                 //reset resolution itself (though this should be taken care of by resetting any of the resolvers above)
                 Resolution.Reset();
-                
+
                 //reset the instance objects
                 this.ApplicationCache = null;
                 if (_databaseContext != null) //need to check the internal field here
                 {
                     if (DatabaseContext.IsDatabaseConfigured)
                     {
-                        DatabaseContext.Database.Dispose();       
-                    }                    
+                        DatabaseContext.Database.Dispose();
+                    }
                 }
                 this.DatabaseContext = null;
                 this.Services = null;
                 this._isReady = false; //set the internal field
-                
+
                 // Indicate that the instance has been disposed.
                 _disposed = true;
             }

src/Umbraco.Core/AssemblyExtensions.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 
 namespace Umbraco.Core

src/Umbraco.Core/Attempt.cs

@@ -2,65 +2,165 @@ 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>
+    /// Provides ways to create attempts.
+    /// </summary>
+    public static class Attempt
+    {
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed<T>(T result)
+        {
+            return Attempt<T>.Succeed(result);
+        }
 
-		/// <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>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail<T>(T result)
+        {
+            return Attempt<T>.Fail(result);
+        }
 
-		/// <summary>
-		/// Gets the error associated with an unsuccessful attempt.
-		/// </summary>
-		/// <value>The error.</value>
-		public Exception Error { get { return _error; } }
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail<T>(T result, Exception exception)
+        {
+            return Attempt<T>.Fail(result, exception);
+        }
 
-		/// <summary>
-		/// Gets the parse result.
-		/// </summary>
-		/// <remarks></remarks>
-		public T Result
-		{
-			get { return _result; }
-		}
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="success">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> If<T>(bool success, T result)
+        {
+            return Attempt<T>.SucceedIf(success, 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;
-		}
+        /// <summary>
+        /// Executes an attempt function, with callbacks.
+        /// </summary>
+        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <param name="attempt">The attempt returned by the attempt function.</param>
+        /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
+        /// <param name="onFail">An action to execute in case the attempt fails.</param>
+        /// <returns>The outcome of the attempt.</returns>
+        /// <remarks>Runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
+        /// whether the attempt function reports a success or a failure.</remarks>
+        public static Outcome Try<T>(Attempt<T> attempt, Action<T> onSuccess, Action<Exception> onFail = null)
+        {
+            if (attempt.Success)
+            {
+                onSuccess(attempt.Result);
+                return Outcome.Success;
+            }
 
-		public Attempt(Exception error)
-		{
-			_success = false;
-			_result = default(T);
-			_error = error;
-		}
-	}
+            if (onFail != null)
+            {
+                onFail(attempt.Exception);
+            }
+
+            return Outcome.Failure;
+        }
+
+        /// <summary>
+        /// Represents the outcome of an attempt.
+        /// </summary>
+        /// <remarks>Can be a success or a failure, and allows for attempts chaining.</remarks>
+        public struct Outcome
+        {
+            private readonly bool _success;
+
+            /// <summary>
+            /// Gets an outcome representing a success.
+            /// </summary>
+            public static readonly Outcome Success = new Outcome(true);
+
+            /// <summary>
+            /// Gets an outcome representing a failure.
+            /// </summary>
+            public static readonly Outcome Failure = new Outcome(false);
+
+            private Outcome(bool success)
+            {
+                _success = success;
+            }
+
+            /// <summary>
+            /// Executes another attempt function, if the previous one failed, with callbacks.
+            /// </summary>
+            /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+            /// <param name="nextFunction">The attempt function to execute, returning an attempt.</param>
+            /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
+            /// <param name="onFail">An action to execute in case the attempt fails.</param>
+            /// <returns>If it executes, returns the outcome of the attempt, else returns a success outcome.</returns>
+            /// <remarks>
+            /// <para>Executes only if the previous attempt failed, else does not execute and return a success outcome.</para>
+            /// <para>If it executes, then runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
+            /// whether the attempt function reports a success or a failure.</para>
+            /// </remarks>
+            public Outcome OnFailure<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
+            {
+                return _success
+                    ? Success
+                    : ExecuteNextFunction(nextFunction, onSuccess, onFail);
+            }
+
+            /// <summary>
+            /// Executes another attempt function, if the previous one succeeded, with callbacks.
+            /// </summary>
+            /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+            /// <param name="nextFunction">The attempt function to execute, returning an attempt.</param>
+            /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
+            /// <param name="onFail">An action to execute in case the attempt fails.</param>
+            /// <returns>If it executes, returns the outcome of the attempt, else returns a failed outcome.</returns>
+            /// <remarks>
+            /// <para>Executes only if the previous attempt succeeded, else does not execute and return a success outcome.</para>
+            /// <para>If it executes, then runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
+            /// whether the attempt function reports a success or a failure.</para>
+            /// </remarks>
+            public Outcome OnSuccess<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
+            {
+                return _success
+                    ? ExecuteNextFunction(nextFunction, onSuccess, onFail) 
+                    : Failure;
+            }
+
+            private static Outcome ExecuteNextFunction<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
+            {
+                var attempt = nextFunction();
+
+                if (attempt.Success)
+                {
+                    onSuccess(attempt.Result);
+                    return Success;
+                }
+
+                if (onFail != null)
+                {
+                    onFail(attempt.Exception);
+                }
+
+                return Failure;
+            }
+        }
+
+    }
 }

src/Umbraco.Core/Attempt{T}.cs

@@ -0,0 +1,174 @@
+using System;
+using Umbraco.Core.Dynamics;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Represents the result of an operation attempt.
+    /// </summary>
+    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+    [Serializable]
+	public struct Attempt<T>
+	{
+		private readonly bool _success;
+		private readonly T _result;
+		private readonly Exception _exception;
+
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
+        /// </summary>
+        public bool Success
+		{
+			get { return _success; }
+		}
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        public Exception Exception { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
+        public Exception Error { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the attempt result.
+        /// </summary>
+        public T Result
+		{
+			get { return _result; }
+		}
+
+        // optimize, use a singleton failed attempt
+		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
+
+        /// <summary>
+        /// Represents an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
+        public static readonly Attempt<T> False = Failed; 
+
+        // private - use Succeed() or Fail() methods to create attempts
+        private Attempt(bool success, T result, Exception exception)
+        {
+            _success = success;
+            _result = result;
+            _exception = exception;
+        }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
+        /// </summary>
+        /// <param name="success">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(bool success, T result)
+            : this(success, result, null)
+        { }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(Exception exception)
+            : this(false, default(T), exception)
+        { }
+
+        /// <summary>
+        /// Creates a successful attempt.
+        /// </summary>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed()
+        {
+            return new Attempt<T>(true, default(T), null);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed(T result)
+        {
+            return new Attempt<T>(true, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail()
+        {
+            return Failed;
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(Exception exception)
+        {
+            return new Attempt<T>(false, default(T), exception);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result)
+        {
+            return new Attempt<T>(false, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result, Exception exception)
+        {
+            return new Attempt<T>(false, result, exception);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition)
+        {
+            return condition ? new Attempt<T>(true, default(T), null) : Failed;
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition, T result)
+        {
+            return new Attempt<T>(condition, result, null);
+        }
+
+        /// <summary>
+        /// Implicity operator to check if the attempt was successful without having to access the 'success' property
+        /// </summary>
+        /// <param name="a"></param>
+        /// <returns></returns>
+        public static implicit operator bool(Attempt<T> a)
+        {
+            return a.Success;
+        }
+    }
+}

src/Umbraco.Core/Cache/CacheKeys.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Umbraco.Core.Cache
 {
 
@@ -9,6 +11,7 @@ namespace Umbraco.Core.Cache
         public const string ApplicationTreeCacheKey = "ApplicationTreeCache";
         public const string ApplicationsCacheKey = "ApplicationCache";
 
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
         public const string UserTypeCacheKey = "UserTypeCache";
 
         public const string ContentItemCacheKey = "contentItem";
@@ -24,13 +27,17 @@ namespace Umbraco.Core.Cache
 
         public const string MemberLibraryCacheKey = "UL_GetMember";
         public const string MemberBusinessLogicCacheKey = "MemberCacheItem_";
-
+        
         public const string TemplateFrontEndCacheKey = "template";
         public const string TemplateBusinessLogicCacheKey = "UmbracoTemplateCache";
 
         public const string UserContextCacheKey = "UmbracoUserContext";
         public const string UserContextTimeoutCacheKey = "UmbracoUserContextTimeout";
+
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
         public const string UserCacheKey = "UmbracoUser";
+        
+        public const string UserPermissionsCacheKey = "UmbracoUserPermissions";
 
         public const string ContentTypeCacheKey = "UmbracoContentType";
 
@@ -46,6 +53,6 @@ namespace Umbraco.Core.Cache
         public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty";
 
         public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
-
+        public const string DataTypePreValuesCacheKey = "UmbracoPreVal";
     }
 }

src/Umbraco.Core/Cache/CacheProviderBase.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a basic cache provider
-    /// </summary>
-    /// <remarks>
-    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, ETC...
-    /// </remarks>
-    internal abstract class CacheProviderBase
-    {
-        public abstract void ClearAllCache();
-        public abstract void ClearCacheItem(string key);
-        public abstract void ClearCacheObjectTypes(string typeName);
-        public abstract void ClearCacheObjectTypes<T>();
-        public abstract void ClearCacheByKeySearch(string keyStartsWith);
-        public abstract void ClearCacheByKeyExpression(string regexString);
-        public abstract IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith);
-        public abstract T GetCacheItem<T>(string cacheKey);
-        public abstract T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem);
-    }
-}

src/Umbraco.Core/Cache/CacheProviderExtensions.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Extensions for strongly typed access
+    /// </summary>
+    internal static class CacheProviderExtensions
+    {
+        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
+            string cacheKey,
+            Func<T> getCacheItem,
+            TimeSpan? timeout,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null)
+        {
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            return result == null ? default(T) : result.TryConvertTo<T>().Result;
+        }
+
+        public static void InsertCacheItem<T>(this IRuntimeCacheProvider provider,
+            string cacheKey,
+            Func<T> getCacheItem,
+            TimeSpan? timeout = null,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null)
+        {
+            provider.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+        }
+
+        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this ICacheProvider provider, string keyStartsWith)
+        {
+            var result = provider.GetCacheItemsByKeySearch(keyStartsWith);
+            return result.Select(x => x.TryConvertTo<T>().Result);
+        }
+
+        public static IEnumerable<T> GetCacheItemsByKeyExpression<T>(this ICacheProvider provider, string regexString)
+        {
+            var result = provider.GetCacheItemsByKeyExpression(regexString);
+            return result.Select(x => x.TryConvertTo<T>().Result);
+        }
+
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
+        {
+            var result = provider.GetCacheItem(cacheKey);
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey, Func<T> getCacheItem)
+        {
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem());
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+    }
+}

src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs

@@ -0,0 +1,204 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Umbraco.Core.Cache
+{
+    internal abstract class DictionaryCacheProviderBase : ICacheProvider
+    {
+        // prefix cache keys so we know which one are ours
+        protected const string CacheItemPrefix = "umbrtmche";
+
+        // an object that represent a value that has not been created yet
+        protected readonly object ValueNotCreated = new object();
+
+        // manupulate the underlying cache entries
+        // these *must* be called from within the appropriate locks
+        // and use the full prefixed cache keys
+        protected abstract IEnumerable<DictionaryEntry> GetDictionaryEntries();
+        protected abstract void RemoveEntry(string key);
+        protected abstract object GetEntry(string key);
+
+        // read-write lock the underlying cache
+        protected abstract IDisposable ReadLock { get; }
+        protected abstract IDisposable WriteLock { get; }
+
+        protected string GetCacheKey(string key)
+        {
+            return string.Format("{0}-{1}", CacheItemPrefix, key);
+        }
+
+        protected object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        {
+            try
+            {
+                // if onlyIfValueIsCreated, do not trigger value creation
+                // must return something, though, to differenciate from null values
+                if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
+                return lazy.Value;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        #region Clear
+
+        public virtual void ClearAllCache()
+        {
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheItem(string key)
+        {
+            var cacheKey = GetCacheKey(key);
+            using (WriteLock)
+            {
+                RemoveEntry(cacheKey);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        return value == null || value.GetType().ToString().InvariantEquals(typeName);
+                    })
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            var typeOfT = typeof(T);
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // compare on exact type, don't use "is"
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        return value == null || value.GetType() == typeOfT;
+                    })
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            var typeOfT = typeof(T);
+            var plen = CacheItemPrefix.Length + 1;
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // compare on exact type, don't use "is"
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        if (value == null) return true;
+                        return value.GetType() == typeOfT
+                            // run predicate on the 'public key' part only, ie without prefix
+                            && predicate(((string)x.Key).Substring(plen), (T)value);
+                    }))
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            using (WriteLock)
+            {
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+        }
+
+        #endregion
+
+        #region Get
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            IEnumerable<DictionaryEntry> entries;
+            using (ReadLock)
+            {
+                entries = GetDictionaryEntries()
+                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
+                    .ToArray(); // evaluate while locked
+            }
+            return entries
+                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                    .Where(x => x != null); // backward compat, don't store null values in the cache
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            const string prefix = CacheItemPrefix + "-";
+            var plen = prefix.Length;
+            IEnumerable<DictionaryEntry> entries;
+            using (ReadLock)
+            {
+                entries = GetDictionaryEntries()
+                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
+                    .ToArray(); // evaluate while locked
+            }
+            return entries
+                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                    .Where(x => x != null); // backward compat, don't store null values in the cache
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            cacheKey = GetCacheKey(cacheKey);
+            Lazy<object> result;
+            using (ReadLock)
+            {
+                result = GetEntry(cacheKey) as Lazy<object>; // null if key not found
+            }
+            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+        }
+
+        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+
+        #endregion
+    }
+}

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache provider that caches items in the HttpContext.Items
+    /// </summary>
+    internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
+    {
+        // context provider
+        // the idea is that there is only one, application-wide HttpRequestCacheProvider instance,
+        // that is initialized with a method that returns the "current" context.
+        // NOTE
+        //   but then it is initialized with () => new HttpContextWrapper(HttpContent.Current)
+        //   which is higly inefficient because it creates a new wrapper each time we refer to _context()
+        //   so replace it with _context1 and _context2 below + a way to get context.Items.
+        //private readonly Func<HttpContextBase> _context;
+
+        // NOTE
+        //   and then in almost 100% cases _context2 will be () => HttpContext.Current
+        //   so why not bring that logic in here and fallback on to HttpContext.Current when
+        //   _context1 is null?
+        //private readonly HttpContextBase _context1;
+        //private readonly Func<HttpContext> _context2;
+        private readonly HttpContextBase _context;
+
+        private IDictionary ContextItems
+        {
+            //get { return _context1 != null ? _context1.Items : _context2().Items; }
+            get { return _context != null ? _context.Items : HttpContext.Current.Items; }
+        }
+
+        // for unit tests
+        public HttpRequestCacheProvider(HttpContextBase context)
+        {
+            _context = context;
+        }
+
+        // main constructor
+        // will use HttpContext.Current
+        public HttpRequestCacheProvider(/*Func<HttpContext> context*/)
+        {
+            //_context2 = context;
+        }
+
+        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
+        {
+            const string prefix = CacheItemPrefix + "-";
+            return ContextItems.Cast<DictionaryEntry>()
+                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
+        }
+
+        protected override void RemoveEntry(string key)
+        {
+            ContextItems.Remove(key);
+        }
+
+        protected override object GetEntry(string key)
+        {
+            return ContextItems[key];
+        }
+
+        #region Lock
+
+        protected override IDisposable ReadLock
+        {
+            // there's no difference between ReadLock and WriteLock here
+            get { return WriteLock; }
+        }
+
+        protected override IDisposable WriteLock
+        {
+            // NOTE
+            //   could think about just overriding base.Locker to return a different
+            //   object but then we'd create a ReaderWriterLockSlim per request,
+            //   which is less efficient than just using a basic monitor lock.
+
+            get
+            {
+                return new MonitorLock(ContextItems.SyncRoot);
+            }
+        }
+
+        #endregion
+
+        #region Get
+
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            cacheKey = GetCacheKey(cacheKey);
+
+            Lazy<object> result;
+
+            using (WriteLock)
+            {
+                result = ContextItems[cacheKey] as Lazy<object>; // null if key not found
+
+                // cannot create value within the lock, so if result.IsValueCreated is false, just
+                // do nothing here - means that if creation throws, a race condition could cause
+                // more than one thread to reach the return statement below and throw - accepted.
+                
+                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = new Lazy<object>(getCacheItem);
+                    ContextItems[cacheKey] = result;
+                }
+            }
+
+            // this may throw if getCacheItem throws, but this is the only place where
+            // it would throw as everywhere else we use GetLazySaveValue() to hide exceptions
+            // and pretend exceptions were never inserted into cache to begin with.
+            return result.Value;
+        }
+        
+        #endregion
+
+        #region Insert
+        #endregion
+
+    }
+}

src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs

@@ -2,355 +2,202 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
+using System.Threading;
 using System.Web.Caching;
-using Umbraco.Core.Logging;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
 
 namespace Umbraco.Core.Cache
 {
     /// <summary>
     /// A CacheProvider that wraps the logic of the HttpRuntime.Cache
     /// </summary>
-    internal class HttpRuntimeCacheProvider : RuntimeCacheProviderBase
+    internal class HttpRuntimeCacheProvider : DictionaryCacheProviderBase, IRuntimeCacheProvider
     {
+        // locker object that supports upgradeable read locking
+        // does not need to support recursion if we implement the cache correctly and ensure
+        // that methods cannot be reentrant, ie we do NOT create values while holding a lock.
+        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
+
         private readonly System.Web.Caching.Cache _cache;
-        private static readonly object Locker = new object();
 
         public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
         {
             _cache = cache;
         }
 
-        /// <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 override void ClearAllCache()
+        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
         {
-            var cacheEnumerator = _cache.GetEnumerator();
-            while (cacheEnumerator.MoveNext())
-            {
-                _cache.Remove(cacheEnumerator.Key.ToString());
-            }
+            const string prefix = CacheItemPrefix + "-";
+            return _cache.Cast<DictionaryEntry>()
+                .Where(x => x.Key is string && ((string) x.Key).StartsWith(prefix));
         }
 
-        /// <summary>
-        /// Clears the item in umbraco's runtime cache with the given key 
-        /// </summary>
-        /// <param name="key">Key</param>
-        public override void ClearCacheItem(string key)
+        protected override void RemoveEntry(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); ;
-            }
+            _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 override void ClearCacheObjectTypes(string typeName)
+        protected override object GetEntry(string key)
         {
-            try
-            {
-                lock (Locker)
-                {
-                    foreach (DictionaryEntry c in _cache)
-                    {
-                        if (_cache[c.Key.ToString()] != null
-                            && _cache[c.Key.ToString()].GetType().ToString().InvariantEquals(typeName))
-                        {
-                            _cache.Remove(c.Key.ToString());
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error<CacheHelper>("Cache clearing error", e);
-            }
+            return _cache.Get(key);
         }
 
-        /// <summary>
-        /// Clears all objects in the System.Web.Cache with the System.Type specified
-        /// </summary>
-        public override void ClearCacheObjectTypes<T>()
+        #region Lock
+
+        protected override IDisposable ReadLock
         {
-            try
-            {
-                lock (Locker)
-                {
-                    foreach (DictionaryEntry c in _cache)
-                    {
-                        if (_cache[c.Key.ToString()] != null
-                            && _cache[c.Key.ToString()].GetType() == typeof(T))
-                        {
-                            _cache.Remove(c.Key.ToString());
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error<CacheHelper>("Cache clearing error", e);
-            }
+            get { return new ReadLock(_locker); }
         }
 
-        /// <summary>
-        /// Clears all cache items that starts with the key passed.
-        /// </summary>
-        /// <param name="keyStartsWith">The start of the key</param>
-        public override void ClearCacheByKeySearch(string keyStartsWith)
+        protected override IDisposable WriteLock
         {
-            foreach (DictionaryEntry c in _cache)
-            {
-                if (c.Key is string && ((string)c.Key).InvariantStartsWith(keyStartsWith))
-                {
-                    ClearCacheItem((string)c.Key);
-                }
-            }
+            get { return new WriteLock(_locker); }
         }
 
-        /// <summary>
-        /// Clears all cache items that have a key that matches the regular expression
-        /// </summary>
-        /// <param name="regexString"></param>
-        public override void ClearCacheByKeyExpression(string regexString)
-        {
-            foreach (DictionaryEntry c in _cache)
-            {
-                if (c.Key is string && Regex.IsMatch(((string)c.Key), regexString))
-                {
-                    ClearCacheItem((string)c.Key);
-                }
-            }
-        }
+        #endregion
 
-        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
-        {
-            return (from DictionaryEntry c in _cache
-                    where c.Key is string && ((string)c.Key).InvariantStartsWith(keyStartsWith)
-                    select c.Value.TryConvertTo<T>()
-                    into attempt
-                    where attempt.Success
-                    select attempt.Result).ToList();
-        }
-
-        /// <summary>
-        /// Returns a cache item by key, does not update the cache if it isn't there.
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey)
-        {
-            var result = _cache.Get(cacheKey);
-            if (result == null)
-            {
-                return default(TT);
-            }
-            return result.TryConvertTo<TT>().Result;
-        }
+        #region Get
 
         /// <summary>
         /// Gets (and adds if necessary) an item from the cache with all of the default parameters
         /// </summary>
-        /// <typeparam name="TT"></typeparam>
         /// <param name="cacheKey"></param>
         /// <param name="getCacheItem"></param>
         /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
         {
-            return GetCacheItem(cacheKey, CacheItemPriority.Normal, null, null, null, getCacheItem, Locker);
+            return GetCacheItem(cacheKey, getCacheItem, null, dependentFiles: null);
         }
 
         /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// This overload is here for legacy purposes
         /// </summary>
-        /// <typeparam name="TT"></typeparam>
         /// <param name="cacheKey"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
         /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey,
-                                            TimeSpan? timeout, Func<TT> getCacheItem)
-        {
-            return GetCacheItem(cacheKey, null, timeout, getCacheItem);
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey,
-                                            CacheItemRemovedCallback refreshAction, TimeSpan? timeout,
-                                            Func<TT> getCacheItem)
-        {
-            return GetCacheItem(cacheKey, CacheItemPriority.Normal, refreshAction, timeout, getCacheItem);
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
+        /// <param name="timeout"></param>
+        /// <param name="isSliding"></param>
         /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
+        /// <param name="removedCallback"></param>
+        /// <param name="dependency"></param>
         /// <returns></returns>
-        public override TT GetCacheItem<TT>(string cacheKey,
-                                            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout,
-                                            Func<TT> getCacheItem)
+        internal object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
         {
-            return GetCacheItem(cacheKey, priority, refreshAction, null, timeout, getCacheItem);
-        }
+            cacheKey = GetCacheKey(cacheKey);
 
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        public override 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);
-        }
+            // NOTE - because we don't know what getCacheItem does, how long it will take and whether it will hang,
+            // getCacheItem should run OUTSIDE of the global application lock else we run into lock contention and
+            // nasty performance issues.
 
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <param name="syncLock"></param>
-        /// <returns></returns>
-        private 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)
+            // So.... we insert a Lazy<object> in the cache while holding the global application lock, and then rely
+            // on the Lazy lock to ensure that getCacheItem runs once and everybody waits on it, while the global
+            // application lock has been released.
+
+            // NOTE 
+            //   The Lazy value creation may produce a null value.
+            //   Must make sure (for backward compatibility) that we pretend they are not in the cache.
+            //   So if we find an entry in the cache that already has its value created and is null,
+            //   pretend it was not there. If value is not already created, wait... and return null, that's
+            //   what prior code did.
+
+            // NOTE
+            //   The Lazy value creation may throw.
+
+            // So... the null value _will_ be in the cache but never returned
+
+            Lazy<object> result;
+
+            // Fast!
+            // Only one thread can enter an UpgradeableReadLock at a time, but it does not prevent other
+            // threads to enter a ReadLock in the meantime -- only upgrading to WriteLock will prevent all
+            // reads. We first try with a normal ReadLock for maximum concurrency and take the penalty of
+            // having to re-lock in case there's no value. Would need to benchmark to figure out whether
+            // it's worth it, though...
+            using (new ReadLock(_locker))
             {
-                lock (syncLock)
+                result = _cache.Get(cacheKey) as Lazy<object>; // null if key not found
+            }
+            var value = result == null ? null : GetSafeLazyValue(result);
+            if (value != null) return value;
+
+            using (var lck = new UpgradeableReadLock(_locker))
+            {
+                result = _cache.Get(cacheKey) as Lazy<object>; // null if key not found
+
+                // cannot create value within the lock, so if result.IsValueCreated is false, just
+                // do nothing here - means that if creation throws, a race condition could cause
+                // more than one thread to reach the return statement below and throw - accepted.
+
+                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                 {
-                    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,
-                                          timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value),
-                                          TimeSpan.Zero, priority, refreshAction);
-                        }
-                    }
+                    result = new Lazy<object>(getCacheItem);
+                    var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
+                    var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
+
+                    lck.UpgradeToWriteLock();
+                    _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
                 }
             }
-            return result.TryConvertTo<TT>().Result;
+
+            // this may throw if getCacheItem throws, but this is the only place where
+            // it would throw as everywhere else we use GetLazySaveValue() to hide exceptions
+            // and pretend exceptions were never inserted into cache to begin with.
+            return result.Value;
         }
 
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="getCacheItem"></param>
-        public override void InsertCacheItem<T>(string cacheKey,
-                                                CacheItemPriority priority,
-                                                Func<T> getCacheItem)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
-            InsertCacheItem(cacheKey, priority, null, null, null, getCacheItem);
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        public override void InsertCacheItem<T>(string cacheKey,
-                                                CacheItemPriority priority,
-                                                TimeSpan? timeout,
-                                                Func<T> getCacheItem)
-        {
-            InsertCacheItem(cacheKey, priority, null, null, timeout, getCacheItem);
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        public override void InsertCacheItem<T>(string cacheKey,
-                                                CacheItemPriority priority,
-                                                CacheDependency cacheDependency,
-                                                TimeSpan? timeout,
-                                                Func<T> getCacheItem)
-        {
-            InsertCacheItem(cacheKey, priority, null, cacheDependency, timeout, getCacheItem);
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        public override void InsertCacheItem<T>(string cacheKey,
-                                                CacheItemPriority priority,
-                                                CacheItemRemovedCallback refreshAction,
-                                                CacheDependency cacheDependency,
-                                                TimeSpan? timeout,
-                                                Func<T> getCacheItem)
-        {
-            object result = getCacheItem();
-            if (result != null)
+            CacheDependency dependency = null;
+            if (dependentFiles != null && dependentFiles.Any())
             {
-                //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,
-                              timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value),
-                              TimeSpan.Zero, priority, refreshAction);
+                dependency = new CacheDependency(dependentFiles);
+            }
+            return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
+        }
+
+        #endregion
+
+        #region Insert
+
+        /// <summary>
+        /// This overload is here for legacy purposes
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <param name="timeout"></param>
+        /// <param name="isSliding"></param>
+        /// <param name="priority"></param>
+        /// <param name="removedCallback"></param>
+        /// <param name="dependency"></param>
+        internal void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        {
+            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
+            // and make sure we don't store a null value.
+
+            var result = new Lazy<object>(getCacheItem);
+            var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
+            if (value == null) return; // do not store null values (backward compat)
+
+            cacheKey = GetCacheKey(cacheKey);           
+
+            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
+            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
+
+            using (new WriteLock(_locker))
+            {
+                _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
             }
         }
 
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            CacheDependency dependency = null;
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                dependency = new CacheDependency(dependentFiles);
+            }
+            InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
+        }
+
+        #endregion
     }
 }

src/Umbraco.Core/Cache/ICacheProvider.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a basic cache provider
+    /// </summary>
+    public interface ICacheProvider
+    {
+        void ClearAllCache();
+        void ClearCacheItem(string key);
+        void ClearCacheObjectTypes(string typeName);
+        void ClearCacheObjectTypes<T>();
+        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
+        void ClearCacheByKeySearch(string keyStartsWith);
+        void ClearCacheByKeyExpression(string regexString);
+        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
+        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
+        
+        /// <summary>
+        /// Returns an item with a given key
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        object GetCacheItem(string cacheKey);
+
+        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+    }
+}

src/Umbraco.Core/Cache/IRuntimeCacheProvider.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Runtime.Caching;
+using System.Text;
+using System.Web.Caching;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a runtime cache provider
+    /// </summary>
+    /// <remarks>
+    /// </remarks>
+    public interface IRuntimeCacheProvider : ICacheProvider
+    {
+        object GetCacheItem(
+            string cacheKey, 
+            Func<object> getCacheItem, 
+            TimeSpan? timeout,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null);
+
+        void InsertCacheItem(
+            string cacheKey,
+            Func<object> getCacheItem,
+            TimeSpan? timeout = null,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null);
+
+    }
+}

src/Umbraco.Core/Cache/NullCacheProvider.cs

@@ -5,81 +5,67 @@ using System.Web.Caching;
 
 namespace Umbraco.Core.Cache
 {
-    internal class NullCacheProvider : RuntimeCacheProviderBase
+    internal class NullCacheProvider : IRuntimeCacheProvider
     {
-        public override void ClearAllCache()
+        public virtual void ClearAllCache()
         {
         }
 
-        public override void ClearCacheItem(string key)
+        public virtual void ClearCacheItem(string key)
         {
         }
 
-        public override void ClearCacheObjectTypes(string typeName)
+        public virtual void ClearCacheObjectTypes(string typeName)
         {
         }
 
-        public override void ClearCacheObjectTypes<T>()
+        public virtual void ClearCacheObjectTypes<T>()
         {
         }
 
-        public override void ClearCacheByKeySearch(string keyStartsWith)
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
         {
         }
 
-        public override void ClearCacheByKeyExpression(string regexString)
+
+
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
         {
         }
 
-        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        public virtual void ClearCacheByKeyExpression(string regexString)
         {
-            return Enumerable.Empty<T>();
         }
 
-        public override T GetCacheItem<T>(string cacheKey)
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
         {
-            return default(T);
+            return Enumerable.Empty<object>();
         }
 
-        public override T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem)
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return Enumerable.Empty<object>();
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            return default(object);
+        }
+
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
         {
             return getCacheItem();
         }
 
-        public override T GetCacheItem<T>(string cacheKey, TimeSpan? timeout, Func<T> getCacheItem)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
             return getCacheItem();
         }
 
-        public override T GetCacheItem<T>(string cacheKey, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-            return getCacheItem();
-        }
-
-        public override T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-            return getCacheItem();
-        }
-
-        public override T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-            return getCacheItem();
-        }
-
-        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, Func<T> getCacheItem)
-        {
-        }
-
-        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-        }
-
-        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
-        {
-        }
-
-        public override void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem)
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
+            
         }
     }
 }

src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs

@@ -0,0 +1,288 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.Caching;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Web.Caching;
+using Umbraco.Core.Logging;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache provider that wraps the logic of a System.Runtime.Caching.ObjectCache
+    /// </summary>
+    internal class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
+    {
+        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        internal ObjectCache MemoryCache;
+
+        // an object that represent a value that has not been created yet
+        protected readonly object ValueNotCreated = new object();
+
+        public ObjectCacheRuntimeCacheProvider()
+        {
+            MemoryCache = new MemoryCache("in-memory");
+        }
+
+        protected object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        {
+            try
+            {
+                // if onlyIfValueIsCreated, do not trigger value creation
+                // must return something, though, to differenciate from null values
+                if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
+                return lazy.Value;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        #region Clear
+
+        public virtual void ClearAllCache()
+        {
+            using (new WriteLock(_locker))
+            {
+                MemoryCache.DisposeIfDisposable();
+                MemoryCache = new MemoryCache("in-memory");
+            }
+        }
+
+        public virtual void ClearCacheItem(string key)
+        {
+            using (new WriteLock(_locker))
+            {
+                if (MemoryCache[key] == null) return;
+                MemoryCache.Remove(key);
+            }            
+        }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            using (new WriteLock(_locker))
+            {
+                foreach (var key in MemoryCache
+                    .Where(x =>
+                    {
+                        // x.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        return value == null || value.GetType().ToString().InvariantEquals(typeName);
+                    })
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            using (new WriteLock(_locker))
+            {
+                var typeOfT = typeof (T);
+                foreach (var key in MemoryCache
+                    .Where(x =>
+                    {
+                        // x.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        return value == null || value.GetType() == typeOfT;
+                    })
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            using (new WriteLock(_locker))
+            {
+                var typeOfT = typeof(T);
+                foreach (var key in MemoryCache
+                    .Where(x =>
+                    {
+                        // x.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        if (value == null) return true;
+                        return value.GetType() == typeOfT
+                            && predicate(x.Key, (T) value);
+                    })
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }
+        }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            using (new WriteLock(_locker))
+            {
+                foreach (var key in MemoryCache
+                    .Where(x => x.Key.InvariantStartsWith(keyStartsWith))
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }            
+        }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            using (new WriteLock(_locker))
+            {
+                foreach (var key in MemoryCache
+                    .Where(x => Regex.IsMatch(x.Key, regexString))
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }     
+        }
+
+        #endregion
+
+        #region Get
+
+        public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            KeyValuePair<string, object>[] entries;
+            using (new ReadLock(_locker))
+            {
+                entries = MemoryCache
+                    .Where(x => x.Key.InvariantStartsWith(keyStartsWith))
+                    .ToArray(); // evaluate while locked
+            }
+            return entries
+                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Where(x => x != null) // backward compat, don't store null values in the cache
+                .ToList();
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            KeyValuePair<string, object>[] entries;
+            using (new ReadLock(_locker))
+            {
+                entries = MemoryCache
+                    .Where(x => Regex.IsMatch(x.Key, regexString))
+                    .ToArray(); // evaluate while locked
+            }
+            return entries
+                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Where(x => x != null) // backward compat, don't store null values in the cache
+                .ToList();
+        }
+
+        public object GetCacheItem(string cacheKey)
+        {
+            Lazy<object> result;
+            using (new ReadLock(_locker))
+            {
+                result = MemoryCache.Get(cacheKey) as Lazy<object>; // null if key not found
+            }
+            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, getCacheItem, null);
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal,CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            // see notes in HttpRuntimeCacheProvider
+
+            Lazy<object> result;
+
+            using (var lck = new UpgradeableReadLock(_locker))
+            {
+                result = MemoryCache.Get(cacheKey) as Lazy<object>;
+                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = new Lazy<object>(getCacheItem);
+                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+
+                    lck.UpgradeToWriteLock();
+                    MemoryCache.Set(cacheKey, result, policy);
+                }
+            }
+
+            return result.Value;
+        }
+
+        #endregion
+
+        #region Insert
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
+            // and make sure we don't store a null value.
+
+            var result = new Lazy<object>(getCacheItem);
+            var value = result.Value; // force evaluation now
+            if (value == null) return; // do not store null values (backward compat)
+
+            var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+            MemoryCache.Set(cacheKey, result, policy);
+        }
+
+        #endregion
+
+        private static CacheItemPolicy GetPolicy(TimeSpan? timeout = null, bool isSliding = false, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            var absolute = isSliding ? ObjectCache.InfiniteAbsoluteExpiration : (timeout == null ? ObjectCache.InfiniteAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
+            var sliding = isSliding == false ? ObjectCache.NoSlidingExpiration : (timeout ?? ObjectCache.NoSlidingExpiration);
+
+            var policy = new CacheItemPolicy
+            {
+                AbsoluteExpiration = absolute,
+                SlidingExpiration = sliding
+            };
+
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                policy.ChangeMonitors.Add(new HostFileChangeMonitor(dependentFiles.ToList()));
+            }
+            
+            if (removedCallback != null)
+            {
+                policy.RemovedCallback = arguments =>
+                {
+                    //convert the reason
+                    var reason = CacheItemRemovedReason.Removed;
+                    switch (arguments.RemovedReason)
+                    {
+                        case CacheEntryRemovedReason.Removed:
+                            reason = CacheItemRemovedReason.Removed;
+                            break;
+                        case CacheEntryRemovedReason.Expired:
+                            reason = CacheItemRemovedReason.Expired;
+                            break;
+                        case CacheEntryRemovedReason.Evicted:
+                            reason = CacheItemRemovedReason.Underused;
+                            break;
+                        case CacheEntryRemovedReason.ChangeMonitorChanged:
+                            reason = CacheItemRemovedReason.Expired;
+                            break;
+                        case CacheEntryRemovedReason.CacheSpecificEviction:
+                            reason = CacheItemRemovedReason.Underused;
+                            break;
+                    }
+                    //call the callback
+                    removedCallback(arguments.CacheItem.Key, arguments.CacheItem.Value, reason);
+                };
+            }
+            return policy;
+        }
+        
+    }
+}

src/Umbraco.Core/Cache/RuntimeCacheProviderBase.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Text;
-using System.Web.Caching;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a runtime cache provider
-    /// </summary>
-    /// <remarks>
-    /// THIS MUST REMAIN INTERNAL UNTIL WE STREAMLINE HOW ALL CACHE IS HANDLED, WE NEED TO SUPPORT HTTP RUNTIME CACHE, IN MEMORY CACHE, ETC...
-    /// </remarks>
-    internal abstract class RuntimeCacheProviderBase : CacheProviderBase
-    {
-        public abstract T GetCacheItem<T>(string cacheKey, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract T GetCacheItem<T>(string cacheKey, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract T GetCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, Func<T> getCacheItem);
-        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
-        public abstract void InsertCacheItem<T>(string cacheKey, CacheItemPriority priority, CacheItemRemovedCallback refreshAction, CacheDependency cacheDependency, TimeSpan? timeout, Func<T> getCacheItem);
-    }
-}

src/Umbraco.Core/Cache/StaticCacheProvider.cs

@@ -10,92 +10,71 @@ namespace Umbraco.Core.Cache
     /// <summary>
     /// A cache provider that statically caches everything in an in memory dictionary
     /// </summary>
-    internal class StaticCacheProvider : CacheProviderBase
+    internal class StaticCacheProvider : ICacheProvider
     {
-        private readonly ConcurrentDictionary<string, object> _staticCache = new ConcurrentDictionary<string, object>();
+        internal readonly ConcurrentDictionary<string, object> StaticCache = new ConcurrentDictionary<string, object>();
 
-        public override void ClearAllCache()
+        public virtual void ClearAllCache()
         {
-            _staticCache.Clear();
+            StaticCache.Clear();
         }
 
-        public override void ClearCacheItem(string key)
+        public virtual void ClearCacheItem(string key)
         {
             object val;
-            _staticCache.TryRemove(key, out val);
+            StaticCache.TryRemove(key, out val);
         }
 
-        public override void ClearCacheObjectTypes(string typeName)
+        public virtual void ClearCacheObjectTypes(string typeName)
         {
-            foreach (var key in _staticCache.Keys)
-            {
-                if (_staticCache[key] != null
-                    && _staticCache[key].GetType().ToString().InvariantEquals(typeName))
-                {
-                    object val;
-                    _staticCache.TryRemove(key, out val);
-                }
-            }
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
         }
 
-        public override void ClearCacheObjectTypes<T>()
+        public virtual void ClearCacheObjectTypes<T>()
         {
-            foreach (var key in _staticCache.Keys)
-            {
-                if (_staticCache[key] != null
-                    && _staticCache[key].GetType() == typeof(T))
-                {
-                    object val;
-                    _staticCache.TryRemove(key, out val);
-                }
-            }
+            var typeOfT = typeof(T);
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
         }
 
-        public override void ClearCacheByKeySearch(string keyStartsWith)
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
         {
-            foreach (var key in _staticCache.Keys)
-            {
-                if (key.InvariantStartsWith(keyStartsWith))
-                {
-                    ClearCacheItem(key);
-                }
-            }
+            var typeOfT = typeof(T);
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
         }
 
-        public override void ClearCacheByKeyExpression(string regexString)
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
         {
-            foreach (var key in _staticCache.Keys)
-            {
-                if (Regex.IsMatch(key, regexString))
-                {
-                    ClearCacheItem(key);
-                }
-            }
+            StaticCache.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
         }
 
-        public override IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        public virtual void ClearCacheByKeyExpression(string regexString)
         {
-            return (from KeyValuePair<string, object> c in _staticCache
+            StaticCache.RemoveAll(kvp => Regex.IsMatch(kvp.Key, regexString)); 
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return (from KeyValuePair<string, object> c in StaticCache
                     where c.Key.InvariantStartsWith(keyStartsWith)
-                    select c.Value.TryConvertTo<T>()
-                    into attempt
-                    where attempt.Success
-                    select attempt.Result).ToList();
+                    select c.Value).ToList();
         }
 
-        public override T GetCacheItem<T>(string cacheKey)
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
         {
-            var result = _staticCache[cacheKey];
-            if (result == null)
-            {
-                return default(T);
-            }
-            return result.TryConvertTo<T>().Result;
+            return (from KeyValuePair<string, object> c in StaticCache
+                    where Regex.IsMatch(c.Key, regexString) 
+                    select c.Value).ToList();
         }
 
-        public override T GetCacheItem<T>(string cacheKey, Func<T> getCacheItem)
+        public virtual object GetCacheItem(string cacheKey)
         {
-            return (T)_staticCache.GetOrAdd(cacheKey, getCacheItem);
+            var result = StaticCache[cacheKey];
+            return result;
+        }
+
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return StaticCache.GetOrAdd(cacheKey, key => getCacheItem());
         }
         
     }

src/Umbraco.Core/CacheHelper.cs

@@ -12,195 +12,130 @@ using Umbraco.Core.Logging;
 namespace Umbraco.Core
 {
 
-	/// <summary>
-	/// Class that is exposed by the ApplicationContext for application wide caching purposes
-	/// </summary>
+    /// <summary>
+    /// Class that is exposed by the ApplicationContext for application wide caching purposes
+    /// </summary>
     public class CacheHelper
-	{
-	    private readonly bool _enableCache;
-        private readonly CacheProviderBase _staticCache;
-        private readonly CacheProviderBase _nullStaticCache = new NullCacheProvider();
-        private readonly RuntimeCacheProviderBase _httpCache;
-        private readonly RuntimeCacheProviderBase _nullHttpCache = new NullCacheProvider();
+    {
+        private readonly bool _enableCache;
+        private readonly ICacheProvider _requestCache;
+        private readonly ICacheProvider _nullRequestCache = new NullCacheProvider();
+        private readonly ICacheProvider _staticCache;
+        private readonly ICacheProvider _nullStaticCache = new NullCacheProvider();
+        private readonly IRuntimeCacheProvider _httpCache;
+        private readonly IRuntimeCacheProvider _nullHttpCache = new NullCacheProvider();
 
-		public CacheHelper(System.Web.Caching.Cache cache)
-            : this(cache, true)
-		{
-		}
+        /// <summary>
+        /// Creates a cache helper with disabled caches
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// Good for unit testing
+        /// </remarks>
+        public static CacheHelper CreateDisabledCacheHelper()
+        {
+            return new CacheHelper(null, null, null, false);
+        }
 
-	    internal CacheHelper(System.Web.Caching.Cache cache, bool enableCache)
-            : this(new HttpRuntimeCacheProvider(cache), enableCache)
-	    {            
-	    }
-
-        internal CacheHelper(RuntimeCacheProviderBase httpCacheProvider, bool enableCache)
-            : this(httpCacheProvider, new StaticCacheProvider(), enableCache)
+        /// <summary>
+        /// Initializes a new instance for use in the web
+        /// </summary>
+        public CacheHelper()
+            : this(
+                new HttpRuntimeCacheProvider(HttpRuntime.Cache),
+                new StaticCacheProvider(),
+                new HttpRequestCacheProvider())
         {
         }
 
-        internal CacheHelper(RuntimeCacheProviderBase httpCacheProvider, CacheProviderBase staticCacheProvider, bool enableCache)
+        /// <summary>
+        /// Initializes a new instance for use in the web
+        /// </summary>
+        /// <param name="cache"></param>
+        public CacheHelper(System.Web.Caching.Cache cache)
+            : this(
+                new HttpRuntimeCacheProvider(cache),
+                new StaticCacheProvider(),
+                new HttpRequestCacheProvider())
         {
-            _httpCache = httpCacheProvider;
-            _staticCache = staticCacheProvider;
+        }
+
+        /// <summary>
+        /// Initializes a new instance based on the provided providers
+        /// </summary>
+        /// <param name="httpCacheProvider"></param>
+        /// <param name="staticCacheProvider"></param>
+        /// <param name="requestCacheProvider"></param>
+        public CacheHelper(
+            IRuntimeCacheProvider httpCacheProvider,
+            ICacheProvider staticCacheProvider,
+            ICacheProvider requestCacheProvider)
+            : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, true)
+        {
+        }
+
+        /// <summary>
+        /// Private ctor used for creating a disabled cache helper
+        /// </summary>
+        /// <param name="httpCacheProvider"></param>
+        /// <param name="staticCacheProvider"></param>
+        /// <param name="requestCacheProvider"></param>
+        /// <param name="enableCache"></param>
+        private CacheHelper(
+            IRuntimeCacheProvider httpCacheProvider,
+            ICacheProvider staticCacheProvider,
+            ICacheProvider requestCacheProvider,
+            bool enableCache)
+        {
+            if (enableCache)
+            {
+                _httpCache = httpCacheProvider;
+                _staticCache = staticCacheProvider;
+                _requestCache = requestCacheProvider;
+            }
+            else
+            {
+                _httpCache = null;
+                _staticCache = null;
+                _requestCache = null;
+            }
+
             _enableCache = enableCache;
         }
 
-        #region Static cache
-
         /// <summary>
-        /// Clears the item in umbraco's static cache
+        /// Returns the current Request cache
         /// </summary>
-        internal void ClearAllStaticCache()
+        public ICacheProvider RequestCache
         {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearAllCache();
-            }
-            else
-            {
-                _staticCache.ClearAllCache();
-            }
+            get { return _enableCache ? _requestCache : _nullRequestCache; }
         }
 
         /// <summary>
-        /// Clears the item in umbraco's static cache with the given key 
+        /// Returns the current Runtime cache
         /// </summary>
-        /// <param name="key">Key</param>
-        internal void ClearStaticCacheItem(string key)
+        public ICacheProvider StaticCache
         {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheItem(key);
-            }
-            else
-            {
-                _staticCache.ClearCacheItem(key);
-            }
+            get { return _enableCache ? _staticCache : _nullStaticCache; }
         }
 
         /// <summary>
-        /// Clears all objects in the static cache with the System.Type name as the
-        /// input parameter. (using [object].GetType())
+        /// Returns the current Runtime cache
         /// </summary>
-        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
-        internal void ClearStaticCacheObjectTypes(string typeName)
+        public IRuntimeCacheProvider RuntimeCache
         {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheObjectTypes(typeName);
-            }
-            else
-            {
-                _staticCache.ClearCacheObjectTypes(typeName);
-            }
+            get { return _enableCache ? _httpCache : _nullHttpCache; }
         }
 
-        /// <summary>
-        /// Clears all objects in the static cache with the System.Type specified
-        /// </summary>
-        internal void ClearStaticCacheObjectTypes<T>()
-        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheObjectTypes<T>();
-            }
-            else
-            {
-                _staticCache.ClearCacheObjectTypes<T>();
-            }
-        }
+        #region Legacy Runtime/Http Cache accessors
 
-        /// <summary>
-        /// Clears all static cache items that starts with the key passed.
-        /// </summary>
-        /// <param name="keyStartsWith">The start of the key</param>
-        internal void ClearStaticCacheByKeySearch(string keyStartsWith)
-        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheByKeySearch(keyStartsWith);
-            }
-            else
-            {
-                _staticCache.ClearCacheByKeySearch(keyStartsWith);
-            }
-        }
-
-        /// <summary>
-        /// Clears all cache items that have a key that matches the regular expression
-        /// </summary>
-        /// <param name="regexString"></param>
-        internal void ClearStaticCacheByKeyExpression(string regexString)
-        {
-            if (!_enableCache)
-            {
-                _nullStaticCache.ClearCacheByKeyExpression(regexString);
-            }
-            else
-            {
-                _staticCache.ClearCacheByKeyExpression(regexString);
-            }
-        }
-
-        internal IEnumerable<T> GetStaticCacheItemsByKeySearch<T>(string keyStartsWith)
-        {
-            if (!_enableCache)
-            {
-                return _nullStaticCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
-            }
-            else
-            {
-                return _staticCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
-            }
-        }
-
-        /// <summary>
-        /// Returns a static cache item by key, does not update the cache if it isn't there.
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        internal TT GetStaticCacheItem<TT>(string cacheKey)
-        {
-            if (!_enableCache)
-            {
-                return _nullStaticCache.GetCacheItem<TT>(cacheKey);
-            }
-            else
-            {
-                return _staticCache.GetCacheItem<TT>(cacheKey);
-            }
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the static cache with all of the default parameters
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        internal TT GetStaticCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
-        {
-            if (!_enableCache)
-            {
-                return _nullStaticCache.GetCacheItem<TT>(cacheKey, getCacheItem);
-            }
-            else
-            {
-                return _staticCache.GetCacheItem<TT>(cacheKey, getCacheItem);
-            }
-        }
-
-        #endregion
-
-
-	    #region Runtime/Http Cache
         /// <summary>
         /// Clears the item in umbraco's runtime cache
         /// </summary>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public void ClearAllCache()
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 _nullHttpCache.ClearAllCache();
             }
@@ -214,9 +149,10 @@ namespace Umbraco.Core
         /// Clears the item in umbraco's runtime cache with the given key 
         /// </summary>
         /// <param name="key">Key</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public void ClearCacheItem(string key)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 _nullHttpCache.ClearCacheItem(key);
             }
@@ -232,9 +168,10 @@ namespace Umbraco.Core
         /// 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>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public void ClearCacheObjectTypes(string typeName)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 _nullHttpCache.ClearCacheObjectTypes(typeName);
             }
@@ -247,9 +184,10 @@ namespace Umbraco.Core
         /// <summary>
         /// Clears all objects in the System.Web.Cache with the System.Type specified
         /// </summary>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public void ClearCacheObjectTypes<T>()
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 _nullHttpCache.ClearCacheObjectTypes<T>();
             }
@@ -263,9 +201,10 @@ namespace Umbraco.Core
         /// Clears all cache items that starts with the key passed.
         /// </summary>
         /// <param name="keyStartsWith">The start of the key</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public void ClearCacheByKeySearch(string keyStartsWith)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 _nullHttpCache.ClearCacheByKeySearch(keyStartsWith);
             }
@@ -279,9 +218,10 @@ namespace Umbraco.Core
         /// Clears all cache items that have a key that matches the regular expression
         /// </summary>
         /// <param name="regexString"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public void ClearCacheByKeyExpression(string regexString)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 _nullHttpCache.ClearCacheByKeyExpression(regexString);
             }
@@ -291,9 +231,10 @@ namespace Umbraco.Core
             }
         }
 
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 return _nullHttpCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
             }
@@ -309,9 +250,10 @@ namespace Umbraco.Core
         /// <typeparam name="TT"></typeparam>
         /// <param name="cacheKey"></param>
         /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public TT GetCacheItem<TT>(string cacheKey)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 return _nullHttpCache.GetCacheItem<TT>(cacheKey);
             }
@@ -328,9 +270,10 @@ namespace Umbraco.Core
         /// <param name="cacheKey"></param>
         /// <param name="getCacheItem"></param>
         /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
                 return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem);
             }
@@ -348,16 +291,17 @@ namespace Umbraco.Core
         /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
         /// <param name="getCacheItem"></param>
         /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public TT GetCacheItem<TT>(string cacheKey,
             TimeSpan timeout, Func<TT> getCacheItem)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, timeout, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
             }
             else
             {
-                return _httpCache.GetCacheItem<TT>(cacheKey, timeout, getCacheItem);
+                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
             }
         }
 
@@ -370,17 +314,18 @@ namespace Umbraco.Core
         /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
         /// <param name="getCacheItem"></param>
         /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public TT GetCacheItem<TT>(string cacheKey,
             CacheItemRemovedCallback refreshAction, TimeSpan timeout,
             Func<TT> getCacheItem)
         {
             if (!_enableCache)
             {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, refreshAction, timeout, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
             }
             else
             {
-                return _httpCache.GetCacheItem<TT>(cacheKey, refreshAction, timeout, getCacheItem);
+                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
             }
         }
 
@@ -394,17 +339,18 @@ namespace Umbraco.Core
         /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
         /// <param name="getCacheItem"></param>
         /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
         public TT GetCacheItem<TT>(string cacheKey,
             CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
             Func<TT> getCacheItem)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, timeout, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
             }
             else
             {
-                return _httpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, timeout, getCacheItem);
+                return _httpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
             }
         }
 
@@ -419,6 +365,7 @@ namespace Umbraco.Core
         /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
         /// <param name="getCacheItem"></param>
         /// <returns></returns>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
         public TT GetCacheItem<TT>(string cacheKey,
             CacheItemPriority priority,
             CacheItemRemovedCallback refreshAction,
@@ -426,13 +373,19 @@ namespace Umbraco.Core
             TimeSpan timeout,
             Func<TT> getCacheItem)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction, null);
             }
             else
             {
-                return _httpCache.GetCacheItem<TT>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+                var cache = _httpCache as HttpRuntimeCacheProvider;
+                if (cache != null)
+                {
+                    var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+                    return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
+                }
+                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
             }
         }
 
@@ -445,6 +398,7 @@ namespace Umbraco.Core
         /// <param name="cacheDependency"></param>
         /// <param name="getCacheItem"></param>
         /// <returns></returns>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
         public TT GetCacheItem<TT>(string cacheKey,
             CacheItemPriority priority,
             CacheDependency cacheDependency,
@@ -452,11 +406,17 @@ namespace Umbraco.Core
         {
             if (!_enableCache)
             {
-                return _nullHttpCache.GetCacheItem<TT>(cacheKey, priority, null, cacheDependency, null, getCacheItem);
+                return _nullHttpCache.GetCacheItem<TT>(cacheKey, getCacheItem, null, false, priority, null, null);
             }
             else
             {
-                return _httpCache.GetCacheItem<TT>(cacheKey, priority, null, cacheDependency, null, getCacheItem);
+                var cache = _httpCache as HttpRuntimeCacheProvider;
+                if (cache != null)
+                {
+                    var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency);
+                    return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
+                }
+                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
             }
         }
 
@@ -471,13 +431,13 @@ namespace Umbraco.Core
                                        CacheItemPriority priority,
                                        Func<T> getCacheItem)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, getCacheItem);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
             }
             else
             {
-                _httpCache.InsertCacheItem<T>(cacheKey, priority, getCacheItem);
+                _httpCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
             }
         }
 
@@ -494,13 +454,13 @@ namespace Umbraco.Core
                                        TimeSpan timeout,
                                        Func<T> getCacheItem)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, timeout, getCacheItem);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
             }
             else
             {
-                _httpCache.InsertCacheItem<T>(cacheKey, priority, timeout, getCacheItem);
+                _httpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
             }
         }
 
@@ -513,19 +473,25 @@ namespace Umbraco.Core
         /// <param name="cacheDependency"></param>
         /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
         /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
         public void InsertCacheItem<T>(string cacheKey,
                                        CacheItemPriority priority,
                                        CacheDependency cacheDependency,
                                        TimeSpan timeout,
                                        Func<T> getCacheItem)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, cacheDependency, timeout, getCacheItem);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority, dependentFiles: null);
             }
             else
             {
-                _httpCache.InsertCacheItem<T>(cacheKey, priority, cacheDependency, timeout, getCacheItem);
+                var cache = _httpCache as HttpRuntimeCacheProvider;
+                if (cache != null)
+                {
+                    cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency);
+                }
+                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
             }
         }
 
@@ -539,6 +505,7 @@ namespace Umbraco.Core
         /// <param name="cacheDependency"></param>
         /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
         /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
         public void InsertCacheItem<T>(string cacheKey,
                                        CacheItemPriority priority,
                                        CacheItemRemovedCallback refreshAction,
@@ -546,17 +513,22 @@ namespace Umbraco.Core
                                        TimeSpan? timeout,
                                        Func<T> getCacheItem)
         {
-            if (!_enableCache)
+            if (_enableCache == false)
             {
-                _nullHttpCache.InsertCacheItem<T>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+                _nullHttpCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, false, priority, refreshAction, null);
             }
             else
             {
-                _httpCache.InsertCacheItem<T>(cacheKey, priority, refreshAction, cacheDependency, timeout, getCacheItem);
+                var cache = _httpCache as HttpRuntimeCacheProvider;
+                if (cache != null)
+                {
+                    cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+                }
+                throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
             }
-        } 
+        }
         #endregion
 
-	}
+    }
 
 }

src/Umbraco.Core/CacheRefreshersResolver.cs

@@ -27,7 +27,7 @@ namespace Umbraco.Core
 		/// <summary>
 		/// Gets the <see cref="ICacheRefresher"/> implementations.
 		/// </summary>
-		public IEnumerable<ICacheRefresher> CacheResolvers
+		public IEnumerable<ICacheRefresher> CacheRefreshers
 		{
 			get
 			{

src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs

@@ -16,7 +16,7 @@ namespace Umbraco.Core.Configuration
         }
 
         /// <summary>
-        /// Increases the version number in ClientDependency.config by 1
+        /// Changes the version number in ClientDependency.config to a random value to avoid stale caches
         /// </summary>
         internal bool IncreaseVersionNumber()
         {
@@ -28,9 +28,9 @@ namespace Umbraco.Core.Configuration
 
                     var versionAttribute = clientDependencyConfigXml.Root.Attribute("version");
 
-                    int oldVersion;
-                    int.TryParse(versionAttribute.Value, out oldVersion);
-                    var newVersion = oldVersion + 1;
+                    //Set the new version to the hashcode of now
+                    var oldVersion = versionAttribute.Value;
+                    var newVersion = Math.Abs(DateTime.UtcNow.GetHashCode());
 
                     versionAttribute.SetValue(newVersion);
                     clientDependencyConfigXml.Save(_fileName, SaveOptions.DisableFormatting);

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -5,10 +5,13 @@ using System.Linq;
 using System.Web;
 using System.Web.Configuration;
 using System.Web.Routing;
+using System.Web.Security;
 using System.Xml;
 using System.Xml.Linq;
+using System.Xml.XPath;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Security;
 
 namespace Umbraco.Core.Configuration
 {
@@ -175,7 +178,10 @@ namespace Umbraco.Core.Configuration
                 {
                     throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
                 }
-			    return Path.TrimStart(SystemDirectories.Root).TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+                var path = Path;
+                if (path.StartsWith(SystemDirectories.Root)) // beware of TrimStart, see U4-2518
+                    path = path.Substring(SystemDirectories.Root.Length);
+			    return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
             }
         }
 
@@ -197,7 +203,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the database connection string
         /// </summary>
         /// <value>The database connection string.</value>
-        [Obsolete("Use System.ConfigurationManager.ConnectionStrings to get the connection with the key Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName instead")]
+        [Obsolete("Use System.Configuration.ConfigurationManager.ConnectionStrings[\"umbracoDbDSN\"] instead")]
         public static string DbDsn
         {
             get
@@ -209,7 +215,7 @@ namespace Umbraco.Core.Configuration
                 {
                     connectionString = settings.ConnectionString;
 
-                    // The SqlCe connectionString is formatted slightly differently, so we need to updat it
+                    // The SqlCe connectionString is formatted slightly differently, so we need to update it
                     if (settings.ProviderName.Contains("SqlServerCe"))
                         connectionString = string.Format("datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;{0}", connectionString);
                 }
@@ -252,7 +258,38 @@ namespace Umbraco.Core.Configuration
                 SaveSetting("umbracoConfigurationStatus", value);
             }
         }
-
+        
+        /// <summary>
+        /// Gets or sets the Umbraco members membership providers' useLegacyEncoding state. This will return a boolean
+        /// </summary>
+        /// <value>The useLegacyEncoding status.</value>
+        public static bool UmbracoMembershipProviderLegacyEncoding
+        {
+            get
+            {
+                return IsConfiguredMembershipProviderUsingLegacyEncoding(Constants.Conventions.Member.UmbracoMemberProviderName);
+            }
+            set
+            {
+                SetMembershipProvidersLegacyEncoding(Constants.Conventions.Member.UmbracoMemberProviderName, value);
+            }
+        }
+        
+        /// <summary>
+        /// Gets or sets the Umbraco users membership providers' useLegacyEncoding state. This will return a boolean
+        /// </summary>
+        /// <value>The useLegacyEncoding status.</value>
+        public static bool UmbracoUsersMembershipProviderLegacyEncoding
+        {
+            get
+            {
+                return IsConfiguredMembershipProviderUsingLegacyEncoding(UmbracoSettings.DefaultBackofficeProvider);
+            }
+            set
+            {
+                SetMembershipProvidersLegacyEncoding(UmbracoSettings.DefaultBackofficeProvider, value);
+            }
+        }
 		
         /// <summary>
         /// Saves a setting into the configuration file.
@@ -312,6 +349,38 @@ namespace Umbraco.Core.Configuration
             return fileName;
         }
 
+        private static void SetMembershipProvidersLegacyEncoding(string providerName, bool useLegacyEncoding)
+        {
+            var webConfigFilename = GetFullWebConfigFileName();
+            var webConfigXml = XDocument.Load(webConfigFilename, LoadOptions.PreserveWhitespace);
+
+            var membershipConfigs = webConfigXml.XPathSelectElements("configuration/system.web/membership/providers/add").ToList();
+
+            if (membershipConfigs.Any() == false) 
+                return;
+
+            var provider = membershipConfigs.SingleOrDefault(c => c.Attribute("name") != null && c.Attribute("name").Value == providerName);
+
+            if (provider == null) 
+                return;
+
+            provider.SetAttributeValue("useLegacyEncoding", useLegacyEncoding);
+            
+            webConfigXml.Save(webConfigFilename, SaveOptions.DisableFormatting);
+        }
+
+        private static bool IsConfiguredMembershipProviderUsingLegacyEncoding(string providerName)
+        {
+            //check if this can even be configured.
+            var membershipProvider = Membership.Providers[providerName] as MembershipProviderBase;
+            if (membershipProvider == null)
+            {
+                return false;
+            }
+
+            return membershipProvider.UseLegacyEncoding;
+        }
+
         /// <summary>
         /// Gets the full path to root.
         /// </summary>
@@ -701,8 +770,12 @@ namespace Umbraco.Core.Configuration
                         StartsWithContainer _newReservedList = new StartsWithContainer();
                         foreach (string reservedUrl in _reservedUrlsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
                         {
+                            if (string.IsNullOrWhiteSpace(reservedUrl))
+                               continue;
+                            
+
                             //resolves the url to support tilde chars
-                            string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl).Trim().ToLower();
+                            string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl.Trim()).Trim().ToLower();
                             if (reservedUrlTrimmed.Length > 0)
                                 _newReservedList.Add(reservedUrlTrimmed);
                         }
@@ -710,8 +783,11 @@ namespace Umbraco.Core.Configuration
                         foreach (string reservedPath in _reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
                         {
                             bool trimEnd = !reservedPath.EndsWith("/");
+                            if (string.IsNullOrWhiteSpace(reservedPath))
+                                continue;
+                           
                             //resolves the url to support tilde chars
-                            string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath).Trim().ToLower();
+                            string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath.Trim()).Trim().ToLower();
 
                             if (reservedPathTrimmed.Length > 0)
                                 _newReservedList.Add(reservedPathTrimmed + (reservedPathTrimmed.EndsWith("/") ? "" : "/"));

src/Umbraco.Core/Configuration/UmbracoSettings.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Web;
 using System.Web.Caching;
+using System.Web.Security;
 using System.Xml;
 using System.Configuration;
 
@@ -299,6 +300,32 @@ namespace Umbraco.Core.Configuration
             }
         }
 
+        internal static string AuthCookieName
+        {
+            get
+            {
+                var value = GetKey("/settings/security/authCookieName");
+                if (string.IsNullOrEmpty(value) == false)
+                {
+                    return value;
+                }
+                return Constants.Web.AuthCookieName;
+            }
+        }
+
+        internal static string AuthCookieDomain
+        {
+            get
+            {
+                var value = GetKey("/settings/security/authCookieDomain");
+                if (string.IsNullOrEmpty(value) == false)
+                {
+                    return value;
+                }
+                return FormsAuthentication.CookieDomain;
+            }
+        }
+
         /// <summary>
         /// Enables the experimental canvas (live) editing on the frontend of the website
         /// </summary>
@@ -475,8 +502,12 @@ namespace Umbraco.Core.Configuration
 			}
 		}
 
-		//TODO: I"m not sure why we need this, need to ask Gareth what the deal is, pretty sure we can remove it or change it, seems like
-		// massive overkill.
+        // we have that one because we auto-discover when a property is "xml" and should be returned by Razor as
+        // dynamic xml. But, stuff such as "<p>hello</p>" can be parsed into xml and would be returned as xml,
+        // unless <p> has been defined in the exclusion list... this is dirty and not-efficient, we should at least
+        // cache the list somewhere!
+        //
+        // TODO get rid of that whole dynamic xml mess
 
 		/// <summary>
 		/// razor DynamicNode typecasting detects XML and returns DynamicXml - Root elements that won't convert to DynamicXml
@@ -487,12 +518,10 @@ namespace Umbraco.Core.Configuration
 			{
 				try
 				{
-					List<string> items = new List<string>();
-					XmlNode root = GetKeyAsNode("/settings/scripting/razor/notDynamicXmlDocumentElements");
-					foreach (XmlNode element in root.SelectNodes(".//element"))
-					{
-						items.Add(element.InnerText);
-					}
+					var items = new List<string>();
+					var root = GetKeyAsNode("/settings/scripting/razor/notDynamicXmlDocumentElements");
+                    if (root != null)
+                        items.AddRange(root.SelectNodes(".//element").Cast<XmlNode>().Select(n => n.InnerText));
 					return items;
 				}
 				catch
@@ -629,7 +658,7 @@ namespace Umbraco.Core.Configuration
 			{
 				string defaultProvider = GetKey("/settings/providers/users/DefaultBackofficeProvider");
 				if (String.IsNullOrEmpty(defaultProvider))
-					defaultProvider = "UsersMembershipProvider";
+                    defaultProvider = "UsersMembershipProvider";
 
 				return defaultProvider;
 			}
@@ -826,6 +855,8 @@ namespace Umbraco.Core.Configuration
 		/// <summary>
 		/// Whether to replace double dashes from url (ie my--story----from--dash.aspx caused by multiple url replacement chars
 		/// </summary>
+		// was used by the legacy short string helper, is not used anymore by the new default short string helper
+        // should update documentation
         internal static bool RemoveDoubleDashesFromUrlReplacing
 		{
 			get
@@ -1052,7 +1083,7 @@ namespace Umbraco.Core.Configuration
 					bool globalPreviewEnabled = false;
 					string value = GetKey("/settings/content/GlobalPreviewStorageEnabled");
 					if (bool.TryParse(value, out globalPreviewEnabled))
-						return !globalPreviewEnabled;
+						return globalPreviewEnabled;
 					// Return default
 					return false;
 				}
@@ -1305,6 +1336,25 @@ namespace Umbraco.Core.Configuration
 			}
 		}
 
+        /// <summary>
+        /// Gets the default document type property used when adding new properties through the back-office
+        /// </summary>
+        /// <value>Configured text for the default document type property</value>
+        /// <remarks>If undefined, 'Textstring' is the default</remarks>
+        public static string DefaultDocumentTypeProperty
+        {
+            get 
+            {
+                var defaultDocumentTypeProperty = GetKey("/settings/content/defaultDocumentTypeProperty");
+                if (string.IsNullOrEmpty(defaultDocumentTypeProperty))
+                {
+                    defaultDocumentTypeProperty = "Textstring";
+                }
+
+                return defaultDocumentTypeProperty;
+            }
+        }
+
 		/// <summary>
 		/// Configuration regarding webservices
 		/// </summary>

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("6.1.0");
+        private static readonly Version Version = new Version("6.2.4");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/Constants-Conventions.cs

@@ -1,4 +1,8 @@
-namespace Umbraco.Core
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+
+namespace Umbraco.Core
 {
 	public static partial class Constants
 	{
@@ -81,7 +85,7 @@
 
 				/// <summary>
 				/// MediaType alias for a folder.
-				/// </summary>
+                /// </summary>
 				public const string Folder = "Folder";
 
 				/// <summary>
@@ -89,6 +93,176 @@
 				/// </summary>
 				public const string Image = "Image";
 			}
+            
+		    /// <summary>
+		    /// Constants for Umbraco Member property aliases.
+		    /// </summary>		    
+		    public static class Member
+		    {
+                public static readonly string UmbracoMemberProviderName = "UmbracoMembershipProvider";
+
+                public static readonly string UmbracoRoleProviderName = "UmbracoRoleProvider";
+
+                /// <summary>
+                /// Property alias for a Members Password Question
+                /// </summary>
+                public const string PasswordQuestion = "umbracoMemberPasswordRetrievalQuestion";
+
+                public const string PasswordQuestionLabel = "Password Question";
+
+                /// <summary>
+                /// Property alias for Members Password Answer
+                /// </summary>
+                public const string PasswordAnswer = "umbracoMemberPasswordRetrievalAnswer";
+
+                public const string PasswordAnswerLabel = "Password Answer";
+
+                /// <summary>
+                /// Property alias for the Comments on a Member
+                /// </summary>
+                public const string Comments = "umbracoMemberComments";
+
+                public const string CommentsLabel = "Comments";
+
+                /// <summary>
+                /// Property alias for the Approved boolean of a Member
+                /// </summary>
+                public const string IsApproved = "umbracoMemberApproved";
+
+                public const string IsApprovedLabel = "Is Approved";
+
+                /// <summary>
+                /// Property alias for the Locked out boolean of a Member
+                /// </summary>
+                public const string IsLockedOut = "umbracoMemberLockedOut";
+
+                public const string IsLockedOutLabel = "Is Locked Out";
+
+                /// <summary>
+                /// Property alias for the last date the Member logged in
+                /// </summary>
+                public const string LastLoginDate = "umbracoMemberLastLogin";
+
+                public const string LastLoginDateLabel = "Last Login Date";
+
+                /// <summary>
+                /// Property alias for the last date a Member changed its password
+                /// </summary>
+                public const string LastPasswordChangeDate = "umbracoMemberLastPasswordChangeDate";
+
+                public const string LastPasswordChangeDateLabel = "Last Password Change Date";
+
+                /// <summary>
+                /// Property alias for the last date a Member was locked out
+                /// </summary>
+                public const string LastLockoutDate = "umbracoMemberLastLockoutDate";
+
+                public const string LastLockoutDateLabel = "Last Lockout Date";
+
+                /// <summary>
+                /// Property alias for the number of failed login attemps
+                /// </summary>
+                public const string FailedPasswordAttempts = "umbracoMemberFailedPasswordAttempts";
+
+                public const string FailedPasswordAttemptsLabel = "Failed Password Attempts";
+
+                /// <summary>
+                /// Group name to put the membership properties on
+                /// </summary>
+                internal const string StandardPropertiesGroupName = "Membership";
+
+		        internal static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
+		        {
+		            return new Dictionary<string, PropertyType>
+		                {
+		                    {
+		                        Comments,
+		                        new PropertyType(new Guid(PropertyEditors.TextboxMultiple), DataTypeDatabaseType.Ntext, true)
+		                            {
+		                                Alias = Comments,
+		                                Name = CommentsLabel
+		                            }
+		                    },
+		                    {
+		                        FailedPasswordAttempts,
+		                        new PropertyType(new Guid(PropertyEditors.NoEdit), DataTypeDatabaseType.Integer, true)
+		                            {
+		                                Alias = FailedPasswordAttempts,
+		                                Name = FailedPasswordAttemptsLabel
+		                            }
+		                    },
+		                    {
+		                        IsApproved,
+		                        new PropertyType(new Guid(PropertyEditors.TrueFalse), DataTypeDatabaseType.Integer, true)
+		                            {
+		                                Alias = IsApproved,
+		                                Name = IsApprovedLabel
+		                            }
+		                    },
+		                    {
+		                        IsLockedOut,
+		                        new PropertyType(new Guid(PropertyEditors.TrueFalse), DataTypeDatabaseType.Integer, true)
+		                            {
+		                                Alias = IsLockedOut,
+		                                Name = IsLockedOutLabel
+		                            }
+		                    },
+		                    {
+		                        LastLockoutDate,
+		                        new PropertyType(new Guid(PropertyEditors.NoEdit), DataTypeDatabaseType.Date, true)
+		                            {
+		                                Alias = LastLockoutDate,
+		                                Name = LastLockoutDateLabel
+		                            }
+		                    },
+		                    {
+		                        LastLoginDate,
+		                        new PropertyType(new Guid(PropertyEditors.NoEdit), DataTypeDatabaseType.Date, true)
+		                            {
+		                                Alias = LastLoginDate,
+		                                Name = LastLoginDateLabel
+		                            }
+		                    },
+		                    {
+		                        LastPasswordChangeDate,
+		                        new PropertyType(new Guid(PropertyEditors.NoEdit), DataTypeDatabaseType.Date, true)
+		                            {
+		                                Alias = LastPasswordChangeDate,
+		                                Name = LastPasswordChangeDateLabel
+		                            }
+		                    },
+		                    {
+		                        PasswordAnswer,
+		                        new PropertyType(new Guid(PropertyEditors.NoEdit), DataTypeDatabaseType.Nvarchar, true)
+		                            {
+		                                Alias = PasswordAnswer,
+		                                Name = PasswordAnswerLabel
+		                            }
+		                    },
+		                    {
+		                        PasswordQuestion,
+		                        new PropertyType(new Guid(PropertyEditors.NoEdit), DataTypeDatabaseType.Nvarchar, true)
+		                            {
+		                                Alias = PasswordQuestion,
+		                                Name = PasswordQuestionLabel
+		                            }
+		                    }
+		                };
+		        } 
+		    }
+
+			/// <summary>
+			/// Defines the alias identifiers for Umbraco member types.
+			/// </summary>
+			public static class MemberTypes
+			{
+				/// <summary>
+				/// MemberType alias for default member type.
+				/// </summary>
+				public const string Member = "Member";
+
+                public const string SystemDefaultProtectType = "_umbracoSystemDefaultProtectType";
+			}
 
 			/// <summary>
 			/// Constants for Umbraco URLs/Querystrings.

src/Umbraco.Core/Constants-Packaging.cs

@@ -0,0 +1,51 @@
+namespace Umbraco.Core
+{
+    public static partial class Constants
+	{
+        /// <summary>
+        /// Defines the constants used for Umbraco packages in the package.config xml
+        /// </summary>
+        public static class Packaging
+        {
+            public const string UmbPackageNodeName = "umbPackage";
+            public const string DataTypesNodeName = "DataTypes";
+            public const string PackageXmlFileName = "package.xml";
+            public const string UmbracoPackageExtention = ".umb";
+            public const string DataTypeNodeName = "DataType";
+            public const string LanguagesNodeName = "Languages";
+            public const string FilesNodeName = "Files";
+            public const string StylesheetsNodeName = "Stylesheets";
+            public const string TemplatesNodeName = "Templates";
+            public const string OrgnameNodeName = "orgName";
+            public const string NameNodeName = "Name";
+            public const string TemplateNodeName = "Template";
+            public const string AliasNodeName = "Alias";
+            public const string DictionaryitemsNodeName = "DictionaryItems";
+            public const string MacrosNodeName = "macros";
+            public const string DocumentSetNodeName = "DocumentSet";
+            public const string DocumentTypesNodeName = "DocumentTypes";
+            public const string DocumentTypeNodeName = "DocumentType";
+            public const string FileNodeName = "file";
+            public const string OrgPathNodeName = "orgPath";
+            public const string GuidNodeName = "guid";
+            public const string StylesheetNodeName = "styleSheet";
+            public const string MacroNodeName = "macro";
+            public const string InfoNodeName = "info";
+            public const string PackageRequirementsMajorXpath = "/package/requirements/major";
+            public const string PackageRequirementsMinorXpath = "/package/requirements/minor";
+            public const string PackageRequirementsPatchXpath = "/package/requirements/patch";
+            public const string PackageNameXpath = "/package/name";
+            public const string PackageVersionXpath = "/package/version";
+            public const string PackageUrlXpath = "/package/url";
+            public const string PackageLicenseXpath = "/package/license";
+            public const string AuthorNameXpath = "/author/name";
+            public const string AuthorWebsiteXpath = "/author/website";
+            public const string ReadmeXpath = "/readme";
+            public const string ControlNodeName = "control";
+            public const string ActionNodeName = "Action";
+            public const string ActionsNodeName = "Actions";
+            public const string UndoNodeAttribute = "undo";
+            public const string RunatNodeAttribute = "runat";
+        }
+	}
+}

src/Umbraco.Core/Constants-Web.cs

@@ -0,0 +1,22 @@
+namespace Umbraco.Core
+{
+	public static partial class Constants
+	{		
+        /// <summary>
+        /// Defines the identifiers for Umbraco system nodes.
+        /// </summary>
+        public static class Web
+        {
+            /// <summary>
+            /// The preview cookie name
+            /// </summary>
+            public const string PreviewCookieName = "UMB_PREVIEW";
+
+            /// <summary>
+            /// The auth cookie name
+            /// </summary>
+            public const string AuthCookieName = "UMB_UCONTEXT";
+
+        }
+	}
+}

src/Umbraco.Core/ControlExtensions.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.UI;
+
+namespace Umbraco.Core
+{
+    internal static class ControlExtensions
+    {
+        /// <summary>
+        /// Recursively finds a control with the specified identifier.
+        /// </summary>
+        /// <typeparam name="T">
+        /// The type of control to be found.
+        /// </typeparam>
+        /// <param name="parent">
+        /// The parent control from which the search will start.
+        /// </param>
+        /// <param name="id">
+        /// The identifier of the control to be found.
+        /// </param>
+        /// <returns>
+        /// The control with the specified identifier, otherwise <see langword="null"/> if the control 
+        /// is not found.
+        /// </returns>
+        public static T FindControlRecursive<T>(this Control parent, string id) where T : Control
+        {
+            if ((parent is T) && (parent.ID == id))
+            {
+                return (T)parent;
+            }
+
+            foreach (Control control in parent.Controls)
+            {
+                var foundControl = FindControlRecursive<T>(control, id);
+                if (foundControl != null)
+                {
+                    return foundControl;
+                }
+            }
+            return default(T);
+        }
+
+    }
+}

src/Umbraco.Core/CoreBootManager.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;
@@ -12,6 +14,7 @@ using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Publishing;
 using Umbraco.Core.Macros;
 using Umbraco.Core.Services;
@@ -36,6 +39,7 @@ namespace Umbraco.Core
 		private bool _isComplete = false;
         private readonly UmbracoApplicationBase _umbracoApplication;
 		protected ApplicationContext ApplicationContext { get; private set; }
+        protected CacheHelper ApplicationCache { get; set; }
 
 	    protected UmbracoApplicationBase UmbracoApplication
 	    {
@@ -55,16 +59,19 @@ namespace Umbraco.Core
 
 	        InitializeProfilerResolver();
 
+            CreateApplicationCache();
+
             _timer = DisposableTimer.DebugDuration<CoreBootManager>("Umbraco application starting", "Umbraco application startup complete");
 
 			//create database and service contexts for the app context
 			var dbFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName);
 		    Database.Mapper = new PetaPocoMapper();
 			var dbContext = new DatabaseContext(dbFactory);
-			var serviceContext = new ServiceContext(
-				new PetaPocoUnitOfWorkProvider(dbFactory), 
-				new FileUnitOfWorkProvider(), 
-				new PublishingStrategy());
+            var serviceContext = new ServiceContext(
+                new PetaPocoUnitOfWorkProvider(dbFactory),
+                new FileUnitOfWorkProvider(),
+                new PublishingStrategy(),
+                ApplicationCache);
 
             CreateApplicationContext(dbContext, serviceContext);
 
@@ -92,7 +99,21 @@ namespace Umbraco.Core
         protected virtual void CreateApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
         {
             //create the ApplicationContext
-            ApplicationContext = ApplicationContext.Current = new ApplicationContext(dbContext, serviceContext);
+            ApplicationContext = ApplicationContext.Current = new ApplicationContext(dbContext, serviceContext, ApplicationCache);
+        }
+
+        /// <summary>
+        /// Creates and assigns the ApplicationCache based on a new instance of System.Web.Caching.Cache
+        /// </summary>
+        protected virtual void CreateApplicationCache()
+        {
+            var cacheHelper = new CacheHelper(
+                        new ObjectCacheRuntimeCacheProvider(),
+                        new StaticCacheProvider(),
+                //we have no request based cache when not running in web-based context
+                        new NullCacheProvider());
+
+            ApplicationCache = cacheHelper;
         }
 
         /// <summary>
@@ -125,8 +146,9 @@ namespace Umbraco.Core
             {
                 CanResolveBeforeFrozen = true
             };
-            //add custom types here that are internal
-            ApplicationEventsResolver.Current.AddType<PublishedContentHelper>();
+
+            // add custom types here that are internal, if needed
+            //ApplicationEventsResolver.Current.AddType<>();
         }
 
         /// <summary>
@@ -228,7 +250,7 @@ namespace Umbraco.Core
                 () => PluginManager.Current.ResolveAssignedMapperTypes());
 
 			RepositoryResolver.Current = new RepositoryResolver(
-				new RepositoryFactory());
+                new RepositoryFactory(ApplicationCache));
 
 		    SqlSyntaxProvidersResolver.Current = new SqlSyntaxProvidersResolver(
                 new[] { typeof(MySqlSyntaxProvider), typeof(SqlCeSyntaxProvider), typeof(SqlServerSyntaxProvider) })
@@ -253,28 +275,27 @@ namespace Umbraco.Core
 
             //the database migration objects
             MigrationResolver.Current = new MigrationResolver(
-                () => PluginManager.Current.ResolveMigrationTypes());
-            
+                () => PluginManager.Current.ResolveTypes<IMigration>());
 
-
-			PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
+            // todo: remove once we drop IPropertyEditorValueConverter support.
+            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>();
 
-            // this is how we'd switch over to DefaultShortStringHelper _and_ still use
-            // UmbracoSettings UrlReplaceCharacters...
-            //ShortStringHelperResolver.Current = new ShortStringHelperResolver(
-            //    new DefaultShortStringHelper().WithConfig(DefaultShortStringHelper.ApplyUrlReplaceCharacters));
+            // initialize the new property value converters by discovering IPropertyValueConverter
+            PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(
+                PluginManager.Current.ResolveTypes<IPropertyValueConverter>());
 
-            // use the Legacy one for now
+            // use the new DefaultShortStringHelper
             ShortStringHelperResolver.Current = new ShortStringHelperResolver(
-		        new LegacyShortStringHelper());
+                //new LegacyShortStringHelper());
+                new DefaultShortStringHelper().WithDefaultConfig());
 
 		    UrlSegmentProviderResolver.Current = new UrlSegmentProviderResolver(
 		        typeof (DefaultUrlSegmentProvider));
+
+            // keep it internal for now
+		    PublishedContentModelFactoryResolver.Current = new PublishedContentModelFactoryResolver();
+		    //    new PublishedContentModelFactoryImpl());
 		}
 	}
 }

src/Umbraco.Core/CustomBooleanTypeConverter.cs

@@ -22,8 +22,8 @@ namespace Umbraco.Core
 			if (value is string)
 			{
 				var str = (string)value;
+				if (str == null || str.Length == 0 || str == "0") return false;
 				if (str == "1") return true;
-				if (str == "0" || str == "") return false;
 			}
 
 			return base.ConvertFrom(context, culture, value);

src/Umbraco.Core/DatabaseContext.cs

@@ -3,6 +3,7 @@ using System.Configuration;
 using System.Data.SqlServerCe;
 using System.IO;
 using System.Linq;
+using System.Web;
 using System.Web.Configuration;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration;
@@ -28,7 +29,7 @@ namespace Umbraco.Core
         private string _providerName;
         private DatabaseSchemaResult _result;
 
-        internal DatabaseContext(IDatabaseFactory factory)
+        public DatabaseContext(IDatabaseFactory factory)
         {
             _factory = factory;
         }
@@ -112,7 +113,7 @@ namespace Umbraco.Core
         public void ConfigureEmbeddedDatabaseConnection()
         {
             const string providerName = "System.Data.SqlServerCe.4.0";
-            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf";
+            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;";
 
             SaveConnectionString(connectionString, providerName);
 
@@ -169,6 +170,20 @@ namespace Umbraco.Core
             Initialize(providerName);
         }
 
+        /// <summary>
+        /// Configures a ConnectionString for the Umbraco database that uses Microsoft SQL Server integrated security.
+        /// </summary>
+        /// <param name="server">Name or address of the database server</param>
+        /// <param name="databaseName">Name of the database</param>
+        public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
+        {
+            const string providerName = "System.Data.SqlClient";
+            string connectionString = String.Format("Server={0};Database={1};Integrated Security=true", server, databaseName);
+
+            SaveConnectionString(connectionString, providerName);
+            Initialize(providerName);
+        }
+
         internal string BuildAzureConnectionString(string server, string databaseName, string user, string password)
         {
             if (server.Contains(".") && ServerStartsWithTcp(server) == false)
@@ -282,16 +297,15 @@ namespace Umbraco.Core
             if (databaseSettings != null && string.IsNullOrWhiteSpace(databaseSettings.ConnectionString) == false && string.IsNullOrWhiteSpace(databaseSettings.ProviderName) == false)
             {
                 var providerName = "System.Data.SqlClient";
+                string connString = null;
                 if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
                 {
                     providerName = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName;
-
-                    _connectionString =
-                        ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
-
+                    connString = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
                 }
+                Initialize(providerName, connString);
 
-                Initialize(providerName);
+                DetermineSqlServerVersion();
             }
             else if (ConfigurationManager.AppSettings.ContainsKey(GlobalSettings.UmbracoConnectionName) && string.IsNullOrEmpty(ConfigurationManager.AppSettings[GlobalSettings.UmbracoConnectionName]) == false)
             {
@@ -328,6 +342,8 @@ namespace Umbraco.Core
 
                 //Remove the legacy connection string, so we don't end up in a loop if something goes wrong.
                 GlobalSettings.RemoveSetting(GlobalSettings.UmbracoConnectionName);
+
+                DetermineSqlServerVersion();
             }
             else
             {
@@ -355,6 +371,55 @@ namespace Umbraco.Core
             }
         }
 
+        internal void Initialize(string providerName, string connectionString)
+        {
+            _connectionString = connectionString;
+            Initialize(providerName);
+        }
+
+        /// <summary>
+        /// Set the lazy resolution of determining the SQL server version if that is the db type we're using
+        /// </summary>
+        private void DetermineSqlServerVersion()
+        {
+            
+            var sqlServerSyntax = SqlSyntaxContext.SqlSyntaxProvider as SqlServerSyntaxProvider;
+            if (sqlServerSyntax != null)
+            {
+                //this will not execute now, it is lazy so will only execute when we need to actually know
+                // the sql server version.
+                sqlServerSyntax.VersionName = new Lazy<SqlServerVersionName>(() =>
+                {
+                    try
+                    {
+                        var database = this._factory.CreateDatabase();
+
+                        var version = database.ExecuteScalar<string>("SELECT SERVERPROPERTY('productversion')");
+                        var firstPart = version.Split('.')[0];
+                        switch (firstPart)
+                        {
+                            case "11":
+                                return SqlServerVersionName.V2012;
+                            case "10":
+                                return SqlServerVersionName.V2008;
+                            case "9":
+                                return SqlServerVersionName.V2005;
+                            case "8":
+                                return SqlServerVersionName.V2000;
+                            case "7":
+                                return SqlServerVersionName.V7;
+                            default:
+                                return SqlServerVersionName.Other;
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        return SqlServerVersionName.Invalid;
+                    }
+                });
+            }
+        }
+
         internal DatabaseSchemaResult ValidateDatabaseSchema()
         {
             if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
@@ -362,6 +427,13 @@ namespace Umbraco.Core
 
             if (_result == null)
             {
+
+                if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted
+                    && ProviderName == "MySql.Data.MySqlClient")
+                {
+                    throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
+                }
+
                 var database = new UmbracoDatabase(_connectionString, ProviderName);
                 var dbSchema = new DatabaseSchemaCreation(database);
                 _result = dbSchema.ValidateSchema();
@@ -369,82 +441,109 @@ namespace Umbraco.Core
             return _result;
         }
 
-        internal Result CreateDatabaseSchemaAndDataOrUpgrade()
-        {
-            if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
-            {
-                return new Result
-                           {
-                               Message =
-                                   "Database configuration is invalid. Please check that the entered database exists and that the provided username and password has write access to the database.",
-                               Success = false,
-                               Percentage = "10"
-                           };
-            }
-
+        internal Result CreateDatabaseSchemaAndData()
+        {   
             try
             {
+                var readyForInstall = CheckReadyForInstall();
+                if (readyForInstall.Success == false)
+                {
+                    return readyForInstall.Result;
+                }
+
                 LogHelper.Info<DatabaseContext>("Database configuration status: Started");
 
-                var message = string.Empty;
+                string message;
 
                 var database = new UmbracoDatabase(_connectionString, ProviderName);
+
+                // If MySQL, we're going to ensure that database calls are maintaining proper casing as to remove the necessity for checks
+                // for case insensitive queries. In an ideal situation (which is what we're striving for), all calls would be case sensitive.
+
+                /*                
                 var supportsCaseInsensitiveQueries = SqlSyntaxContext.SqlSyntaxProvider.SupportsCaseInsensitiveQueries(database);
                 if (supportsCaseInsensitiveQueries  == false)
                 {
                     message = "<p>&nbsp;</p><p>The database you're trying to use does not support case insensitive queries. <br />We currently do not support these types of databases.</p>" +
-                              "<p>You can fix this by changing the following two settings in your my.ini file in your MySQL installation directory:</p>" +
-                              "<pre>lower_case_table_names=1\nlower_case_file_system=1</pre><br />" +
+                              "<p>You can fix this by changing the following setting in your my.ini file in your MySQL installation directory:</p>" +
+                              "<pre>lower_case_table_names=1</pre><br />" +
                               "<p>Note: Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
                               "<p>For more technical information on case sensitivity in MySQL, have a look at " +
                               "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
 
                     return new Result { Message = message, Success = false, Percentage = "15" };
                 }
-                else if (supportsCaseInsensitiveQueries == null)
-                {
-                    message = "<p>&nbsp;</p><p>Warning! Could not check if your database type supports case insensitive queries. <br />We currently do not support these databases that do not support case insensitive queries.</p>" +
-                              "<p>You can check this by looking for the following two settings in your my.ini file in your MySQL installation directory:</p>" +
-                              "<pre>lower_case_table_names=1\nlower_case_file_system=1</pre><br />" +
-                              "<p>Note: Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
-                              "<p>For more technical information on case sensitivity in MySQL, have a look at " +
-                              "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
-                }
-                else
-                {
-                    if (SqlSyntaxContext.SqlSyntaxProvider.GetType() == typeof(MySqlSyntaxProvider))
-                    {
-                        message = "<p>&nbsp;</p><p>Congratulations, the database step ran successfully!</p>" +
-                                  "<p>Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.</p>" +
-                                  "<p>However, your hosting provider may not support this option. Umbraco does not currently support MySQL installs that do not support case insensitive queries</p>" +
-                                  "<p>Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
-                                  "<p>They can check this by looking for the following two settings in the my.ini file in their MySQL installation directory:</p>" +
-                                  "<pre>lower_case_table_names=1\nlower_case_file_system=1</pre><br />" +
-                                  "<p>For more technical information on case sensitivity in MySQL, have a look at " +
-                                  "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
-                    }
-                }
+                */
+
+                message = GetResultMessageForMySql();
 
                 var schemaResult = ValidateDatabaseSchema();
                 var installedVersion = schemaResult.DetermineInstalledVersion();
                 
-
                 //If Configuration Status is empty and the determined version is "empty" its a new install - otherwise upgrade the existing
                 if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus) && installedVersion.Equals(new Version(0, 0, 0)))
                 {
                     database.CreateDatabaseSchema();
                     message = message + "<p>Installation completed!</p>";
+
+                    //now that everything is done, we need to determine the version of SQL server that is executing
+                    LogHelper.Info<DatabaseContext>("Database configuration status: " + message);
+                    return new Result { Message = message, Success = true, Percentage = "100" };
                 }
-                else
+
+                //we need to do an upgrade so return a new status message and it will need to be done during the next step
+                LogHelper.Info<DatabaseContext>("Database requires upgrade");
+                message = "<p>Upgrading database, this may take some time...</p>";
+                return new Result
+                    {
+                        RequiresUpgrade = true, 
+                        Message = message, 
+                        Success = true, 
+                        Percentage = "30"
+                    };
+            }
+            catch (Exception ex)
+            {
+                return HandleInstallException(ex);
+            }
+        }
+
+        /// <summary>
+        /// This assumes all of the previous checks are done!
+        /// </summary>
+        /// <returns></returns>
+        internal Result UpgradeSchemaAndData()
+        {
+            try
+            {
+
+                var readyForInstall = CheckReadyForInstall();
+                if (readyForInstall.Success == false)
                 {
-                    var configuredVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
+                    return readyForInstall.Result;
+                }
+
+                LogHelper.Info<DatabaseContext>("Database upgrade started");
+
+                var database = new UmbracoDatabase(_connectionString, ProviderName);
+                //var supportsCaseInsensitiveQueries = SqlSyntaxContext.SqlSyntaxProvider.SupportsCaseInsensitiveQueries(database);                
+
+                var message = GetResultMessageForMySql();
+
+                var schemaResult = ValidateDatabaseSchema();
+                var installedVersion = schemaResult.DetermineInstalledVersion();
+                
+                //DO the upgrade!
+
+                var configuredVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
                                                 ? installedVersion
                                                 : new Version(GlobalSettings.ConfigurationStatus);
-                    var targetVersion = UmbracoVersion.Current;
-                    var runner = new MigrationRunner(configuredVersion, targetVersion, GlobalSettings.UmbracoMigrationName);
-                    var upgraded = runner.Execute(database, true);
-                    message = message + "<p>Upgrade completed!</p>";
-                }
+                var targetVersion = UmbracoVersion.Current;
+                var runner = new MigrationRunner(configuredVersion, targetVersion, GlobalSettings.UmbracoMigrationName);
+                var upgraded = runner.Execute(database, true);
+                message = message + "<p>Upgrade completed!</p>";
+
+                //now that everything is done, we need to determine the version of SQL server that is executing
 
                 LogHelper.Info<DatabaseContext>("Database configuration status: " + message);
 
@@ -452,26 +551,95 @@ namespace Umbraco.Core
             }
             catch (Exception ex)
             {
-                LogHelper.Info<DatabaseContext>("Database configuration failed with the following error and stack trace: " + ex.Message + "\n" + ex.StackTrace);
-
-                if (_result != null)
-                {
-                    LogHelper.Info<DatabaseContext>("The database schema validation produced the following summary: \n" + _result.GetSummary());
-                }
-
-                return new Result
-                           {
-                               Message =
-                                   "The database configuration failed with the following message: " + ex.Message +
-                                   "\n Please check log file for additional information (can be found in '/App_Data/Logs/UmbracoTraceLog.txt')",
-                               Success = false,
-                               Percentage = "90"
-                           };
+                return HandleInstallException(ex);
             }
         }
 
+        private string GetResultMessageForMySql()
+        {
+            if (SqlSyntaxContext.SqlSyntaxProvider.GetType() == typeof(MySqlSyntaxProvider))
+            {
+                return "<p>&nbsp;</p><p>Congratulations, the database step ran successfully!</p>" +
+                       "<p>Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.</p>" +
+                       "<p>However, your hosting provider may not support this option. Umbraco does not currently support MySQL installs that do not support case insensitive queries</p>" +
+                       "<p>Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
+                       "<p>They can check this by looking for the following setting in the my.ini file in their MySQL installation directory:</p>" +
+                       "<pre>lower_case_table_names=1</pre><br />" +
+                       "<p>For more technical information on case sensitivity in MySQL, have a look at " +
+                       "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
+            }
+            return string.Empty;
+        }
+
+        /*
+        private string GetResultMessageForMySql(bool? supportsCaseInsensitiveQueries)
+        {
+            if (supportsCaseInsensitiveQueries == null)
+            {
+                return "<p>&nbsp;</p><p>Warning! Could not check if your database type supports case insensitive queries. <br />We currently do not support these databases that do not support case insensitive queries.</p>" +
+                          "<p>You can check this by looking for the following setting in your my.ini file in your MySQL installation directory:</p>" +
+                          "<pre>lower_case_table_names=1</pre><br />" +
+                          "<p>Note: Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
+                          "<p>For more technical information on case sensitivity in MySQL, have a look at " +
+                          "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
+            }
+            if (SqlSyntaxContext.SqlSyntaxProvider.GetType() == typeof(MySqlSyntaxProvider))
+            {
+                return "<p>&nbsp;</p><p>Congratulations, the database step ran successfully!</p>" +
+                       "<p>Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.</p>" +
+                       "<p>However, your hosting provider may not support this option. Umbraco does not currently support MySQL installs that do not support case insensitive queries</p>" +
+                       "<p>Make sure to check with your hosting provider if they support case insensitive queries as well.</p>" +
+                       "<p>They can check this by looking for the following setting in the my.ini file in their MySQL installation directory:</p>" +
+                       "<pre>lower_case_table_names=1</pre><br />" +
+                       "<p>For more technical information on case sensitivity in MySQL, have a look at " +
+                       "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
+            }
+            return string.Empty;
+        }*/
+
+        private Attempt<Result> CheckReadyForInstall()
+        {
+            if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted
+                    && ProviderName == "MySql.Data.MySqlClient")
+            {
+                throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
+            }
+
+            if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
+            {
+                return Attempt.Fail(new Result
+                {
+                    Message =
+                        "Database configuration is invalid. Please check that the entered database exists and that the provided username and password has write access to the database.",
+                    Success = false,
+                    Percentage = "10"
+                });
+            }
+            return Attempt<Result>.Succeed();
+        }
+
+        private Result HandleInstallException(Exception ex)
+        {
+            LogHelper.Info<DatabaseContext>("Database configuration failed with the following error and stack trace: " + ex.Message + "\n" + ex.StackTrace);
+
+            if (_result != null)
+            {
+                LogHelper.Info<DatabaseContext>("The database schema validation produced the following summary: \n" + _result.GetSummary());
+            }
+
+            return new Result
+            {
+                Message =
+                    "The database configuration failed with the following message: " + ex.Message +
+                    "\n Please check log file for additional information (can be found in '/App_Data/Logs/UmbracoTraceLog.txt')",
+                Success = false,
+                Percentage = "90"
+            };
+        }
+
         internal class Result
         {
+            public bool RequiresUpgrade { get; set; }
             public string Message { get; set; }
             public bool Success { get; set; }
             public string Percentage { get; set; }

src/Umbraco.Core/DateTimeExtensions.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core
+{
+    public static class DateTimeExtensions
+    {
+
+        /// <summary>
+        /// Returns the DateTime as an ISO formatted string that is globally expectable
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <returns></returns>
+        public static string ToIsoString(this DateTime dt)
+        {
+            return dt.ToString("yyyy-MM-dd HH:mm:ss");
+        }
+
+        public static DateTime TruncateTo(this DateTime dt, DateTruncate truncateTo)
+        {
+            if (truncateTo == DateTruncate.Year)
+                return new DateTime(dt.Year, 0, 0);
+            if (truncateTo == DateTruncate.Month)
+                return new DateTime(dt.Year, dt.Month, 0);
+            if (truncateTo == DateTruncate.Day)
+                return new DateTime(dt.Year, dt.Month, dt.Day);
+            if (truncateTo == DateTruncate.Hour)
+                return new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, 0, 0);
+            if (truncateTo == DateTruncate.Minute)
+                return new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, 0);
+            return new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, dt.Second);
+        }
+
+        public enum DateTruncate
+        {
+            Year,
+            Month,
+            Day,
+            Hour,
+            Minute,
+            Second
+        }
+
+    }
+}

src/Umbraco.Core/DictionaryExtensions.cs

@@ -131,30 +131,48 @@ namespace Umbraco.Core
 			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>
+	    /// Merges all key/values from the sources dictionaries into the destination dictionary
+	    /// </summary>
+	    /// <typeparam name="T"></typeparam>
+	    /// <typeparam name="TK"></typeparam>
+	    /// <typeparam name="TV"></typeparam>
+	    /// <param name="destination">The source dictionary to merge other dictionaries into</param>
+	    /// <param name="overwrite">
+	    /// By default all values will be retained in the destination if the same keys exist in the sources but 
+	    /// this can changed if overwrite = true, then any key/value found in any of the sources will overwritten in the destination. Note that
+	    /// it will just use the last found key/value if this is true.
+	    /// </param>
+	    /// <param name="sources">The other dictionaries to merge values from</param>
+        public static void MergeLeft<T, TK, TV>(this T destination, IEnumerable<IDictionary<TK, TV>> sources, bool overwrite = false)
+			where T : IDictionary<TK, TV>
+	    {
+	        foreach (var p in sources.SelectMany(src => src).Where(p => overwrite || destination.ContainsKey(p.Key) == false))
+	        {
+	            destination[p.Key] = p.Value;
+	        }
+	    }
 
-		/// <summary>
+        /// <summary>
+        /// Merges all key/values from the sources dictionaries into the destination dictionary
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="TK"></typeparam>
+        /// <typeparam name="TV"></typeparam>
+        /// <param name="destination">The source dictionary to merge other dictionaries into</param>
+        /// <param name="overwrite">
+        /// By default all values will be retained in the destination if the same keys exist in the sources but 
+        /// this can changed if overwrite = true, then any key/value found in any of the sources will overwritten in the destination. Note that
+        /// it will just use the last found key/value if this is true.
+        /// </param>
+        /// <param name="source">The other dictionary to merge values from</param>
+        public static void MergeLeft<T, TK, TV>(this T destination, IDictionary<TK, TV> source, bool overwrite = false)
+            where T : IDictionary<TK, TV>
+        {
+            destination.MergeLeft(new[] {source}, overwrite);
+        }
+
+	    /// <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>
@@ -187,6 +205,25 @@ namespace Umbraco.Core
 			return String.Empty;
 		}
 
+	    /// <summary>
+	    /// Returns the value of the key value based on the key as it's string value, if the key is not found or is an empty string, then the provided default value is returned
+	    /// </summary>
+	    /// <param name="d"></param>
+	    /// <param name="key"></param>
+	    /// <param name="defaultValue"></param>
+	    /// <returns></returns>
+	    public static string GetValueAsString<TKey, TVal>(this IDictionary<TKey, TVal> d, TKey key, string defaultValue)
+		{
+			if (d.ContainsKey(key))
+			{
+				var value = d[key].ToString();
+			    if (value != string.Empty)
+                    return value;
+			}
+			
+            return defaultValue;
+		}
+
 		/// <summary>contains key ignore case.</summary>
 		/// <param name="dictionary">The dictionary.</param>
 		/// <param name="key">The key.</param>

src/Umbraco.Core/Dynamics/DynamicInstanceHelper.cs

@@ -82,7 +82,7 @@ namespace Umbraco.Core.Dynamics
 				                                null,
 				                                thisObject,
 				                                args);
-				return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundProperty));
+				return Attempt.Succeed(new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundProperty));
 			}
 			catch (MissingMethodException)
 			{
@@ -97,7 +97,7 @@ namespace Umbraco.Core.Dynamics
 					                                null,
 					                                thisObject,
 					                                args);
-					return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundMethod));
+					return Attempt.Succeed(new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundMethod));
 				}
 				catch (MissingMethodException)
 				{
@@ -106,13 +106,14 @@ namespace Umbraco.Core.Dynamics
 						try
 						{
 							result = FindAndExecuteExtensionMethod(thisObject, args, binder.Name, findExtensionMethodsOnTypes);
-							return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundExtensionMethod));
+							return Attempt.Succeed(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);
+						    var mresult = new TryInvokeMemberResult(null, TryInvokeMemberSuccessReason.FoundExtensionMethod);
+							return Attempt<TryInvokeMemberResult>.Fail(mresult, ext);
 						}
 						catch (Exception ex)
 						{
@@ -124,16 +125,17 @@ namespace Umbraco.Core.Dynamics
 								sb.Append(t + ",");
 							}
 							LogHelper.Error<DynamicInstanceHelper>(sb.ToString(), ex);
-							return new Attempt<TryInvokeMemberResult>(ex);
+                            var mresult = new TryInvokeMemberResult(null, TryInvokeMemberSuccessReason.FoundExtensionMethod);
+                            return Attempt<TryInvokeMemberResult>.Fail(mresult, ex);
 						}	
 					}
-					return Attempt<TryInvokeMemberResult>.False;
+					return Attempt<TryInvokeMemberResult>.Fail();
 				}
 			}
 			catch (Exception ex)
 			{
 				LogHelper.Error<DynamicInstanceHelper>("An unhandled exception occurred in method TryInvokeMember", ex);
-				return new Attempt<TryInvokeMemberResult>(ex);
+				return Attempt<TryInvokeMemberResult>.Fail(ex);
 			}
 		}
 

src/Umbraco.Core/Dynamics/DynamicNull.cs

@@ -11,78 +11,101 @@ namespace Umbraco.Core.Dynamics
     //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
+
+    // returned when TryGetMember fails on a DynamicPublishedContent
+    //
+    // so if user does @CurrentPage.TextPages it will get something that is enumerable (but empty)
+    // note - not sure I understand the stuff about .Where, though
+
     public class DynamicNull : DynamicObject, IEnumerable, IHtmlString
     {
+        public static readonly DynamicNull Null = new DynamicNull();
+
+        private DynamicNull() {}
+
         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 DynamicNull ToContentSet()
+        {
+            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;
-            }
+            get { return string.Empty; }
         }
+
         public int Id
         {
-            get
-            {
-                return 0;
-            }
+            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;
@@ -92,6 +115,5 @@ namespace Umbraco.Core.Dynamics
         {
             return string.Empty;
         }
-
     }
 }

src/Umbraco.Core/Dynamics/DynamicXml.cs

@@ -201,9 +201,9 @@ namespace Umbraco.Core.Dynamics
 
 			//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)
+				&& attempt.Exception != null && attempt.Exception is TargetInvocationException)
 			{
-				result = new DynamicNull();
+				result = DynamicNull.Null;
 				return true;
 			}
 
@@ -261,7 +261,7 @@ namespace Umbraco.Core.Dynamics
             var attributes = xmlElement.Attributes(name).Select(attr => attr.Value).ToArray();
             if (attributes.Any())
             {
-                return new Attempt<IEnumerable<string>>(true, attributes);
+                return Attempt<IEnumerable<string>>.Succeed(attributes);
             }
 
             if (!attributes.Any() && xmlElement.Name == "root" && xmlElement.Elements().Count() == 1)
@@ -271,12 +271,12 @@ namespace Umbraco.Core.Dynamics
                 if (childElements.Any())
                 {
                     //we've found a match by the first child of an element called 'root' (strange, but sure)
-                    return new Attempt<IEnumerable<string>>(true, childElements);
+                    return Attempt<IEnumerable<string>>.Succeed(childElements);
                 }
             }            
 
             //no deal
-            return Attempt<IEnumerable<string>>.False;
+            return Attempt<IEnumerable<string>>.Fail();
 	    }
 
 	    /// <summary>
@@ -293,7 +293,7 @@ namespace Umbraco.Core.Dynamics
             //Check if we've got any matches, if so then return true
             if (elements.Any())
             {
-                return new Attempt<IEnumerable<XElement>>(true, elements);
+                return Attempt<IEnumerable<XElement>>.Succeed(elements);
             }
 
             if (!elements.Any() && xmlElement.Name == "root" && xmlElement.Elements().Count() == 1)
@@ -303,12 +303,12 @@ namespace Umbraco.Core.Dynamics
                 if (childElements.Any())
                 {
                     //we've found a match by the first child of an element called 'root' (strange, but sure)
-                    return new Attempt<IEnumerable<XElement>>(true, childElements);
+                    return Attempt<IEnumerable<XElement>>.Succeed(childElements);
                 }
             }
             
             //no deal
-            return Attempt<IEnumerable<XElement>>.False;
+            return Attempt<IEnumerable<XElement>>.Fail();
         }
 
         private bool HandleIEnumerableXElement(IEnumerable<XElement> elements, out object result)

src/Umbraco.Core/Dynamics/ExtensionMethodFinder.cs

@@ -13,7 +13,96 @@ namespace Umbraco.Core.Dynamics
 	/// Utility class for finding extension methods on a type to execute
 	/// </summary>
     internal static class ExtensionMethodFinder
-    {	
+	{
+	    private static readonly MethodInfo[] AllExtensionMethods;
+
+	    static ExtensionMethodFinder()
+	    {
+            AllExtensionMethods = TypeFinder.GetAssembliesWithKnownExclusions()
+                // assemblies that contain extension methods
+                .Where(a => a.IsDefined(typeof(ExtensionAttribute), false))
+                // types that contain extension methods
+                .SelectMany(a => a.GetTypes()
+                    .Where(t => t.IsDefined(typeof(ExtensionAttribute), false) && t.IsSealed && t.IsGenericType == false && t.IsNested == false))
+                // actual extension methods
+                .SelectMany(t => t.GetMethods(BindingFlags.Static | BindingFlags.Public)
+                    .Where(m => m.IsDefined(typeof(ExtensionAttribute), false)))
+                // and also IEnumerable<T> extension methods - because the assembly is excluded
+                .Concat(typeof(Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public))
+                .ToArray();
+	    }
+
+        // ORIGINAL CODE IS NOT COMPLETE, DOES NOT HANDLE GENERICS, ETC...
+
+        // so this is an attempt at fixing things, but it's not done yet
+        // and do we really want to do this? extension methods are not supported on dynamics, period
+        // we should use strongly typed content instead of dynamics.
+
+        /*
+
+        // get all extension methods for type thisType, with name name,
+        // accepting argsCount arguments (not counting the instance of thisType).
+        private static IEnumerable<MethodInfo> GetExtensionMethods(Type thisType, string name, int argsCount)
+        {
+            var key = string.Format("{0}.{1}::{2}", thisType.FullName, name, argsCount);
+
+            var types = thisType.GetBaseTypes(true); // either do this OR have MatchFirstParameter handle the stuff... F*XME
+
+            var methods = AllExtensionMethods
+                .Where(m => m.Name == name)
+                .Where(m => m.GetParameters().Length == argsCount)
+                .Where(m => MatchFirstParameter(thisType, m.GetParameters()[0].ParameterType));
+
+            // f*xme - is this what we should cache?
+            return methods;
+        }
+
+        // find out whether the first parameter is a match for thisType
+        private static bool MatchFirstParameter(Type thisType, Type firstParameterType)
+        {
+            return MethodArgZeroHasCorrectTargetType(null, firstParameterType, thisType);
+        }
+
+        // get the single extension method for type thisType, with name name,
+        // that accepts the arguments in args (which does not contain the instance of thisType).
+        public static MethodInfo GetExtensionMethod(Type thisType, string name, object[] args)
+        {
+            MethodInfo result = null;
+            foreach (var method in GetExtensionMethods(thisType, name, args.Length).Where(m => MatchParameters(m, args)))
+            {
+                if (result == null)
+                    result = method;
+                else
+                    throw new AmbiguousMatchException("More than one matching extension method was found.");
+            }
+            return result;
+        }
+
+        // find out whether the method can accept the arguments
+        private static bool MatchParameters(MethodInfo method, IList<object> args)
+        {
+            var parameters = method.GetParameters();
+
+            var i = 0;
+            for (; i < parameters.Length; ++i)
+            {
+                if (MatchParameter(parameters[i].ParameterType, args[i].GetType()) == false)
+                    break;
+            }
+            return (i == parameters.Length);
+        }
+
+        internal static bool MatchParameter(Type parameterType, Type argumentType)
+        {
+            // public static int DoSomething<T>(Foo foo, T t1, T t2)
+            // DoSomething(foo, t1, t2) => how can we match?!
+            return parameterType == argumentType; // f*xme of course!
+        }
+         * 
+        */
+
+        // BELOW IS THE ORIGINAL CODE...
+
 		/// <summary>
 		/// Returns all extension methods found matching the definition
 		/// </summary>
@@ -27,6 +116,10 @@ namespace Umbraco.Core.Dynamics
 		/// </remarks>
         private static IEnumerable<MethodInfo> GetAllExtensionMethods(Type thisType, string name, int argumentCount, bool argsContainsThis)
         {
+            // at *least* we can cache the extension methods discovery
+		    var candidates = AllExtensionMethods;
+
+            /*
 			//only scan assemblies we know to contain extension methods (user assemblies)
         	var assembliesToScan = TypeFinder.GetAssembliesWithKnownExclusions();        	
 
@@ -45,6 +138,7 @@ namespace Umbraco.Core.Dynamics
 
             //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);

src/Umbraco.Core/Dynamics/ExtensionMethods.cs

@@ -36,42 +36,22 @@ namespace Umbraco.Core.Dynamics
         [Obsolete("This method should not be used and will be removed in the future")]
         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;
+            return StringExtensions.ContainsAny(haystack, needles);
         }
         [Obsolete("This method should not be used and will be removed in the future")]
         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;
+        	return StringExtensions.ContainsAny(haystack, needles);
         }
         [Obsolete("This method should not be used and will be removed in the future")]
 		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;
+            return StringExtensions.ContainsAny(haystack, needles, comparison);
         }
         [Obsolete("This method should not be used and will be removed in the future")]
         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;
+            return StringExtensions.ContainsAny(haystack, needles, comparison);
         }
         [Obsolete("This method should not be used and will be removed in the future")]
         public static bool ContainsInsensitive(this string haystack, string needle)

src/Umbraco.Core/Dynamics/PropertyResult.cs

@@ -1,65 +1,50 @@
 using System;
 using Umbraco.Core.Models;
-using umbraco.interfaces;
 using System.Web;
 
 namespace Umbraco.Core.Dynamics
 {
 	internal class PropertyResult : IPublishedContentProperty, IHtmlString
-    {
+	{
+	    private readonly IPublishedContentProperty _source;
+	    private readonly string _alias;
+	    private readonly object _value;
+        private readonly PropertyResultType _type;
+
 		internal PropertyResult(IPublishedContentProperty source, PropertyResultType type)
         {
     		if (source == null) throw new ArgumentNullException("source");
-
-    		Alias = source.Alias;
-			Value = source.Value;
-			Version = source.Version;
-			PropertyType = type;
+            
+            _type = type;
+            _source = source;
         }
-		internal PropertyResult(string alias, object value, Guid version, PropertyResultType 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;
+            _type = type;
+            _alias = alias;
+			_value = value;
         }
 
-		internal PropertyResultType PropertyType { get; private set; }
-		
-    	public string Alias { get; private set; }
+        internal PropertyResultType PropertyType { get { return _type; } }
 
-    	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 string PropertyTypeAlias { get { return _source == null ? _alias : _source.PropertyTypeAlias; } }
+        public object DataValue { get { return _source == null ? _value : _source.DataValue; } }
+        public bool HasValue { get { return _source == null || _source.HasValue; } }
+        public object Value { get { return _source == null ? _value : _source.Value; } }
+        public object XPathValue { get { return Value == null ? null : Value.ToString(); } }
 
-    	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 Alias { get { return PropertyTypeAlias; }}
+        public Guid Version { get { return Guid.Empty; }}
 
+        // implements IHtmlString.ToHtmlString
         public string ToHtmlString()
         {
-			return ValueAsString;
+            var value = Value;
+			return value == null ? string.Empty : value.ToString();
         }
     }
 }

src/Umbraco.Core/EnumerableExtensions.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core
 {
@@ -13,17 +14,16 @@ namespace Umbraco.Core
     {
         public static IEnumerable<IEnumerable<T>> InGroupsOf<T>(this IEnumerable<T> source, int groupSize)
         {
-            var i = 0;
-            var length = source.Count();
+            if (source == null)
+                throw new ArgumentNullException("source");
+            if (groupSize <= 0)
+                throw new ArgumentException("Must be greater than zero.", "groupSize");
 
-            while ((i * groupSize) < length)
-            {
-                yield return source.Skip(i * groupSize).Take(groupSize);
-                i++;
-            }
+            return source
+                .Select((x, i) => Tuple.Create(i / groupSize, x))
+                .GroupBy(t => t.Item1, t => t.Item2);
         }
 
-
         /// <summary>The distinct by.</summary>
         /// <param name="source">The source.</param>
         /// <param name="keySelector">The key selector.</param>
@@ -96,23 +96,13 @@ namespace Umbraco.Core
         }
 
         /// <summary>The flatten list.</summary>
-        /// <param name="items">The items.</param>
-        /// <param name="selectChild">The select child.</param>
-        /// <typeparam name="TItem">Item type</typeparam>
+        /// <param name="e">The items.</param>
+        /// <param name="f">The select child.</param>
+        /// <typeparam name="T">Item type</typeparam>
         /// <returns>list of TItem</returns>
-        [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "By design")]
-        public static IEnumerable<TItem> FlattenList<TItem>(this IEnumerable<TItem> items, Func<TItem, IEnumerable<TItem>> selectChild)
+        public static IEnumerable<T> FlattenList<T>(this IEnumerable<T> e, Func<T, IEnumerable<T>> f)
         {
-            IEnumerable<TItem> children = items != null && items.Any()
-                                              ? items.SelectMany(selectChild).FlattenList(selectChild)
-                                              : Enumerable.Empty<TItem>();
-
-            if (items != null)
-            {
-                return items.Concat(children);
-            }
-
-            return null;
+            return e.SelectMany(c => f(c).FlattenList(f)).Concat(e);
         }
 
         /// <summary>
@@ -243,23 +233,45 @@ namespace Umbraco.Core
                 });
         }
 
-        ///<summary>Finds the index of the first item matching an expression in an enumerable.</summary>
-        ///<param name="items">The enumerable to search.</param>
-        ///<param name="predicate">The expression to test the items against.</param>
-        ///<returns>The index of the first matching item, or -1 if no items match.</returns>
+        /// <summary>
+        /// Finds the index of the first item matching an expression in an enumerable.
+        /// </summary>
+        /// <typeparam name="T">The type of the enumerated objects.</typeparam>
+        /// <param name="items">The enumerable to search.</param>
+        /// <param name="predicate">The expression to test the items against.</param>
+        /// <returns>The index of the first matching item, or -1.</returns>
         public static int FindIndex<T>(this IEnumerable<T> items, Func<T, bool> predicate)
+        {
+            return FindIndex(items, 0, predicate);
+        }
+
+        /// <summary>
+        /// Finds the index of the first item matching an expression in an enumerable.
+        /// </summary>
+        /// <typeparam name="T">The type of the enumerated objects.</typeparam>
+        /// <param name="items">The enumerable to search.</param>
+        /// <param name="startIndex">The index to start at.</param>
+        /// <param name="predicate">The expression to test the items against.</param>
+        /// <returns>The index of the first matching item, or -1.</returns>
+        public static int FindIndex<T>(this IEnumerable<T> items, int startIndex, Func<T, bool> predicate)
         {
             if (items == null) throw new ArgumentNullException("items");
             if (predicate == null) throw new ArgumentNullException("predicate");
+            if (startIndex < 0) throw new ArgumentOutOfRangeException("startIndex");
+
+            var index = startIndex;
+            if (index > 0)
+                items = items.Skip(index);
 
-            var retVal = 0;
             foreach (var item in items)
             {
-                if (predicate(item)) return retVal;
-                retVal++;
+                if (predicate(item)) return index;
+                index++;
             }
+
             return -1;
         }
+
         ///<summary>Finds the index of the first occurence of an item in an enumerable.</summary>
         ///<param name="items">The enumerable to search.</param>
         ///<param name="item">The item to find.</param>

src/Umbraco.Core/Events/CancellableObjectEventArgs.cs

@@ -29,7 +29,7 @@ namespace Umbraco.Core.Events
 		/// <remarks>
 		/// This is protected so that inheritors can expose it with their own name
 		/// </remarks>
-		protected T EventObject { get; private set; }
+		protected T EventObject { get; set; }
 
 	}
 }

src/Umbraco.Core/Events/MoveEventArgs.cs

@@ -1,28 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
 namespace Umbraco.Core.Events
 {
-	public class MoveEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
-	{
-		public MoveEventArgs(TEntity eventObject, bool canCancel, int parentId) : base(eventObject, canCancel)
-		{
-			ParentId = parentId;
-		}
+    public class MoveEventInfo<TEntity>
+    {
+        public MoveEventInfo(TEntity entity, string originalPath, int newParentId)
+        {
+            Entity = entity;
+            OriginalPath = originalPath;
+            NewParentId = newParentId;
+        }
 
-		public MoveEventArgs(TEntity eventObject, int parentId) : base(eventObject)
-		{
-			ParentId = parentId;
-		}
+        public TEntity Entity { get; set; }
+        public string OriginalPath { get; set; }
+        public int NewParentId { get; set; }
+    }
 
-		/// <summary>
-		/// The entity being moved
-		/// </summary>
-		public TEntity Entity
-		{
-			get { return EventObject; }
-		}
+    public class MoveEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
+    {
+        /// <summary>
+        /// Constructor accepting a collection of MoveEventInfo objects
+        /// </summary>
+        /// <param name="canCancel"></param>
+        /// <param name="moveInfo">
+        /// A colleciton of MoveEventInfo objects that exposes all entities that have been moved during a single move operation
+        /// </param>
+        public MoveEventArgs(bool canCancel, params MoveEventInfo<TEntity>[] moveInfo)
+            : base(default(TEntity), canCancel)
+        {
+            if (moveInfo.FirstOrDefault() == null)
+            {
+                throw new ArgumentException("moveInfo argument must contain at least one item");
+            }
 
-		/// <summary>
-		/// Gets or Sets the Id of the objects new parent.
-		/// </summary>
-		public int ParentId { get; private set; }
-	}
+            MoveInfoCollection = moveInfo;
+            //assign the legacy props
+            EventObject = moveInfo.First().Entity;
+            ParentId = moveInfo.First().NewParentId;
+        }
+
+        /// <summary>
+        /// Constructor accepting a collection of MoveEventInfo objects
+        /// </summary>
+        /// <param name="moveInfo">
+        /// A colleciton of MoveEventInfo objects that exposes all entities that have been moved during a single move operation
+        /// </param>
+        public MoveEventArgs(params MoveEventInfo<TEntity>[] moveInfo)
+            : base(default(TEntity))
+        {
+            if (moveInfo.FirstOrDefault() == null)
+            {
+                throw new ArgumentException("moveInfo argument must contain at least one item");
+            }
+
+            MoveInfoCollection = moveInfo;
+            //assign the legacy props
+            EventObject = moveInfo.First().Entity;
+            ParentId = moveInfo.First().NewParentId;
+        }
+
+        [Obsolete("Use the overload that specifies the MoveEventInfo object")]
+        public MoveEventArgs(TEntity eventObject, bool canCancel, int parentId)
+            : base(eventObject, canCancel)
+        {
+            ParentId = parentId;
+        }
+
+        [Obsolete("Use the overload that specifies the MoveEventInfo object")]
+        public MoveEventArgs(TEntity eventObject, int parentId)
+            : base(eventObject)
+        {
+            ParentId = parentId;
+        }
+
+        /// <summary>
+        /// Gets all MoveEventInfo objects used to create the object
+        /// </summary>
+        public IEnumerable<MoveEventInfo<TEntity>> MoveInfoCollection { get; private set; }
+
+        /// <summary>
+        /// The entity being moved
+        /// </summary>
+        [Obsolete("Retrieve the entity object from the MoveInfoCollection property instead")]
+        public TEntity Entity
+        {
+            get { return EventObject; }
+        }
+
+        /// <summary>
+        /// Gets the Id of the object's new parent
+        /// </summary>
+        [Obsolete("Retrieve the ParentId from the MoveInfoCollection property instead")]
+        public int ParentId { get; private set; }
+    }
 }

src/Umbraco.Core/Events/RecycleBinEventArgs.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    public class RecycleBinEventArgs : CancellableEventArgs
+    {
+        public RecycleBinEventArgs(Guid nodeObjectType, IEnumerable<int> ids, List<string> files, bool emptiedSuccessfully)
+            : base(false)
+        {
+            NodeObjectType = nodeObjectType;
+            Ids = ids;
+            Files = files;
+            RecycleBinEmptiedSuccessfully = emptiedSuccessfully;
+        }
+
+        public RecycleBinEventArgs(Guid nodeObjectType, IEnumerable<int> ids, List<string> files)
+            : base(true)
+        {
+            NodeObjectType = nodeObjectType;
+            Ids = ids;
+            Files = files;
+        }
+
+        /// <summary>
+        /// Gets the Id of the node object type of the items 
+        /// being deleted from the Recycle Bin.
+        /// </summary>
+        public Guid NodeObjectType { get; private set; }
+        
+        /// <summary>
+        /// Gets the list of Ids for each of the items being deleted from the Recycle Bin.
+        /// </summary>
+        public IEnumerable<int> Ids { get; private set; }
+
+        /// <summary>
+        /// Gets the list of Files that should be deleted as part
+        /// of emptying the Recycle Bin.
+        /// </summary>
+        public List<string> Files { get; private set; }
+
+        /// <summary>
+        /// Boolean indicating whether the Recycle Bin was emptied successfully
+        /// </summary>
+        public bool RecycleBinEmptiedSuccessfully { get; private set; }
+
+        /// <summary>
+        /// Boolean indicating whether this event was fired for the Content's Recycle Bin.
+        /// </summary>
+        public bool IsContentRecycleBin
+        {
+            get { return NodeObjectType == new Guid(Constants.ObjectTypes.Document); }
+        }
+
+        /// <summary>
+        /// Boolean indicating whether this event was fired for the Media's Recycle Bin.
+        /// </summary>
+        public bool IsMediaRecycleBin
+        {
+            get { return NodeObjectType == new Guid(Constants.ObjectTypes.Media); }
+        }
+    }
+}

src/Umbraco.Core/HashCodeCombiner.cs

@@ -34,6 +34,12 @@ namespace Umbraco.Core
 			AddInt(d.GetHashCode());
 		}
 
+        internal void AddString(string s)
+        {
+            if (s != null)
+                AddInt((StringComparer.InvariantCulture).GetHashCode(s));
+        }
+
 		internal void AddCaseInsensitiveString(string s)
 		{
 			if (s != null)

src/Umbraco.Core/IDisposeOnRequestEnd.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Any class implementing this interface that is added to the httpcontext.items keys or values will be disposed of at the end of the request.
+    /// </summary>
+    public interface IDisposeOnRequestEnd : IDisposable
+    {
+    }
+}

src/Umbraco.Core/IO/FileSystemExtensions.cs

@@ -1,37 +1,50 @@
-using System.IO;
+using System;
+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")]
+{	
     public static class FileSystemExtensions
     {
-		[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
-		internal static long GetSize(this IFileSystem fs, string path)
+		public static long GetSize(this IFileSystem fs, string path)
         {
-            var s = fs.OpenFile(path);
-            var size = s.Length;
-            s.Close();
+            using (var s = fs.OpenFile(path))
+            {
+                var size = s.Length;
+                s.Close();
 
-            return size;
+                return size;    
+            }
         }
 
-		[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
-		internal static void CopyFile(this IFileSystem fs, string path, string newPath)
+        public static void CopyFile(this IFileSystem fs, string path, string newPath)
         {
-            fs.AddFile(newPath, fs.OpenFile(path));
+            using (var stream = fs.OpenFile(path))
+            {
+                fs.AddFile(newPath, stream);
+            }
         }
 
-		[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
-		internal static string GetExtension(this IFileSystem fs, string path)
+        public static string GetExtension(this IFileSystem fs, string path)
 		{
 			return Path.GetExtension(fs.GetFullPath(path));
 		}
 
-		[UmbracoExperimentalFeature("http://issues.umbraco.org/issue/U4-1156", "Will be declared public after 4.10")]
-		internal static string GetFileName(this IFileSystem fs, string path)
+        public static string GetFileName(this IFileSystem fs, string path)
 		{
 			return Path.GetFileName(fs.GetFullPath(path));
 		}
+
+        //TODO: Currently this is the only way to do this
+        internal static void CreateFolder(this IFileSystem fs, string folderPath)
+        {
+            var path = fs.GetRelativePath(folderPath);
+            var tempFile = Path.Combine(path, Guid.NewGuid().ToString("N") + ".tmp");
+            using (var s = new MemoryStream())
+            {
+                fs.AddFile(tempFile, s);
+            }
+            fs.DeleteFile(tempFile);
+        }
     }
 }

src/Umbraco.Core/IO/IFileSystem.cs

@@ -5,6 +5,8 @@ using Umbraco.Core.CodeAnnotations;
 
 namespace Umbraco.Core.IO
 {
+    //TODO: There is no way to create a directory here without creating a file in a directory and then deleting it
+
 	public interface IFileSystem
     {
         IEnumerable<string> GetDirectories(string path);

src/Umbraco.Core/IO/IOHelper.cs

@@ -43,8 +43,10 @@ namespace Umbraco.Core.IO
         //Replaces tildes with the root dir
         public static string ResolveUrl(string virtualPath)
         {
-            if (virtualPath.StartsWith("~"))
+             if (virtualPath.StartsWith("~"))
                 return virtualPath.Replace("~", SystemDirectories.Root).Replace("//", "/");
+            else if (Uri.IsWellFormedUriString(virtualPath, UriKind.Absolute))
+                return virtualPath;
             else
                 return VirtualPathUtility.ToAbsolute(virtualPath, SystemDirectories.Root);
         }
@@ -249,6 +251,32 @@ namespace Umbraco.Core.IO
             return _rootDir;
         }
 
+        internal static string GetRootDirectoryBinFolder()
+        {
+            string binFolder = string.Empty;
+            if (string.IsNullOrEmpty(_rootDir))
+            {
+                binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory.FullName;
+                return binFolder;
+            }
+
+            binFolder = Path.Combine(GetRootDirectorySafe(), "bin");
+
+#if DEBUG
+            var debugFolder = Path.Combine(binFolder, "debug");
+            if (Directory.Exists(debugFolder))
+                return debugFolder;
+#endif   
+            var releaseFolder = Path.Combine(binFolder, "release");
+            if (Directory.Exists(releaseFolder))
+                return releaseFolder;
+
+            if (Directory.Exists(binFolder))
+                return binFolder;
+
+            return _rootDir;
+        }
+
         /// <summary>
         /// Allows you to overwrite RootDirectory, which would otherwise be resolved
         /// automatically upon application start.

src/Umbraco.Core/IO/PhysicalFileSystem.cs

@@ -93,8 +93,9 @@ 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));
-
+            var exists = FileExists(path);
+            if (exists && overrideIfExists == false) throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
+            
             EnsureDirectory(Path.GetDirectoryName(path));
 
             if (stream.CanSeek)

src/Umbraco.Core/IO/ResizedImage.cs

@@ -0,0 +1,20 @@
+namespace Umbraco.Core.IO
+{
+    internal class ResizedImage
+    {
+        public ResizedImage()
+        {
+        }
+
+        public ResizedImage(int width, int height, string fileName)
+        {
+            Width = width;
+            Height = height;
+            FileName = fileName;
+        }
+
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public string FileName { get; set; }
+    }
+}

src/Umbraco.Core/IO/UmbracoMediaFile.cs

@@ -0,0 +1,260 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web;
+using Umbraco.Core.Configuration;
+
+namespace Umbraco.Core.IO
+{
+    public class UmbracoMediaFile
+    {
+        private readonly MediaFileSystem _fs;
+
+        #region Constructors
+
+        public UmbracoMediaFile()
+        {
+            _fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+        }
+
+        public UmbracoMediaFile(string path)
+        {
+            _fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+
+            Path = path;
+
+            Initialize();
+        }
+
+        #endregion
+
+        #region Static Methods
+
+        //MB: Do we really need all these overloads? looking through the code, only one of them is actually used
+
+        public static UmbracoMediaFile Save(HttpPostedFile file, string path)
+        {
+            return Save(file.InputStream, path);
+        }
+
+        public static UmbracoMediaFile Save(HttpPostedFileBase file, string path)
+        {
+            return Save(file.InputStream, path);
+        }
+
+        public static UmbracoMediaFile Save(Stream inputStream, string path)
+        {
+            var fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+            fs.AddFile(path, inputStream);
+
+            return new UmbracoMediaFile(path);
+        }
+
+        public static UmbracoMediaFile Save(byte[] file, string relativePath)
+        {
+            return Save(new MemoryStream(file), relativePath);
+        }
+
+        public static UmbracoMediaFile Save(HttpPostedFile file)
+        {
+            var tempDir = System.IO.Path.Combine("uploads", Guid.NewGuid().ToString());
+            return Save(file, tempDir);
+        }
+
+        //filebase overload...
+        public static UmbracoMediaFile Save(HttpPostedFileBase file)
+        {
+            var tempDir = System.IO.Path.Combine("uploads", Guid.NewGuid().ToString());
+            return Save(file, tempDir);
+        }
+
+        #endregion
+
+        private long? _length;
+        private Size? _size;
+
+        /// <summary>
+        /// Initialized values that don't require opening the file.
+        /// </summary>
+        private void Initialize()
+        {
+            Filename = _fs.GetFileName(Path);
+            Extension = _fs.GetExtension(Path) != null
+                ? _fs.GetExtension(Path).Substring(1).ToLowerInvariant()
+                : "";
+            Url = _fs.GetUrl(Path);
+        }
+
+        public string Filename { get; private set; }
+
+        public string Extension { get; private set; }
+
+        public string Path { get; private set; }
+
+        public string Url { get; private set; }
+
+        /// <summary>
+        /// Get the length of the file in bytes
+        /// </summary>
+        /// <remarks>
+        /// We are lazy loading this, don't go opening the file on ctor like we were doing.
+        /// </remarks>
+        public long Length
+        {
+            get
+            {
+                if (_length == null)
+                {
+                    _length = _fs.GetSize(Path);
+                }
+                return _length.Value;
+            }
+        }
+
+        public bool SupportsResizing
+        {
+            get
+            {
+                return ("," + UmbracoSettings.ImageFileTypes + ",").Contains(string.Format(",{0},", Extension));
+            }
+        }
+
+        public string GetFriendlyName()
+        {
+            return Filename.SplitPascalCasing().ToFirstUpperInvariant();
+        }
+
+        public Size GetDimensions()
+        {
+            if (_size == null)
+            {
+                if (_fs.FileExists(Path))
+                {
+                    EnsureFileSupportsResizing();
+
+                    using (var fs = _fs.OpenFile(Path))
+                    using (var image = Image.FromStream(fs))
+                    {
+
+                        var fileWidth = image.Width;
+                        var fileHeight = image.Height;
+                        _size = new Size(fileWidth, fileHeight);
+                    }
+                }
+                else
+                {
+                    _size = new Size(-1, -1);
+                }
+            }
+            return _size.Value;
+        }
+
+        public string Resize(int width, int height)
+        {
+            EnsureFileSupportsResizing();
+
+            var fileNameThumb = DoResize(width, height, 0, string.Empty);
+
+            return _fs.GetUrl(fileNameThumb);
+        }
+
+        public string Resize(int maxWidthHeight, string fileNameAddition)
+        {
+            EnsureFileSupportsResizing();
+
+            var fileNameThumb = DoResize(GetDimensions().Width, GetDimensions().Height, maxWidthHeight, fileNameAddition);
+
+            return _fs.GetUrl(fileNameThumb);
+        }
+
+        private string DoResize(int width, int height, int maxWidthHeight, string fileNameAddition)
+        {
+            using (var fs = _fs.OpenFile(Path))
+            {
+                using (var image = Image.FromStream(fs))
+                {
+                    var fileNameThumb = string.IsNullOrWhiteSpace(fileNameAddition)
+                        ? string.Format("{0}_UMBRACOSYSTHUMBNAIL.jpg", Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)))
+                        : string.Format("{0}_{1}.jpg", Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)), fileNameAddition);
+
+                    var thumbnail = GenerateThumbnail(image, maxWidthHeight, width, height, fileNameThumb, maxWidthHeight == 0);
+
+                    return thumbnail.FileName;
+                }
+            }
+        }
+
+        private void EnsureFileSupportsResizing()
+        {
+            if (SupportsResizing == false)
+                throw new InvalidOperationException(string.Format("The file {0} is not an image, so can't get dimensions", Filename));
+        }
+
+        private ResizedImage GenerateThumbnail(Image image, int maxWidthHeight, int fileWidth, int fileHeight, string thumbnailFileName, bool useFixedDimensions)
+        {
+            // Generate thumbnail
+            float f = 1;
+            if (useFixedDimensions == false)
+            {
+                var fx = (float)image.Size.Width / (float)maxWidthHeight;
+                var fy = (float)image.Size.Height / (float)maxWidthHeight;
+
+                // must fit in thumbnail size
+                f = Math.Max(fx, fy);
+            }
+
+            var widthTh = (int)Math.Round((float)fileWidth / f);
+            var heightTh = (int)Math.Round((float)fileHeight / f);
+
+            // fixes for empty width or height
+            if (widthTh == 0)
+                widthTh = 1;
+            if (heightTh == 0)
+                heightTh = 1;
+
+            // Create new image with best quality settings
+            using (var bp = new Bitmap(widthTh, heightTh))
+            {
+                using (var g = Graphics.FromImage(bp))
+                {
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+                    g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                    g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                    g.CompositingQuality = CompositingQuality.HighQuality;
+
+                    // Copy the old image to the new and resized
+                    var rect = new Rectangle(0, 0, widthTh, heightTh);
+                    g.DrawImage(image, rect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel);
+
+                    // Copy metadata
+                    var imageEncoders = ImageCodecInfo.GetImageEncoders();
+
+                    var codec = Extension.ToLower() == "png" || Extension.ToLower() == "gif"
+                        ? imageEncoders.Single(t => t.MimeType.Equals("image/png"))
+                        : imageEncoders.Single(t => t.MimeType.Equals("image/jpeg"));
+
+                    // Set compresion ratio to 90%
+                    var ep = new EncoderParameters();
+                    ep.Param[0] = new EncoderParameter(Encoder.Quality, 90L);
+
+                    // Save the new image using the dimensions of the image
+                    var newFileName = thumbnailFileName.Replace("UMBRACOSYSTHUMBNAIL", string.Format("{0}x{1}", widthTh, heightTh));
+                    using (var ms = new MemoryStream())
+                    {
+                        bp.Save(ms, codec, ep);
+                        ms.Seek(0, 0);
+
+                        _fs.AddFile(newFileName, ms);
+                    }
+
+                    return new ResizedImage(widthTh, heightTh, newFileName);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Models/Content.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -22,7 +20,7 @@ namespace Umbraco.Core.Models
         private DateTime? _expireDate;
         private int _writer;
         private string _nodeName;//NOTE Once localization is introduced this will be the non-localized Node Name.
-
+        private bool _permissionsChanged;
         /// <summary>
         /// Constructor for creating a Content object
         /// </summary>
@@ -82,6 +80,7 @@ namespace Umbraco.Core.Models
         private static readonly PropertyInfo ExpireDateSelector = ExpressionHelper.GetPropertyInfo<Content, DateTime?>(x => x.ExpireDate);
         private static readonly PropertyInfo WriterSelector = ExpressionHelper.GetPropertyInfo<Content, int>(x => x.WriterId);
         private static readonly PropertyInfo NodeNameSelector = ExpressionHelper.GetPropertyInfo<Content, string>(x => x.NodeName);
+        private static readonly PropertyInfo PermissionsChangedSelector = ExpressionHelper.GetPropertyInfo<Content, bool>(x => x.PermissionsChanged);
 
         /// <summary>
         /// Gets or sets the template used by the Content.
@@ -138,7 +137,10 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Boolean indicating whether this Content is Published or not
         /// </summary>
-        /// <remarks>Setting Published to true/false should be private or internal</remarks>
+        /// <remarks>
+        /// Setting Published to true/false should be private or internal and should ONLY be used for wiring up the value
+        /// from the db or modifying it based on changing the published state.
+        /// </remarks>
         [DataMember]
         public bool Published
         {
@@ -230,6 +232,7 @@ namespace Umbraco.Core.Models
         /// <remarks>
         /// This Property is kept internal until localization is introduced.
         /// </remarks>
+        [DataMember]
         internal string NodeName
         {
             get { return _nodeName; }
@@ -243,6 +246,23 @@ namespace Umbraco.Core.Models
             }
         }
 
+        /// <summary>
+        /// Used internally to track if permissions have been changed during the saving process for this entity
+        /// </summary>
+        [IgnoreDataMember]
+        internal bool PermissionsChanged
+        {
+            get { return _permissionsChanged; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _permissionsChanged = value;
+                    return _permissionsChanged;
+                }, _permissionsChanged, PermissionsChangedSelector);
+            }
+        }
+
         /// <summary>
         /// Gets the ContentType used by this content object
         /// </summary>
@@ -296,6 +316,7 @@ namespace Umbraco.Core.Models
             PublishedState = state;
         }
 
+        [DataMember]
         internal PublishedState PublishedState { get; set; }
 
         /// <summary>
@@ -315,26 +336,6 @@ namespace Umbraco.Core.Models
             }
         }
 
-        /// <summary>
-        /// Creates a clone of the current entity
-        /// </summary>
-        /// <returns></returns>
-        public IContent Clone()
-        {
-            var clone = (Content)this.MemberwiseClone();
-            clone.Key = Guid.Empty;
-            clone.Version = Guid.NewGuid();
-            clone.ResetIdentity();
-
-            foreach (var property in clone.Properties)
-            {
-                property.ResetIdentity();
-                property.Version = clone.Version;
-            }
-
-            return clone;
-        }
-
         /// <summary>
         /// Indicates whether a specific property on the current <see cref="IContent"/> entity is dirty.
         /// </summary>
@@ -355,11 +356,25 @@ namespace Umbraco.Core.Models
         /// <returns>True if entity is dirty, otherwise False</returns>
         public override bool IsDirty()
         {
-            bool dirtyEntity = base.IsDirty();
+            return IsEntityDirty() || IsAnyUserPropertyDirty();
+        }
 
-            bool dirtyProperties = Properties.Any(x => x.IsDirty());
+        /// <summary>
+        /// Returns true if only the entity properties are direty
+        /// </summary>
+        /// <returns></returns>
+        internal bool IsEntityDirty()
+        {
+            return base.IsDirty();
+        }
 
-            return dirtyEntity || dirtyProperties;
+        /// <summary>
+        /// Returns true if any of the properties are dirty
+        /// </summary>
+        /// <returns></returns>
+        internal bool IsAnyUserPropertyDirty()
+        {
+            return Properties.Any(x => x.IsDirty());
         }
 
         /// <summary>
@@ -400,5 +415,47 @@ namespace Umbraco.Core.Models
             base.UpdatingEntity();
             Version = Guid.NewGuid();
         }
+
+        /// <summary>
+        /// Creates a deep clone of the current entity with its identity and it's property identities reset
+        /// </summary>
+        /// <returns></returns>
+        [Obsolete("Use DeepCloneWithResetIdentities instead")]
+        public IContent Clone()
+        {
+            return DeepCloneWithResetIdentities();
+        }
+
+        /// <summary>
+        /// Creates a deep clone of the current entity with its identity and it's property identities reset
+        /// </summary>
+        /// <returns></returns>
+        public IContent DeepCloneWithResetIdentities()
+        {
+            var clone = (Content)DeepClone();
+            clone.Key = Guid.Empty;
+            clone.Version = Guid.NewGuid();
+            clone.ResetIdentity();
+
+            foreach (var property in clone.Properties)
+            {
+                property.ResetIdentity();
+                property.Version = clone.Version;
+            }
+
+            return clone;
+        }
+
+        public override object DeepClone()
+        {
+            var clone = (Content)base.DeepClone();
+
+            //need to manually clone this since it's not settable
+            clone._contentType = (IContentType)ContentType.DeepClone();
+            clone.ResetDirtyProperties(false);
+
+            return clone;
+
+        }
     }
 }

src/Umbraco.Core/Models/ContentBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
@@ -14,10 +15,13 @@ namespace Umbraco.Core.Models
     /// <summary>
     /// Represents an abstract class for base Content properties and methods
     /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
     [DebuggerDisplay("Id: {Id}, Name: {Name}, ContentType: {ContentTypeBase.Alias}")]
     public abstract class ContentBase : Entity, IContentBase
     {
         protected IContentTypeComposition ContentTypeBase;
+        
         private Lazy<int> _parentId;
         private string _name;//NOTE Once localization is introduced this will be the localized Name of the Content/Media.
         private int _sortOrder;
@@ -27,6 +31,7 @@ namespace Umbraco.Core.Models
         private bool _trashed;
         private int _contentTypeId;
         private PropertyCollection _properties;
+        private readonly List<Property> _lastInvalidProperties = new List<Property>();
 
         /// <summary>
         /// Protected constructor for ContentBase (Base for Content and Media)
@@ -49,6 +54,7 @@ namespace Umbraco.Core.Models
             _contentTypeId = int.Parse(contentType.Id.ToString(CultureInfo.InvariantCulture));
             _properties = properties;
             _properties.EnsurePropertyTypes(PropertyTypes);
+            _additionalData = new Dictionary<string, object>();
         }
 
         /// <summary>
@@ -72,6 +78,7 @@ namespace Umbraco.Core.Models
 			_contentTypeId = int.Parse(contentType.Id.ToString(CultureInfo.InvariantCulture));
 			_properties = properties;
 			_properties.EnsurePropertyTypes(PropertyTypes);
+            _additionalData = new Dictionary<string, object>();
 		}
 
 	    private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<ContentBase, string>(x => x.Name);
@@ -252,6 +259,17 @@ namespace Umbraco.Core.Models
             }
         }
 
+        private readonly IDictionary<string, object> _additionalData;
+
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IDictionary<string, object> IUmbracoEntity.AdditionalData
+        {
+            get { return _additionalData; }
+        }
+
         /// <summary>
         /// List of PropertyGroups available on this Content object
         /// </summary>
@@ -292,7 +310,8 @@ namespace Umbraco.Core.Models
         /// <returns><see cref="Property"/> Value as a <see cref="TPassType"/></returns>
         public virtual TPassType GetValue<TPassType>(string propertyTypeAlias)
         {
-            return (TPassType)Properties[propertyTypeAlias].Value;
+            var convertAttempt = Properties[propertyTypeAlias].Value.TryConvertTo<TPassType>();
+            return convertAttempt.Success ? convertAttempt.Result : default(TPassType);
         }
 
         /// <summary>
@@ -421,9 +440,36 @@ namespace Umbraco.Core.Models
         /// <returns>True if content is valid otherwise false</returns>
         public virtual bool IsValid()
         {
-            return Properties.Any(property => !property.IsValid()) == false;
+            _lastInvalidProperties.Clear();
+            _lastInvalidProperties.AddRange(Properties.Where(property => property.IsValid() == false));
+            return _lastInvalidProperties.Any() == false;
+        }
+
+        /// <summary>
+        /// Returns a collection of the result of the last validation process, this collection contains all invalid properties.
+        /// </summary>
+        [IgnoreDataMember]
+        internal IEnumerable<Property> LastInvalidProperties
+        {
+            get { return _lastInvalidProperties; }
         }
 
         public abstract void ChangeTrashedState(bool isTrashed, int parentId = -20);
+
+        /// <summary>
+        /// We will override this method to ensure that when we reset the dirty properties that we 
+        /// also reset the dirty changes made to the content's Properties (user defined)
+        /// </summary>
+        /// <param name="rememberPreviouslyChangedProperties"></param>
+        internal override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        {
+            base.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+
+            foreach (var prop in Properties)
+            {
+                prop.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+            }
+        }
+        
     }
 }

src/Umbraco.Core/Models/ContentExtensions.cs

@@ -12,16 +12,133 @@ using System.Xml.Linq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Media;
+using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Models
 {
     public static class ContentExtensions
     {
         #region IContent
+
+        /// <summary>
+        /// Returns true if this entity was just published as part of a recent save operation (i.e. it wasn't previously published)
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is helpful for determining if the published event will execute during the saved event for a content item.
+        /// </remarks>
+        internal static bool JustPublished(this IContent entity)
+        {
+            var dirty = (IRememberBeingDirty)entity;
+            return dirty.WasPropertyDirty("Published") && entity.Published;
+        }
+
+        /// <summary>
+        /// Determines if a new version should be created
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// A new version needs to be created when:
+        /// * The publish status is changed
+        /// * The language is changed
+        /// * The item is already published and is being published again and any property value is changed (to enable a rollback)
+        /// </remarks>
+        internal static bool ShouldCreateNewVersion(this IContent entity)
+        {
+            var publishedState = ((Content)entity).PublishedState;
+            return ShouldCreateNewVersion(entity, publishedState);
+        }
+
+        /// <summary>
+        /// Determines if a new version should be created
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="publishedState"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// A new version needs to be created when:
+        /// * The publish status is changed
+        /// * The language is changed
+        /// * The item is already published and is being published again and any property value is changed (to enable a rollback)
+        /// </remarks>
+        internal static bool ShouldCreateNewVersion(this IContent entity, PublishedState publishedState)
+        {
+            var dirtyEntity = (ICanBeDirty)entity;
+            
+            //check if the published state has changed or the language
+            var contentChanged =
+                (dirtyEntity.IsPropertyDirty("Published") && publishedState != PublishedState.Unpublished)
+                || dirtyEntity.IsPropertyDirty("Language");
+
+            //return true if published or language has changed
+            if (contentChanged)
+            {
+                return true;
+            }
+
+            //check if any user prop has changed
+            var propertyValueChanged = ((Content) entity).IsAnyUserPropertyDirty();
+            //check if any content prop has changed
+            var contentDataChanged = ((Content) entity).IsEntityDirty();
+
+            //return true if the item is published and a property has changed or if any content property has changed
+            return (propertyValueChanged && publishedState == PublishedState.Published) || contentDataChanged;
+        }
+
+        /// <summary>
+        /// Determines if the published db flag should be set to true for the current entity version and all other db
+        /// versions should have their flag set to false.
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is determined by:
+        /// * If a new version is being created and the entity is published
+        /// * If the published state has changed and the entity is published OR the entity has been un-published.
+        /// </remarks>
+        internal static bool ShouldClearPublishedFlagForPreviousVersions(this IContent entity)
+        {
+            var publishedState = ((Content)entity).PublishedState;
+            return entity.ShouldClearPublishedFlagForPreviousVersions(publishedState, entity.ShouldCreateNewVersion(publishedState));
+        }
+
+        /// <summary>
+        /// Determines if the published db flag should be set to true for the current entity version and all other db
+        /// versions should have their flag set to false.
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="publishedState"></param>
+        /// <param name="isCreatingNewVersion"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is determined by:
+        /// * If a new version is being created and the entity is published
+        /// * If the published state has changed and the entity is published OR the entity has been un-published.
+        /// </remarks>
+        internal static bool ShouldClearPublishedFlagForPreviousVersions(this IContent entity, PublishedState publishedState, bool isCreatingNewVersion)
+        {
+            if (isCreatingNewVersion && entity.Published)
+            {
+                return true;
+            }
+
+            //If Published state has changed then previous versions should have their publish state reset.
+            //If state has been changed to unpublished the previous versions publish state should also be reset.
+            if (((ICanBeDirty)entity).IsPropertyDirty("Published") && (entity.Published || publishedState == PublishedState.Unpublished))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Returns a list of the current contents ancestors, not including the content itself.
         /// </summary>
@@ -105,6 +222,72 @@ namespace Umbraco.Core.Models
         }
         #endregion
 
+        
+        /// <summary>
+        /// Removes characters that are not valide XML characters from all entity properties 
+        /// of type string. See: http://stackoverflow.com/a/961504/5018
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// If this is not done then the xml cache can get corrupt and it will throw YSODs upon reading it.
+        /// </remarks>
+        /// <param name="entity"></param>
+        public static void SanitizeEntityPropertiesForXmlStorage(this IContentBase entity)
+        {
+            entity.Name = entity.Name.ToValidXmlString();
+            foreach (var property in entity.Properties)
+            {
+                if (property.Value is string)
+                {
+                    var value = (string)property.Value;
+                    property.Value = value.ToValidXmlString();
+                }
+            }
+        }
+        /// <summary>
+        /// Checks if the IContentBase has children
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is a bit of a hack because we need to type check!
+        /// </remarks>
+        internal static bool HasChildren(IContentBase content, ServiceContext services)
+        {
+            if (content is IContent)
+            {
+                return services.ContentService.HasChildren(content.Id);
+            }
+            if (content is IMedia)
+            {
+                return services.MediaService.HasChildren(content.Id);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the children for the content base item
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is a bit of a hack because we need to type check!
+        /// </remarks>
+        internal static IEnumerable<IContentBase> Children(IContentBase content, ServiceContext services)
+        {
+            if (content is IContent)
+            {
+                return services.ContentService.GetChildren(content.Id);
+            }
+            if (content is IMedia)
+            {
+                return services.MediaService.GetChildren(content.Id);
+            }
+            return null;
+        }
+
         /// <summary>
         /// Set property values by alias with an annonymous object
         /// </summary>
@@ -216,8 +399,7 @@ namespace Umbraco.Core.Models
         /// <param name="propertyTypeAlias">Alias of the property to save the value on</param>
         /// <param name="fileName">Name of the file</param>
         /// <param name="fileStream"><see cref="Stream"/> to save to disk</param>
-        public static void SetValue(this IContentBase content, string propertyTypeAlias, string fileName,
-                                    Stream fileStream)
+        public static void SetValue(this IContentBase content, string propertyTypeAlias, string fileName, Stream fileStream)
         {
             var name = IOHelper.SafeFileName(fileName);
 
@@ -231,75 +413,82 @@ namespace Umbraco.Core.Models
             if (property == null)
                 return;
 
-            bool supportsResizing = false;
             var numberedFolder = MediaSubfolderCounter.Current.Increment();
-            string fileName = UmbracoSettings.UploadAllowDirectories
+            var fileName = UmbracoSettings.UploadAllowDirectories
                                               ? Path.Combine(numberedFolder.ToString(CultureInfo.InvariantCulture), name)
                                               : numberedFolder + "-" + name;
 
-            string extension = Path.GetExtension(name).Substring(1).ToLowerInvariant();
+            var extension = Path.GetExtension(name).Substring(1).ToLowerInvariant();
+
+            //the file size is the length of the stream in bytes
+            var fileSize = fileStream.Length;
 
             var fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
             fs.AddFile(fileName, fileStream);
-
+            
             //Check if file supports resizing and create thumbnails
-            if (("," + UmbracoSettings.ImageFileTypes + ",").Contains(string.Format(",{0},", extension)))
-            {
-                supportsResizing = true;
+            var supportsResizing = ("," + UmbracoSettings.ImageFileTypes + ",").Contains(string.Format(",{0},", extension));
 
-                // Make default thumbnail
-                var thumbUrl = Resize(fs, fileName, extension, 100, "thumb");
-
-                //Look up Prevalues for this upload datatype - if it is an upload datatype
-                var uploadFieldId = new Guid(Constants.PropertyEditors.UploadField);
-                if (property.PropertyType.DataTypeId == uploadFieldId)
-                {
-                    //Get Prevalues by the DataType's Id: property.PropertyType.DataTypeId
-                    var values = ApplicationContext.Current.Services.DataTypeService.GetPreValuesByDataTypeId(property.PropertyType.DataTypeDefinitionId);
-                    var thumbnailSizes = values.FirstOrDefault();
-                    //Additional thumbnails configured as prevalues on the DataType
-                    if (thumbnailSizes != null)
-                    {
-                        char sep = (!thumbnailSizes.Contains("") && thumbnailSizes.Contains(",")) ? ',' : ';';
-
-                        foreach (string thumb in thumbnailSizes.Split(sep))
-                        {
-                            int thumbSize;
-                            if (thumb != "" && int.TryParse(thumb, out thumbSize))
-                            {
-                                Resize(fs, fileName, extension, thumbSize, string.Format("thumb_{0}", thumbSize));
-                            }
-                        }
-                    }
-                }
-            }
+            //the config section used to auto-fill properties
+            XmlNode uploadFieldConfigNode = null;
 
             //Check for auto fill of additional properties
             if (UmbracoSettings.ImageAutoFillImageProperties != null)
             {
-                XmlNode uploadFieldConfigNode =
+                uploadFieldConfigNode =
                     UmbracoSettings.ImageAutoFillImageProperties.SelectSingleNode(
                         string.Format("uploadField [@alias = \"{0}\"]", propertyTypeAlias));
+            }
 
-                if (uploadFieldConfigNode != null)
-                {
-                    //Only add dimensions to web images
-                    if (supportsResizing)
+            if (supportsResizing)
+            {
+                //get the original image from the original stream
+                if (fileStream.CanSeek) fileStream.Seek(0, 0);
+                using (var originalImage = Image.FromStream(fileStream))
+                {                    
+                    // Make default thumbnail
+                    Resize(fs, fileName, extension, 100, "thumb", originalImage);
+
+                    //Look up Prevalues for this upload datatype - if it is an upload datatype
+                    var uploadFieldId = new Guid(Constants.PropertyEditors.UploadField);
+                    if (property.PropertyType.DataTypeId == uploadFieldId)
                     {
-                        SetPropertyValue(content, uploadFieldConfigNode, "widthFieldAlias", GetDimensions(fs, fileName).Item1.ToString(CultureInfo.InvariantCulture));
-                        SetPropertyValue(content, uploadFieldConfigNode, "heightFieldAlias", GetDimensions(fs, fileName).Item2.ToString(CultureInfo.InvariantCulture));
-                    }
-                    else
-                    {
-                        SetPropertyValue(content, uploadFieldConfigNode, "widthFieldAlias", string.Empty);
-                        SetPropertyValue(content, uploadFieldConfigNode, "heightFieldAlias", string.Empty);
+                        //Get Prevalues by the DataType's Id: property.PropertyType.DataTypeId
+                        var values = ApplicationContext.Current.Services.DataTypeService.GetPreValuesByDataTypeId(property.PropertyType.DataTypeDefinitionId);
+                        var thumbnailSizes = values.FirstOrDefault();
+                        //Additional thumbnails configured as prevalues on the DataType
+                        if (thumbnailSizes != null)
+                        {
+                            char sep = (!thumbnailSizes.Contains("") && thumbnailSizes.Contains(",")) ? ',' : ';';
+
+                            foreach (var thumb in thumbnailSizes.Split(sep))
+                            {
+                                int thumbSize;
+                                if (thumb != "" && int.TryParse(thumb, out thumbSize))
+                                {
+                                    Resize(fs, fileName, extension, thumbSize, string.Format("thumb_{0}", thumbSize), originalImage);
+                                }
+                            }
+                        }
                     }
 
-                    SetPropertyValue(content, uploadFieldConfigNode, "lengthFieldAlias", fs.GetSize(fileName).ToString(CultureInfo.InvariantCulture));
-                    SetPropertyValue(content, uploadFieldConfigNode, "extensionFieldAlias", extension);
+                    //while the image is still open, we'll check if we need to auto-populate the image properties
+                    if (uploadFieldConfigNode != null)
+                    {
+                        SetPropertyValue(content, uploadFieldConfigNode, "widthFieldAlias", originalImage.Width.ToString(CultureInfo.InvariantCulture));
+                        SetPropertyValue(content, uploadFieldConfigNode, "heightFieldAlias", originalImage.Height.ToString(CultureInfo.InvariantCulture));
+                    }
+   
                 }
             }
 
+            //if auto-fill is true, then fill the remaining, non-image properties
+            if (uploadFieldConfigNode != null)
+            {
+                SetPropertyValue(content, uploadFieldConfigNode, "lengthFieldAlias", fileSize.ToString(CultureInfo.InvariantCulture));
+                SetPropertyValue(content, uploadFieldConfigNode, "extensionFieldAlias", extension);
+            }
+
             //Set the value of the property to that of the uploaded file's url
             property.Value = fs.GetUrl(fileName);
         }
@@ -313,68 +502,37 @@ namespace Umbraco.Core.Models
             }
         }
 
-        private static string Resize(MediaFileSystem fileSystem, string path, string extension, int maxWidthHeight, string fileNameAddition)
+        private static ResizedImage Resize(MediaFileSystem fileSystem, string path, string extension, int maxWidthHeight, string fileNameAddition, Image originalImage)
         {
-            var fileNameThumb = DoResize(fileSystem, path, extension, GetDimensions(fileSystem, path).Item1, GetDimensions(fileSystem, path).Item2, maxWidthHeight, fileNameAddition);
-
-            return fileSystem.GetUrl(fileNameThumb);
-        }
-
-        private static Tuple<int, int> GetDimensions(MediaFileSystem fileSystem, string path)
-        {
-            var fs = fileSystem.OpenFile(path);
-            var image = Image.FromStream(fs);
-            var fileWidth = image.Width;
-            var fileHeight = image.Height;
-            fs.Close();
-            image.Dispose();
-
-            return new Tuple<int, int>(fileWidth, fileHeight);
-        }
-
-        private static string DoResize(MediaFileSystem fileSystem, string path, string extension, int width, int height, int maxWidthHeight, string fileNameAddition)
-        {
-            var fs = fileSystem.OpenFile(path);
-            var image = Image.FromStream(fs);
-            fs.Close();
-
-            string fileNameThumb = String.IsNullOrEmpty(fileNameAddition) ?
-                string.Format("{0}_UMBRACOSYSTHUMBNAIL.jpg", path.Substring(0, path.LastIndexOf("."))) :
-                string.Format("{0}_{1}.jpg", path.Substring(0, path.LastIndexOf(".")), fileNameAddition);
+            var fileNameThumb = String.IsNullOrEmpty(fileNameAddition)
+                                            ? string.Format("{0}_UMBRACOSYSTHUMBNAIL.jpg", path.Substring(0, path.LastIndexOf(".")))
+                                            : string.Format("{0}_{1}.jpg", path.Substring(0, path.LastIndexOf(".")), fileNameAddition);
 
             var thumb = GenerateThumbnail(fileSystem,
-                image,
+                originalImage,
                 maxWidthHeight,
-                width,
-                height,
-                path,
                 extension,
                 fileNameThumb,
                 maxWidthHeight == 0);
 
-            fileNameThumb = thumb.Item3;
-
-            image.Dispose();
-
-            return fileNameThumb;
+            return thumb;    
         }
-
-        private static Tuple<int, int, string> GenerateThumbnail(MediaFileSystem fileSystem, Image image, int maxWidthHeight, int fileWidth,
-                                                int fileHeight, string fullFilePath, string extension,
-                                                string thumbnailFileName, bool useFixedDimensions)
+        
+        private static ResizedImage GenerateThumbnail(MediaFileSystem fileSystem, Image image, int maxWidthHeight, string extension, string thumbnailFileName, bool useFixedDimensions)
         {
             // Generate thumbnail
             float f = 1;
             if (!useFixedDimensions)
             {
-                var fx = (float)image.Size.Width / (float)maxWidthHeight;
-                var fy = (float)image.Size.Height / (float)maxWidthHeight;
+                var fx = image.Width / (float)maxWidthHeight;
+                var fy = image.Height / (float)maxWidthHeight;
 
                 // must fit in thumbnail size
                 f = Math.Max(fx, fy); //if (f < 1) f = 1;
             }
 
-            var widthTh = (int)Math.Round((float)fileWidth / f); int heightTh = (int)Math.Round((float)fileHeight / f);
+            var widthTh = (int)Math.Round(image.Width / f);
+            var heightTh = (int)Math.Round(image.Height / f);
 
             // fixes for empty width or height
             if (widthTh == 0)
@@ -383,44 +541,45 @@ namespace Umbraco.Core.Models
                 heightTh = 1;
 
             // Create new image with best quality settings
-            var bp = new Bitmap(widthTh, heightTh);
-            var g = Graphics.FromImage(bp);
-            g.SmoothingMode = SmoothingMode.HighQuality;
-            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
-            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
-            g.CompositingQuality = CompositingQuality.HighQuality;
+            using (var bp = new Bitmap(widthTh, heightTh))
+            {
+                using (var g = Graphics.FromImage(bp))
+                {
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+                    g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                    g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                    g.CompositingQuality = CompositingQuality.HighQuality;
 
-            // Copy the old image to the new and resized
-            var rect = new Rectangle(0, 0, widthTh, heightTh);
-            g.DrawImage(image, rect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel);
+                    // Copy the old image to the new and resized
+                    var rect = new Rectangle(0, 0, widthTh, heightTh);
+                    g.DrawImage(image, rect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel);
 
-            // Copy metadata
-            var imageEncoders = ImageCodecInfo.GetImageEncoders();
-            ImageCodecInfo codec = null;
-            if (extension.ToLower() == "png" || extension.ToLower() == "gif")
-                codec = imageEncoders.Single(t => t.MimeType.Equals("image/png"));
-            else
-                codec = imageEncoders.Single(t => t.MimeType.Equals("image/jpeg"));
+                    // Copy metadata
+                    var imageEncoders = ImageCodecInfo.GetImageEncoders();
+                    ImageCodecInfo codec;
+                    if (extension.ToLower() == "png" || extension.ToLower() == "gif")
+                        codec = imageEncoders.Single(t => t.MimeType.Equals("image/png"));
+                    else
+                        codec = imageEncoders.Single(t => t.MimeType.Equals("image/jpeg"));
+                    
+                    // Set compresion ratio to 90%
+                    var ep = new EncoderParameters();
+                    ep.Param[0] = new EncoderParameter(Encoder.Quality, 90L);
 
+                    // Save the new image using the dimensions of the image
+                    var newFileName = thumbnailFileName.Replace("UMBRACOSYSTHUMBNAIL",
+                                                                   string.Format("{0}x{1}", widthTh, heightTh));
+                    using (var ms = new MemoryStream())
+                    {
+                        bp.Save(ms, codec, ep);
+                        ms.Seek(0, 0);
 
-            // Set compresion ratio to 90%
-            var ep = new EncoderParameters();
-            ep.Param[0] = new EncoderParameter(Encoder.Quality, 90L);
+                        fileSystem.AddFile(newFileName, ms);                  
+                    }
 
-            // Save the new image using the dimensions of the image
-            string newFileName = thumbnailFileName.Replace("UMBRACOSYSTHUMBNAIL",
-                                                           string.Format("{0}x{1}", widthTh, heightTh));
-            var ms = new MemoryStream();
-            bp.Save(ms, codec, ep);
-            ms.Seek(0, 0);
-
-            fileSystem.AddFile(newFileName, ms);
-
-            ms.Close();
-            bp.Dispose();
-            g.Dispose();
-
-            return new Tuple<int, int, string>(widthTh, heightTh, newFileName);
+                    return new ResizedImage(widthTh, heightTh, newFileName);
+                }                
+            }
         }
 
 		/// <summary>
@@ -467,38 +626,7 @@ namespace Umbraco.Core.Models
         /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
         internal static XElement ToDeepXml(this IContent content)
         {
-            var xml = content.ToXml();
-            
-            var descendants = content.Descendants().ToArray();
-            var currentChildren = descendants.Where(x => x.ParentId == content.Id);
-            AddChildXml(descendants, currentChildren, xml);      
-
-            return xml;
-        }
-
-        /// <summary>
-        /// Used by ToDeepXml to recursively add children
-        /// </summary>
-        /// <param name="originalDescendants"></param>
-        /// <param name="currentChildren"></param>
-        /// <param name="currentXml"></param>
-        private static void AddChildXml(
-            IContent[] originalDescendants, 
-            IEnumerable<IContent> currentChildren, 
-            XElement currentXml)
-        {
-            foreach (var child in currentChildren)
-            {
-                //add the child's xml
-                var childXml = child.ToXml();
-                currentXml.Add(childXml);
-                //copy local (out of closure)
-                var c = child;
-                //get this item's children                
-                var children = originalDescendants.Where(x => x.ParentId == c.Id);
-                //recurse and add it's children to the child xml element
-                AddChildXml(originalDescendants, children, childXml);
-            }
+            return ApplicationContext.Current.Services.PackagingService.Export(content, true);
         }
 
         /// <summary>
@@ -508,21 +636,7 @@ namespace Umbraco.Core.Models
         /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
         public static XElement ToXml(this IContent content)
         {
-			//nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
-			var nodeName = UmbracoSettings.UseLegacyXmlSchema ? "node" : content.ContentType.Alias.ToSafeAliasWithForcingCheck();
-
-            var x = content.ToXml(nodeName);
-            x.Add(new XAttribute("nodeType", content.ContentType.Id));
-            x.Add(new XAttribute("creatorName", content.GetCreatorProfile().Name));
-            x.Add(new XAttribute("writerName", content.GetWriterProfile().Name));
-            x.Add(new XAttribute("writerID", content.WriterId));
-            x.Add(new XAttribute("template", content.Template == null ? "0" : content.Template.Id.ToString()));
-            if (UmbracoSettings.UseLegacyXmlSchema)
-            {
-                x.Add(new XAttribute("nodeTypeAlias", content.ContentType.Alias));
-            }
-
-            return x;
+            return ApplicationContext.Current.Services.PackagingService.Export(content);
         }
 
         /// <summary>
@@ -532,53 +646,19 @@ namespace Umbraco.Core.Models
         /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
         public static XElement ToXml(this IMedia media)
         {
-            //nodeName should match Casing.SafeAliasWithForcingCheck(content.ContentType.Alias);
-            var nodeName = UmbracoSettings.UseLegacyXmlSchema ? "node" : media.ContentType.Alias.ToSafeAliasWithForcingCheck();
-
-            var x = media.ToXml(nodeName);
-            x.Add(new XAttribute("nodeType", media.ContentType.Id));
-            x.Add(new XAttribute("writerName", media.GetCreatorProfile().Name));
-            x.Add(new XAttribute("writerID", media.CreatorId));
-            x.Add(new XAttribute("version", media.Version));
-            x.Add(new XAttribute("template", 0));
-            if (UmbracoSettings.UseLegacyXmlSchema)
-            {
-                x.Add(new XAttribute("nodeTypeAlias", media.ContentType.Alias));
-            }
-
-            return x;
+            return ApplicationContext.Current.Services.PackagingService.Export(media);
         }
 
         /// <summary>
-        /// Creates the xml representation for the <see cref="IContentBase"/> object
+        /// Creates the full xml representation for the <see cref="IMedia"/> object and all of it's descendants
         /// </summary>
-        /// <param name="contentBase"><see cref="IContent"/> to generate xml for</param>
-        /// <param name="nodeName"></param>
-        /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
-        private static XElement ToXml(this IContentBase contentBase, string nodeName)
+        /// <param name="media"><see cref="IMedia"/> to generate xml for</param>
+        /// <returns>Xml representation of the passed in <see cref="IMedia"/></returns>
+        internal static XElement ToDeepXml(this IMedia media)
         {
-            // note: that one will take care of umbracoUrlName
-            var url = contentBase.GetUrlSegment();
-
-			var xml = new XElement(nodeName,
-                                   new XAttribute("id", contentBase.Id),
-                                   new XAttribute("parentID", contentBase.Level > 1 ? contentBase.ParentId : -1),
-                                   new XAttribute("level", contentBase.Level),
-                                   new XAttribute("creatorID", contentBase.CreatorId),
-                                   new XAttribute("sortOrder", contentBase.SortOrder),
-                                   new XAttribute("createDate", contentBase.CreateDate.ToString("s")),
-                                   new XAttribute("updateDate", contentBase.UpdateDate.ToString("s")),
-                                   new XAttribute("nodeName", contentBase.Name),
-                                   new XAttribute("urlName", url),
-                                   new XAttribute("path", contentBase.Path),
-                                   new XAttribute("isDoc", ""));
-
-            foreach (var property in contentBase.Properties.Where(p => p != null))
-				xml.Add(property.ToXml());
-
-			return xml;
-		}
-
+            return ApplicationContext.Current.Services.PackagingService.Export(media, true);
+        }
+        
         /// <summary>
         /// Creates the xml representation for the <see cref="IContent"/> object
         /// </summary>
@@ -591,5 +671,15 @@ namespace Umbraco.Core.Models
             //If current IContent is published we should get latest unpublished version
             return content.ToXml();
         }
+
+        /// <summary>
+        /// Creates the xml representation for the <see cref="IMember"/> object
+        /// </summary>
+        /// <param name="member"><see cref="IMember"/> to generate xml for</param>
+        /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
+        public static XElement ToXml(this IMember member)
+        {
+            return ApplicationContext.Current.Services.PackagingService.Export(member);
+        }
     }
 }

src/Umbraco.Core/Models/ContentPreviewEntity.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Used content repository in order to add an entity to the persisted collection to be saved
+    /// in a single transaction during saving an entity
+    /// </summary>
+    internal class ContentPreviewEntity<TContent> : ContentXmlEntity<TContent> 
+        where TContent : IContentBase
+    {
+        public ContentPreviewEntity(bool previewExists, TContent content, Func<TContent, XElement> xml)
+            : base(previewExists, content, xml)
+        {
+            Version = content.Version;
+        }
+
+        public Guid Version { get; private set; }
+    }
+}

src/Umbraco.Core/Models/ContentType.cs

@@ -121,66 +121,6 @@ namespace Umbraco.Core.Models
             return result;
         }
 
-        /// <summary>
-        /// Indicates whether a specific property on the current <see cref="IContent"/> entity is dirty.
-        /// </summary>
-        /// <param name="propertyName">Name of the property to check</param>
-        /// <returns>True if Property is dirty, otherwise False</returns>
-        public override bool IsPropertyDirty(string propertyName)
-        {
-            bool existsInEntity = base.IsPropertyDirty(propertyName);
-
-            bool anyDirtyGroups = PropertyGroups.Any(x => x.IsPropertyDirty(propertyName));
-            bool anyDirtyTypes = PropertyTypes.Any(x => x.IsPropertyDirty(propertyName));
-
-            return existsInEntity || anyDirtyGroups || anyDirtyTypes;
-        }
-
-        /// <summary>
-        /// Indicates whether the current entity is dirty.
-        /// </summary>
-        /// <returns>True if entity is dirty, otherwise False</returns>
-        public override bool IsDirty()
-        {
-            bool dirtyEntity = base.IsDirty();
-
-            bool dirtyGroups = PropertyGroups.Any(x => x.IsDirty());
-            bool dirtyTypes = PropertyTypes.Any(x => x.IsDirty());
-
-            return dirtyEntity || dirtyGroups || dirtyTypes;
-        }
-
-        /// <summary>
-        /// Resets dirty properties by clearing the dictionary used to track changes.
-        /// </summary>
-        /// <remarks>
-        /// Please note that resetting the dirty properties could potentially
-        /// obstruct the saving of a new or updated entity.
-        /// </remarks>
-        public override void ResetDirtyProperties()
-        {
-            base.ResetDirtyProperties();
-
-            //loop through each property group to reset the property types
-            var propertiesReset = new List<int>();
-
-            foreach (var propertyGroup in PropertyGroups)
-            {
-                propertyGroup.ResetDirtyProperties();
-                foreach (var propertyType in propertyGroup.PropertyTypes)
-                {                    
-                    propertyType.ResetDirtyProperties();
-                    propertiesReset.Add(propertyType.Id);
-                }
-            }
-            //then loop through our property type collection since some might not exist on a property group
-            //but don't re-reset ones we've already done.
-            foreach (var propertyType in PropertyTypes.Where(x => propertiesReset.Contains(x.Id) == false))
-            {
-                propertyType.ResetDirtyProperties();
-            }
-        }
-
         /// <summary>
         /// Method to call when Entity is being saved
         /// </summary>
@@ -193,13 +133,41 @@ namespace Umbraco.Core.Models
                 Key = Guid.NewGuid();
         }
 
+
         /// <summary>
-        /// Method to call when Entity is being updated
+        /// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
         /// </summary>
-        /// <remarks>Modified Date is set and a new Version guid is set</remarks>
-        internal override void UpdatingEntity()
-        {
-            base.UpdatingEntity();
+        /// <returns></returns>
+        [Obsolete("Use DeepCloneWithResetIdentities instead")]
+        public IContentType Clone(string alias)
+        {            
+            return DeepCloneWithResetIdentities(alias);
         }
+
+        /// <summary>
+        /// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
+        /// </summary>
+        /// <returns></returns>
+        public IContentType DeepCloneWithResetIdentities(string alias)
+        {
+            var clone = (ContentType)DeepClone();
+            clone.Alias = alias;
+            clone.Key = Guid.Empty;
+            foreach (var propertyGroup in clone.PropertyGroups)
+            {
+                propertyGroup.ResetIdentity();
+                propertyGroup.ResetDirtyProperties(false);
+            }
+            foreach (var propertyType in clone.PropertyTypes)
+            {
+                propertyType.ResetIdentity();
+                propertyType.ResetDirtyProperties(false);
+            }
+
+            clone.ResetIdentity();
+            clone.ResetDirtyProperties(false);
+            return clone;
+        }
+
     }
 }

src/Umbraco.Core/Models/ContentTypeBase.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Strings;
 
 namespace Umbraco.Core.Models
 {
@@ -42,6 +44,8 @@ namespace Umbraco.Core.Models
             _allowedContentTypes = new List<ContentTypeSort>();
             _propertyGroups = new PropertyGroupCollection();
             _propertyTypes = new PropertyTypeCollection();
+            _propertyTypes.CollectionChanged += PropertyTypesChanged;
+            _additionalData = new Dictionary<string, object>();
         }
 
 		protected ContentTypeBase(IContentTypeBase parent)
@@ -52,6 +56,8 @@ namespace Umbraco.Core.Models
 			_allowedContentTypes = new List<ContentTypeSort>();
 			_propertyGroups = new PropertyGroupCollection();
             _propertyTypes = new PropertyTypeCollection();
+            _propertyTypes.CollectionChanged += PropertyTypesChanged;
+            _additionalData = new Dictionary<string, object>();
 		}
 
         private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, string>(x => x.Name);
@@ -168,7 +174,8 @@ namespace Umbraco.Core.Models
             {
                 SetPropertyValueAndDetectChanges(o =>
                     {
-                        _alias = value.ToSafeAlias();
+                        //_alias = value.ToSafeAlias();
+                        _alias = value.ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase);
                         return _alias;
                     }, _alias, AliasSelector);
             }
@@ -314,6 +321,16 @@ namespace Umbraco.Core.Models
             }
         }
 
+        private IDictionary<string, object> _additionalData;
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IDictionary<string, object> IUmbracoEntity.AdditionalData
+        {
+            get { return _additionalData; }
+        }
+
         /// <summary>
         /// Gets or sets a list of integer Ids for allowed ContentTypes
         /// </summary>
@@ -334,7 +351,9 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// List of PropertyGroups available on this ContentType
         /// </summary>
-        /// <remarks>A PropertyGroup corresponds to a Tab in the UI</remarks>
+        /// <remarks>
+        /// A PropertyGroup corresponds to a Tab in the UI
+        /// </remarks>
         [DataMember]
         public virtual PropertyGroupCollection PropertyGroups
         {
@@ -350,7 +369,13 @@ namespace Umbraco.Core.Models
         /// List of PropertyTypes available on this ContentType.
         /// This list aggregates PropertyTypes across the PropertyGroups.
         /// </summary>
+        /// <remarks>
+        /// Marked as DoNotClone because the result of this property is not the natural result of the data, it is 
+        /// a union of data so when auto-cloning if the setter is used it will be setting the unnatural result of the 
+        /// data. We manually clone this instead. 
+        /// </remarks>
         [IgnoreDataMember]
+        [DoNotClone]
         public virtual IEnumerable<PropertyType> PropertyTypes
         {
             get
@@ -366,6 +391,14 @@ namespace Umbraco.Core.Models
         }
 
         /// <summary>
+        /// Returns the property type collection containing types that are non-groups - used for tests
+        /// </summary>
+        internal IEnumerable<PropertyType> NonGroupedPropertyTypes
+        {
+            get { return _propertyTypes; }
+        }
+
+            /// <summary>
         /// A boolean flag indicating if a property type has been removed from this instance.
         /// </summary>
         /// <remarks>
@@ -415,8 +448,7 @@ namespace Umbraco.Core.Models
         {
             if (PropertyTypeExists(propertyType.Alias) == false)
             {
-                _propertyTypes.Add(propertyType);
-                _propertyTypes.CollectionChanged += PropertyTypesChanged;
+                _propertyTypes.Add(propertyType);                
                 return true;
             }
 
@@ -477,6 +509,15 @@ namespace Umbraco.Core.Models
             }
         }
 
+        /// <summary>
+        /// Removes a PropertyGroup from the current ContentType
+        /// </summary>
+        /// <param name="propertyGroupName">Name of the <see cref="PropertyGroup"/> to remove</param>
+        public void RemovePropertyGroup(string propertyGroupName)
+        {
+            PropertyGroups.RemoveItem(propertyGroupName);
+        }
+
         /// <summary>
         /// Sets the ParentId from the lazy integer id
         /// </summary>
@@ -485,5 +526,88 @@ namespace Umbraco.Core.Models
         {
             _parentId = id;
         }
+
+        /// <summary>
+        /// PropertyTypes that are not part of a PropertyGroup
+        /// </summary>
+        [IgnoreDataMember]
+        internal PropertyTypeCollection PropertyTypeCollection
+        {
+             get { return _propertyTypes; }
+        }
+
+        /// <summary>
+        /// Indicates whether a specific property on the current <see cref="IContent"/> entity is dirty.
+        /// </summary>
+        /// <param name="propertyName">Name of the property to check</param>
+        /// <returns>True if Property is dirty, otherwise False</returns>
+        public override bool IsPropertyDirty(string propertyName)
+        {
+            bool existsInEntity = base.IsPropertyDirty(propertyName);
+
+            bool anyDirtyGroups = PropertyGroups.Any(x => x.IsPropertyDirty(propertyName));
+            bool anyDirtyTypes = PropertyTypes.Any(x => x.IsPropertyDirty(propertyName));
+
+            return existsInEntity || anyDirtyGroups || anyDirtyTypes;
+        }
+
+        /// <summary>
+        /// Indicates whether the current entity is dirty.
+        /// </summary>
+        /// <returns>True if entity is dirty, otherwise False</returns>
+        public override bool IsDirty()
+        {
+            bool dirtyEntity = base.IsDirty();
+
+            bool dirtyGroups = PropertyGroups.Any(x => x.IsDirty());
+            bool dirtyTypes = PropertyTypes.Any(x => x.IsDirty());
+
+            return dirtyEntity || dirtyGroups || dirtyTypes;
+        }
+
+        /// <summary>
+        /// Resets dirty properties by clearing the dictionary used to track changes.
+        /// </summary>
+        /// <remarks>
+        /// Please note that resetting the dirty properties could potentially
+        /// obstruct the saving of a new or updated entity.
+        /// </remarks>
+        public override void ResetDirtyProperties()
+        {
+            base.ResetDirtyProperties();
+
+            //loop through each property group to reset the property types
+            var propertiesReset = new List<int>();
+
+            foreach (var propertyGroup in PropertyGroups)
+            {
+                propertyGroup.ResetDirtyProperties();
+                foreach (var propertyType in propertyGroup.PropertyTypes)
+                {
+                    propertyType.ResetDirtyProperties();
+                    propertiesReset.Add(propertyType.Id);
+                }
+            }
+            //then loop through our property type collection since some might not exist on a property group
+            //but don't re-reset ones we've already done.
+            foreach (var propertyType in PropertyTypes.Where(x => propertiesReset.Contains(x.Id) == false))
+            {
+                propertyType.ResetDirtyProperties();
+            }
+        }
+
+        public override object DeepClone()
+        {
+            var clone = (ContentTypeBase)base.DeepClone();
+
+            //need to manually wire up the event handlers for the property type collections - we've ensured
+            // its ignored from the auto-clone process because its return values are unions, not raw and 
+            // we end up with duplicates, see: http://issues.umbraco.org/issue/U4-4842
+
+            clone._propertyTypes = (PropertyTypeCollection)_propertyTypes.DeepClone();
+            clone._propertyTypes.CollectionChanged += clone.PropertyTypesChanged;
+
+            return clone;
+        }
     }
 }

src/Umbraco.Core/Models/ContentTypeCompositionBase.cs

@@ -13,7 +13,7 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public abstract class ContentTypeCompositionBase : ContentTypeBase, IContentTypeComposition
     {
-        private readonly List<IContentTypeComposition> _contentTypeComposition = new List<IContentTypeComposition>();
+        private List<IContentTypeComposition> _contentTypeComposition = new List<IContentTypeComposition>();
         internal List<int> RemovedContentTypeKeyTracker = new List<int>();
 
         protected ContentTypeCompositionBase(int parentId) : base(parentId)
@@ -75,7 +75,7 @@ namespace Umbraco.Core.Models
             if (contentType.ContentTypeComposition.Any(x => x.CompositionAliases().Any(ContentTypeCompositionExists)))
                 return false;
 
-            if (!ContentTypeCompositionExists(contentType.Alias))
+            if (ContentTypeCompositionExists(contentType.Alias) == false)
             {
                 _contentTypeComposition.Add(contentType);
                 OnPropertyChanged(ContentTypeCompositionSelector);
@@ -217,5 +217,17 @@ namespace Umbraco.Core.Models
                 .Select(x => x.Id)
                 .Union(ContentTypeComposition.SelectMany(x => x.CompositionIds()));
         }
+
+        public override object DeepClone()
+        {
+            var clone = (ContentTypeCompositionBase)base.DeepClone();
+
+            //need to manually assign since this is an internal field and will not be automatically mapped
+            clone.RemovedContentTypeKeyTracker = new List<int>();
+            clone._contentTypeComposition = ContentTypeComposition.Select(x => (IContentTypeComposition)x.DeepClone()).ToList();
+            clone.ResetDirtyProperties(false);
+
+            return clone;
+        }
     }
 }

src/Umbraco.Core/Models/ContentTypeSort.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Models
     /// <summary>
     /// Represents a POCO for setting sort order on a ContentType reference
     /// </summary>
-    public class ContentTypeSort : IValueObject
+    public class ContentTypeSort : IValueObject, IDeepCloneable
     {
         public ContentTypeSort()
         {
@@ -33,5 +33,36 @@ namespace Umbraco.Core.Models
         /// Gets or sets the Alias of the ContentType
         /// </summary>
         public string Alias { get; set; }
+
+
+        public object DeepClone()
+        {
+            var clone = (ContentTypeSort)MemberwiseClone();
+            var id = Id.Value;
+            clone.Id = new Lazy<int>(() => id);
+            return clone;
+        }
+
+        protected bool Equals(ContentTypeSort other)
+        {
+            return Id.Value.Equals(other.Id.Value) && string.Equals(Alias, other.Alias);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((ContentTypeSort) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Id.GetHashCode()*397) ^ Alias.GetHashCode();
+            }
+        }
+
     }
 }

src/Umbraco.Core/Models/ContentXmlEntity.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Xml.Linq;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Used in content/media/member repositories in order to add this type of entity to the persisted collection to be saved
+    /// in a single transaction during saving an entity
+    /// </summary>
+    internal class ContentXmlEntity<TContent> : IAggregateRoot
+        where TContent : IContentBase
+    {
+        private readonly bool _entityExists;
+        private readonly Func<TContent, XElement> _xml;
+
+        public ContentXmlEntity(bool entityExists, TContent content, Func<TContent, XElement> xml)
+        {            
+            if (content == null) throw new ArgumentNullException("content");
+            _entityExists = entityExists;
+            _xml = xml;            
+            Content = content;
+        }
+
+        public ContentXmlEntity(TContent content)
+        {
+            if (content == null) throw new ArgumentNullException("content");
+            Content = content;
+        }
+
+        public XElement Xml
+        {
+            get { return _xml(Content); }
+        }
+        public TContent Content { get; private set; }
+
+        public int Id
+        {
+            get { return Content.Id; }
+            set { throw new NotSupportedException(); }
+        }
+
+        public Guid Key { get; set; }
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+        public bool HasIdentity
+        {
+            get { return _entityExists; }         
+        }
+
+        public object DeepClone()
+        {
+            var clone = (ContentXmlEntity<TContent>)MemberwiseClone();
+            //Automatically deep clone ref properties that are IDeepCloneable
+            DeepCloneHelper.DeepCloneRefProperties(this, clone);
+            return clone;
+        }
+    }
+}

src/Umbraco.Core/Models/DataTypeDefinition.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
@@ -31,6 +33,7 @@ namespace Umbraco.Core.Models
         {
             _parentId = parentId;
             _controlId = controlId;
+            _additionalData = new Dictionary<string, object>();
         }
 
         private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<DataTypeDefinition, string>(x => x.Name);
@@ -160,9 +163,11 @@ namespace Umbraco.Core.Models
                     _trashed = value;
                     return _trashed;
                 }, _trashed, TrashedSelector);
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["Trashed"] = value;
             }
         }
-
+               
         /// <summary>
         /// Id of the DataType control
         /// </summary>
@@ -177,6 +182,8 @@ namespace Umbraco.Core.Models
                     _controlId = value;
                     return _controlId;
                 }, _controlId, ControlIdSelector);
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["ControlId"] = value;
             }
         }
 
@@ -194,9 +201,22 @@ namespace Umbraco.Core.Models
                     _databaseType = value;
                     return _databaseType;
                 }, _databaseType, DatabaseTypeSelector);
+
+                //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data
+                _additionalData["DatabaseType"] = value;
             }
         }
 
+         private readonly IDictionary<string, object> _additionalData;
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IDictionary<string, object> IUmbracoEntity.AdditionalData
+        {
+            get { return _additionalData; }
+        }
+
         internal override void AddingEntity()
         {
             base.AddingEntity();

src/Umbraco.Core/Models/DeepCloneHelper.cs

@@ -0,0 +1,174 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Used to attribute properties that have a setter and are a reference type
+    /// that should be ignored for cloning when using the DeepCloneHelper
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// This attribute must be used:
+    /// * when the property is backed by a field but the result of the property is the un-natural data stored in the field
+    ///  
+    /// This attribute should not be used:
+    /// * when the property is virtual
+    /// * when the setter performs additional required logic other than just setting the underlying field
+    /// 
+    /// </remarks>
+    internal class DoNotCloneAttribute : Attribute
+    {
+        
+    }
+
+    public static class DeepCloneHelper
+    {
+        /// <summary>
+        /// Used to avoid constant reflection (perf)
+        /// </summary>
+        private static readonly ConcurrentDictionary<Type, PropertyInfo[]> PropCache = new ConcurrentDictionary<Type, PropertyInfo[]>(); 
+
+        /// <summary>
+        /// Used to deep clone any reference properties on the object (should be done after a MemberwiseClone for which the outcome is 'output')
+        /// </summary>
+        /// <param name="input"></param>
+        /// <param name="output"></param>
+        /// <returns></returns>        
+        public static void DeepCloneRefProperties(IDeepCloneable input, IDeepCloneable output)
+        {
+            var inputType = input.GetType();
+            var outputType = output.GetType();
+
+            if (inputType != outputType)
+            {
+                throw new InvalidOperationException("Both the input and output types must be the same");
+            }
+
+            var refProperties = PropCache.GetOrAdd(inputType, type =>
+                inputType.GetProperties()
+                    .Where(x =>
+                        //is not attributed with the ignore clone attribute
+                    Attribute.GetCustomAttribute(x, typeof(DoNotCloneAttribute)) == null
+                            //reference type but not string
+                        && x.PropertyType.IsValueType == false && x.PropertyType != typeof (string)
+                            //settable
+                        && x.CanWrite
+                            //non-indexed
+                        && x.GetIndexParameters().Any() == false)
+                    .ToArray());
+
+            foreach (var propertyInfo in refProperties)
+            {
+                if (TypeHelper.IsTypeAssignableFrom<IDeepCloneable>(propertyInfo.PropertyType))
+                {
+                    //this ref property is also deep cloneable so clone it
+                    var result = (IDeepCloneable)propertyInfo.GetValue(input, null);
+
+                    if (result != null)
+                    {
+                        //set the cloned value to the property
+                        propertyInfo.SetValue(output, result.DeepClone(), null);
+                    }
+                }
+                else if (TypeHelper.IsTypeAssignableFrom<IEnumerable>(propertyInfo.PropertyType)
+                    && TypeHelper.IsTypeAssignableFrom<string>(propertyInfo.PropertyType) == false)
+                {
+                    IList newList;
+                    if (propertyInfo.PropertyType.IsGenericType
+                        && (propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(IEnumerable<>)
+                            || propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(ICollection<>)
+                            || propertyInfo.PropertyType.GetGenericTypeDefinition() == typeof(IList<>)))
+                    {
+                        //if it is a IEnumerable<>, IList<T> or ICollection<> we'll use a List<>
+                        var genericType = typeof(List<>).MakeGenericType(propertyInfo.PropertyType.GetGenericArguments());
+                        newList = (IList)Activator.CreateInstance(genericType);
+                    }
+                    else if (propertyInfo.PropertyType.IsArray
+                             || (propertyInfo.PropertyType.IsInterface && propertyInfo.PropertyType.IsGenericType == false))
+                    {
+                        //if its an array, we'll create a list to work with first and then convert to array later
+                        //otherwise if its just a regular derivitave of IEnumerable, we can use a list too
+                        newList = new List<object>();
+                    }
+                    else
+                    {
+                        //its a custom IEnumerable, we'll try to create it
+                        try
+                        {
+                            var custom = Activator.CreateInstance(propertyInfo.PropertyType);
+                            //if it's an IList we can work with it, otherwise we cannot
+                            newList = custom as IList;
+                            if (newList == null)
+                            {
+                                continue;
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            //could not create this type so we'll skip it
+                            continue;
+                        }
+                    }
+
+                    var enumerable = (IEnumerable)propertyInfo.GetValue(input, null);
+                    if (enumerable == null) continue;
+
+                    var isUsableType = true;
+
+                    //now clone each item
+                    foreach (var o in enumerable)
+                    {
+                        //first check if the item is deep cloneable and copy that way
+                        var dc = o as IDeepCloneable;
+                        if (dc != null)
+                        {
+                            newList.Add(dc.DeepClone());
+                        }
+                        else if (o is string || o.GetType().IsValueType)
+                        {
+                            //check if the item is a value type or a string, then we can just use it                         
+                            newList.Add(o);
+                        }
+                        else
+                        {
+                            //this will occur if the item is not a string or value type or IDeepCloneable, in this case we cannot
+                            // clone each element, we'll need to skip this property, people will have to manually clone this list
+                            isUsableType = false;
+                            break;
+                        }
+                    }
+
+                    //if this was not usable, skip this property
+                    if (isUsableType == false)
+                    {
+                        continue;
+                    }
+
+                    if (propertyInfo.PropertyType.IsArray)
+                    {
+                        //need to convert to array
+                        var arr = (object[])Activator.CreateInstance(propertyInfo.PropertyType, newList.Count);
+                        for (int i = 0; i < newList.Count; i++)
+                        {
+                            arr[i] = newList[i];
+                        }
+                        //set the cloned collection
+                        propertyInfo.SetValue(output, arr, null);
+                    }
+                    else
+                    {
+                        //set the cloned collection
+                        propertyInfo.SetValue(output, newList, null);
+                    }
+
+                }
+            }
+        }
+
+    }
+}

src/Umbraco.Core/Models/DictionaryItem.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -97,5 +97,6 @@ namespace Umbraco.Core.Models
             if(ParentId == Guid.Empty)
                 _parentId = new Guid("41c7638d-f529-4bff-853e-59a0c2fb1bde");
         }
+        
     }
 }

src/Umbraco.Core/Models/DictionaryTranslation.cs

@@ -65,5 +65,6 @@ namespace Umbraco.Core.Models
                 }, _value, ValueSelector);
             }
         }
+
     }
 }

src/Umbraco.Core/Models/EntityBase/Entity.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Reflection;
 using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
 
 namespace Umbraco.Core.Models.EntityBase
 {
@@ -93,7 +96,7 @@ namespace Umbraco.Core.Models.EntityBase
         }
 
         /// <summary>
-        /// /// Gets or sets the WasCancelled flag, which is used to track
+        /// Gets or sets the WasCancelled flag, which is used to track
         /// whether some action against an entity was cancelled through some event.
         /// This only exists so we have a way to check if an event was cancelled through
         /// the new api, which also needs to take effect in the legacy api.
@@ -155,6 +158,7 @@ namespace Umbraco.Core.Models.EntityBase
         /// <summary>
         /// Indicates whether the current entity has an identity, eg. Id.
         /// </summary>
+        [DataMember]
         public virtual bool HasIdentity
         {
             get
@@ -226,5 +230,62 @@ namespace Umbraco.Core.Models.EntityBase
                 _hash = !HasIdentity ? new int?(base.GetHashCode()) : new int?(Id.GetHashCode() * 397 ^ GetType().GetHashCode());
             return _hash.Value;
         }
+
+        public virtual object DeepClone()
+        {
+            //Memberwise clone on Entity will work since it doesn't have any deep elements
+            // for any sub class this will work for standard properties as well that aren't complex object's themselves.
+            var clone = (Entity)MemberwiseClone();
+            //Automatically deep clone ref properties that are IDeepCloneable
+            DeepCloneHelper.DeepCloneRefProperties(this, clone);
+            clone.ResetDirtyProperties(false);
+            return clone;
+
+            //Using data contract serializer - has issues
+
+            //var s = Serialize(this);
+            //var d = Deserialize(s, this.GetType());
+            //return d;
+
+            //Using binary serializer - has issues
+
+            //using (var memoryStream = new MemoryStream(10))
+            //{
+            //IFormatter formatter = new BinaryFormatter();
+            //formatter.Serialize(memoryStream, this);
+            //memoryStream.Seek(0, SeekOrigin.Begin);
+            //return formatter.Deserialize(memoryStream);
+            //}
+        }
+
+        // serialize/deserialize with data contracts: 
+
+        //public static string Serialize(object obj)
+        //{
+        //    using (var memoryStream = new MemoryStream())
+        //    using (var reader = new StreamReader(memoryStream))
+        //    {
+        //        var serializer = new DataContractSerializer(obj.GetType());
+        //        serializer.WriteObject(memoryStream, obj);
+        //        memoryStream.Position = 0;
+        //        return reader.ReadToEnd();
+        //    }
+        //}
+
+        //public static object Deserialize(string xml, Type toType)
+        //{
+        //    using (Stream stream = new MemoryStream())
+        //    {
+        //        using (var writer = new StreamWriter(stream, Encoding.UTF8))
+        //        {
+        //            writer.Write(xml);
+        //            //byte[] data = Encoding.UTF8.GetBytes(xml);
+        //            //stream.Write(data, 0, data.Length);
+        //            stream.Position = 0;
+        //            var deserializer = new DataContractSerializer(toType);
+        //            return deserializer.ReadObject(stream);
+        //        }
+        //    }
+        //}
     }
 }

src/Umbraco.Core/Models/EntityBase/IEntity.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models.EntityBase
     /// </summary>
     /// <remarks>The current database schema doesn't provide a modified date
     /// for all entities, so this will have to be changed at a later stage.</remarks>
-    public interface IEntity
+    public interface IEntity : IDeepCloneable
     {
         /// <summary>
         /// The Id of the entity

src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs

@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Models.EntityBase
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.EntityBase
 {
     public interface IUmbracoEntity : IAggregateRoot
     {
@@ -41,5 +43,10 @@
         /// Not all entities support being trashed, they'll always return false.
         /// </remarks>
         bool Trashed { get; }
+
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        IDictionary<string, object> AdditionalData { get; }
     }
 }

src/Umbraco.Core/Models/EntityBase/TracksChangesEntityBase.cs

@@ -3,18 +3,21 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models.EntityBase
 {
     /// <summary>
     /// A base class for use to implement IRememberBeingDirty/ICanBeDirty
     /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
     public abstract class TracksChangesEntityBase : IRememberBeingDirty
     {
         /// <summary>
         /// Tracks the properties that have changed
         /// </summary>
-        private readonly IDictionary<string, bool> _propertyChangedInfo = new Dictionary<string, bool>();
+        private IDictionary<string, bool> _propertyChangedInfo = new Dictionary<string, bool>();
 
         /// <summary>
         /// Tracks the properties that we're changed before the last commit (or last call to ResetDirtyProperties)
@@ -83,7 +86,9 @@ namespace Umbraco.Core.Models.EntityBase
         /// </summary>
         public void ForgetPreviouslyDirtyProperties()
         {
-            _lastPropertyChangedInfo.Clear();
+            //NOTE: We cannot .Clear() because when we memberwise clone this will be the SAME
+            // instance as the one on the clone, so we need to create a new instance.
+            _lastPropertyChangedInfo = new Dictionary<string, bool>();
         }
 
         /// <summary>
@@ -108,7 +113,7 @@ namespace Umbraco.Core.Models.EntityBase
         /// Please note that resetting the dirty properties could potentially
         /// obstruct the saving of a new or updated entity.
         /// </remarks>
-        internal void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        internal virtual void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
         {
             if (rememberPreviouslyChangedProperties)
             {
@@ -116,7 +121,9 @@ namespace Umbraco.Core.Models.EntityBase
                 _lastPropertyChangedInfo = _propertyChangedInfo.ToDictionary(v => v.Key, v => v.Value);
             }
 
-            _propertyChangedInfo.Clear();
+            //NOTE: We cannot .Clear() because when we memberwise clone this will be the SAME
+            // instance as the one on the clone, so we need to create a new instance.
+            _propertyChangedInfo = new Dictionary<string, bool>();
         }
 
         /// <summary>

src/Umbraco.Core/Models/EntityExtensions.cs

@@ -0,0 +1,24 @@
+using System.Linq;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public static class EntityExtensions
+    {
+
+        /// <summary>
+        /// Returns true if this entity has just been created and persisted to the data store
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is useful when handling events to determine if an entity is a brand new entity or was
+        /// already existing.
+        /// </remarks>
+        public static bool IsNewEntity(this IEntity entity)
+        {
+            var dirty = (IRememberBeingDirty)entity;
+            return dirty.WasPropertyDirty("Id");
+        }
+    }
+}

src/Umbraco.Core/Models/File.cs

@@ -23,6 +23,8 @@ namespace Umbraco.Core.Models
 
         private static readonly PropertyInfo ContentSelector = ExpressionHelper.GetPropertyInfo<File, string>(x => x.Content);
         private static readonly PropertyInfo PathSelector = ExpressionHelper.GetPropertyInfo<File, string>(x => x.Path);
+        private string _alias;
+        private string _name;
 
         /// <summary>
         /// Gets or sets the Name of the File including extension
@@ -32,7 +34,11 @@ namespace Umbraco.Core.Models
         {
             get
             {
-                return new FileInfo(Path).Name;
+                if (_name == null)
+                {
+                    _name = System.IO.Path.GetFileName(Path);
+                }
+                return _name;
             }
         }
 
@@ -44,10 +50,14 @@ namespace Umbraco.Core.Models
         {
             get
             {
-                var fileInfo = new FileInfo(Path);
-                var name = fileInfo.Name;
-                int lastIndexOf = name.LastIndexOf(".", StringComparison.InvariantCultureIgnoreCase);
-                return name.Substring(0, lastIndexOf);
+                if (_alias == null)
+                {                   
+                    var name = System.IO.Path.GetFileName(Path);
+                    if (name == null) return string.Empty;
+                    var lastIndexOf = name.LastIndexOf(".", StringComparison.InvariantCultureIgnoreCase);
+                    _alias = name.Substring(0, lastIndexOf);
+                }
+                return _alias;
             }
         }
 
@@ -60,6 +70,10 @@ namespace Umbraco.Core.Models
             get { return _path; }
             set
             {
+                //reset
+                _alias = null;
+                _name = null;
+
                 SetPropertyValueAndDetectChanges(o =>
                 {
                     _path = value;
@@ -90,5 +104,18 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <returns>True if file is valid, otherwise false</returns>
         public abstract bool IsValid();
+
+        public override object DeepClone()
+        {
+            var clone = (File)base.DeepClone();
+
+            //need to manually assign since they are readonly properties
+            clone._alias = Alias;
+            clone._name = Name;
+
+            clone.ResetDirtyProperties(false);
+
+            return clone;
+        }
     }
 }

src/Umbraco.Core/Models/Folder.cs

@@ -0,0 +1,14 @@
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    internal sealed class Folder : Entity
+    {
+        public Folder(string folderPath)
+        {
+            Path = folderPath;
+        }
+
+        public string Path { get; set; }
+    }
+}

src/Umbraco.Core/Models/IContent.cs

@@ -72,5 +72,11 @@ namespace Umbraco.Core.Models
         /// Changes the Published state of the content object
         /// </summary>
         void ChangePublishedState(PublishedState state);
+
+        /// <summary>
+        /// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
+        /// </summary>
+        /// <returns></returns>
+        IContent DeepCloneWithResetIdentities();
     }
 }

src/Umbraco.Core/Models/IContentType.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -30,5 +29,12 @@ namespace Umbraco.Core.Models
         /// <param name="template"><see cref="ITemplate"/> to remove</param>
         /// <returns>True if template was removed, otherwise False</returns>
         bool RemoveTemplate(ITemplate template);
+
+        /// <summary>
+        /// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
+        /// </summary>
+        /// <param name="newAlias"></param>
+        /// <returns></returns>
+        IContentType DeepCloneWithResetIdentities(string newAlias);
     }
 }

src/Umbraco.Core/Models/IContentTypeBase.cs

@@ -64,6 +64,12 @@ namespace Umbraco.Core.Models
         /// <param name="propertyTypeAlias">Alias of the <see cref="PropertyType"/> to remove</param>
         void RemovePropertyType(string propertyTypeAlias);
 
+        /// <summary>
+        /// Removes a PropertyGroup from the current ContentType
+        /// </summary>
+        /// <param name="propertyGroupName">Name of the <see cref="PropertyGroup"/> to remove</param>
+        void RemovePropertyGroup(string propertyGroupName);
+
         /// <summary>
         /// Sets the ParentId from the lazy integer id
         /// </summary>

src/Umbraco.Core/Models/IDataTypeDefinition.cs

@@ -1,6 +1,5 @@
 using System;
 using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {

src/Umbraco.Core/Models/IDeepCloneable.cs

@@ -0,0 +1,9 @@
+using System.Reflection;
+
+namespace Umbraco.Core.Models
+{
+    public interface IDeepCloneable
+    {
+        object DeepClone();
+    }
+}

src/Umbraco.Core/Models/IMember.cs

@@ -0,0 +1,18 @@
+using System;
+using Umbraco.Core.Models.Membership;
+
+namespace Umbraco.Core.Models
+{
+    public interface IMember : IContentBase, IMembershipUser
+    {
+        /// <summary>
+        /// String alias of the default ContentType
+        /// </summary>
+        string ContentTypeAlias { get; }
+
+        /// <summary>
+        /// Gets the ContentType used by this content object
+        /// </summary>
+        IMemberType ContentType { get; }
+    }
+}

src/Umbraco.Core/Models/IMemberGroup.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a member type
+    /// </summary>
+    public interface IMemberGroup : IAggregateRoot
+    {
+        /// <summary>
+        /// The name of the member group
+        /// </summary>
+        string Name { get; set; }
+
+        /// <summary>
+        /// Profile of the user who created this Entity
+        /// </summary>
+        int CreatorId { get; set; }
+
+        /// <summary>
+        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+        /// </summary>
+        IDictionary<string, object> AdditionalData { get; }
+    }
+}

src/Umbraco.Core/Models/IMemberType.cs

@@ -0,0 +1,36 @@
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a MemberType, which Member is based on
+    /// </summary>
+    public interface IMemberType : IContentTypeComposition
+    {
+        /// <summary>
+        /// Gets a boolean indicating whether a Property is editable by the Member.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to check</param>
+        /// <returns></returns>
+        bool MemberCanEditProperty(string propertyTypeAlias);
+
+        /// <summary>
+        /// Gets a boolean indicating whether a Property is visible on the Members profile.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to check</param>
+        /// <returns></returns>
+        bool MemberCanViewProperty(string propertyTypeAlias);
+
+        /// <summary>
+        /// Sets a boolean indicating whether a Property is editable by the Member.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
+        /// <param name="value">Boolean value, true or false</param>
+        void SetMemberCanEditProperty(string propertyTypeAlias, bool value);
+
+        /// <summary>
+        /// Sets a boolean indicating whether a Property is visible on the Members profile.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
+        /// <param name="value">Boolean value, true or false</param>
+        void SetMemberCanViewProperty(string propertyTypeAlias, bool value);
+    }
+}

src/Umbraco.Core/Models/IPublishedContent.cs

@@ -1,20 +1,48 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
+using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core.Models
 {
 	/// <summary>
-	/// Defines a published item in Umbraco
+	/// Represents a cached content.
 	/// </summary>
 	/// <remarks>
-	/// A replacement for INode which needs to occur since INode doesn't contain the document type alias
-	/// and INode is poorly formatted with mutable properties (i.e. Lists instead of IEnumerable)
+    /// <para>SD: A replacement for INode which needs to occur since INode doesn't contain the document type alias
+    /// and INode is poorly formatted with mutable properties (i.e. Lists instead of IEnumerable).</para>
+    /// <para>Stephan: initially, that was for cached published content only. Now, we're using it also for
+    /// cached preview (so, maybe unpublished) content. A better name would therefore be ICachedContent, as
+    /// has been suggested. However, can't change now. Maybe in v7?</para>
 	/// </remarks>	
-	public interface IPublishedContent
-	{
-		int Id { get; }
+    public interface IPublishedContent
+    {
+        #region ContentSet
+
+        // Because of http://issues.umbraco.org/issue/U4-1797 and in order to implement
+        // Index() and methods that derive from it such as IsFirst(), IsLast(), etc... all
+        // content items must know about their containing content set.
+
+        /// <summary>
+        /// Gets the content set to which the content belongs.
+        /// </summary>
+        /// <remarks>The default set consists in the siblings of the content (including the content 
+        /// itself) ordered by <c>sortOrder</c>.</remarks>
+        IEnumerable<IPublishedContent> ContentSet { get; }
+
+        #endregion
+
+        #region ContentType
+
+        /// <summary>
+        /// Gets the content type.
+        /// </summary>
+        PublishedContentType ContentType { get; }
+
+        #endregion
+
+        #region Content
+
+        int Id { get; }
 		int TemplateId { get; }
 		int SortOrder { get; }
 		string Name { get; }
@@ -31,32 +59,97 @@ namespace Umbraco.Core.Models
 		Guid Version { get; }
 		int Level { get; }
 		string Url { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the content is a content (aka a document) or a media.
+        /// </summary>
 		PublishedItemType ItemType { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the content is draft.
+        /// </summary>
+        /// <remarks>A content is draft when it is the unpublished version of a content, which may
+        /// have a published version, or not.</remarks>
+        bool IsDraft { get; }
+
+        /// <summary>
+        /// Gets the index of the published content within its current owning content set.
+        /// </summary>
+        /// <returns>The index of the published content within its current owning content set.</returns>
+	    int GetIndex();
+
+        #endregion
+
+        #region Tree
+
+        /// <summary>
+        /// Gets the parent of the content.
+        /// </summary>
+        /// <remarks>The parent of root content is <c>null</c>.</remarks>
 		IPublishedContent Parent { get; }
+
+        /// <summary>
+        /// Gets the children of the content.
+        /// </summary>
+        /// <remarks>Children are sorted by their sortOrder.</remarks>
 		IEnumerable<IPublishedContent> Children { get; }
 
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets the properties of the content.
+        /// </summary>
+        /// <remarks>
+        /// <para>Contains one <c>IPublishedProperty</c> for each property defined for the content type, including
+        /// inherited properties. Some properties may have no value.</para>
+        /// <para>The properties collection of an IPublishedContent instance should be read-only ie it is illegal
+        /// to add properties to the collection.</para>
+        /// </remarks>
 		ICollection<IPublishedContentProperty> Properties { get; }
 
-		/// <summary>
-		/// Returns the property value for the property alias specified
-		/// </summary>
-		/// <param name="propertyAlias"></param>
-		/// <returns></returns>
-		object this[string propertyAlias] { get; }
+        /// <summary>
+        /// Gets a property identified by its alias.
+        /// </summary>
+        /// <param name="alias">The property alias.</param>
+        /// <returns>The property identified by the alias.</returns>
+        /// <remarks>
+        /// <para>If the content type has no property with that alias, including inherited properties, returns <c>null</c>,</para>
+        /// <para>otherwise return a property -- that may have no value (ie <c>HasValue</c> is <c>false</c>).</para>
+        /// <para>The alias is case-insensitive.</para>
+        /// </remarks>
+        IPublishedContentProperty GetProperty(string alias);
 
-		/// <summary>
-		/// Returns a property on the object based on an alias
+        /// <summary>
+        /// Gets a property identified by its alias.
+        /// </summary>
+        /// <param name="alias">The property alias.</param>
+        /// <param name="recurse">A value indicating whether to navigate the tree upwards until a property with a value is found.</param>
+        /// <returns>The property identified by the alias.</returns>
+        /// <remarks>
+        /// <para>Navigate the tree upwards and look for a property with that alias and with a value (ie <c>HasValue</c> is <c>true</c>).
+        /// If found, return the property. If no property with that alias is found, having a value or not, return <c>null</c>. Otherwise
+        /// return the first property that was found with the alias but had no value (ie <c>HasValue</c> is <c>false</c>).</para>
+        /// <para>The alias is case-insensitive.</para>
+        /// </remarks>
+        IPublishedContentProperty GetProperty(string alias, bool recurse);
+
+        /// <summary>
+		/// Gets the value of a property identified by its alias.
 		/// </summary>
-		/// <param name="alias"></param>
-		/// <returns></returns>
-		/// <remarks>
-		/// Although we do have a a property to return Properties of the object, in some cases a custom implementation may not know
-		/// about all properties until specifically asked for one by alias. 
-		/// 
-		/// This method is mostly used in places such as DynamicPublishedContent when trying to resolve a property based on an alias. 
-		/// In some cases Pulish Stores, a property value may exist in multiple places and we need to fallback to different cached locations
-		/// therefore sometimes the 'Properties' collection may not be sufficient.
-		/// </remarks>
-		IPublishedContentProperty GetProperty(string alias);
-	}
+		/// <param name="alias">The property alias.</param>
+		/// <returns>The value of the property identified by the alias.</returns>
+        /// <remarks>
+        /// <para>If <c>GetProperty(alias)</c> is <c>null</c> then returns <c>null</c> else return <c>GetProperty(alias).Value</c>.</para>
+        /// <para>So if the property has no value, returns the default value for that property type.</para>
+        /// <para>This one is defined here really because we cannot define index extension methods, but all it should do is:
+        /// <code>var p = GetProperty(alias); return p == null ? null : p.Value;</code> and nothing else.</para>
+        /// <para>The recursive syntax (eg "_title") is _not_ supported here.</para>
+        /// <para>The alias is case-insensitive.</para>
+        /// </remarks>
+		object this[string alias] { get; } // todo - should obsolete this[alias] (when?)
+
+        #endregion
+    }
 }

src/Umbraco.Core/Models/IPublishedContentProperty.cs

@@ -1,11 +1,65 @@
-using System;
-
-namespace Umbraco.Core.Models
-{
-	public interface IPublishedContentProperty
-	{
-		string Alias { get; }
-		object Value { get; }
-		Guid Version { get; }
-	}
+using System;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a property of an <c>IPublishedContent</c>.
+    /// </summary>
+	public interface IPublishedContentProperty
+	{
+        /// <summary>
+        /// Gets the alias of the property.
+        /// </summary>
+		string PropertyTypeAlias { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the property has a value.
+        /// </summary>
+        /// <remarks>
+        /// <para>This is somewhat implementation-dependent -- depending on whatever IPublishedCache considers
+        /// a missing value.</para>
+        /// <para>The XmlPublishedCache raw values are strings, and it will consider missing, null or empty (and
+        /// that includes whitespace-only) strings as "no value".</para>
+        /// <para>Other caches that get their raw value from the database would consider that a property has "no
+        /// value" if it is missing, null, or an empty string (including whitespace-only).</para>
+        /// </remarks>
+        bool HasValue { get; }
+
+        /// <summary>
+        /// Gets the data value of the property.
+        /// </summary>
+        /// <remarks>
+        /// <para>The data value is whatever was passed to the property when it was instanciated, and it is
+        /// somewhat implementation-dependent -- depending on how the IPublishedCache is implemented.</para>
+        /// <para>The XmlPublishedCache raw values are strings exclusively since they come from the Xml cache.</para>
+        /// <para>For other caches that get their raw value from the database, it would be either a string,
+        /// an integer (Int32), or a date and time (DateTime).</para>
+        /// <para>If you're using that value, you're probably wrong, unless you're doing some internal
+        /// Umbraco stuff.</para>
+        /// </remarks>
+        object DataValue { get; }
+
+        /// <summary>
+        /// Gets the object value of the property.
+        /// </summary>
+        /// <remarks>
+        /// <para>The value is what you want to use when rendering content in an MVC view ie in C#.</para>
+        /// <para>It can be null, or any type of CLR object.</para>
+        /// <para>It has been fully prepared and processed by the appropriate converter.</para>
+        /// </remarks>
+        object Value { get; }
+
+        /// <summary>
+        /// Gets the XPath value of the property.
+        /// </summary>
+        /// <remarks>
+        /// <para>The XPath value is what you want to use when navigating content via XPath eg in the XSLT engine.</para>
+        /// <para>It must be either null, or a string, or an XPathNavigator.</para>
+        /// <para>It has been fully prepared and processed by the appropriate converter.</para>
+        /// </remarks>
+        object XPathValue { get; }
+
+        string Alias { get; }
+        Guid Version { get; }
+	}
 }

src/Umbraco.Core/Models/IRelation.cs

@@ -0,0 +1,38 @@
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public interface IRelation : IAggregateRoot
+    {
+        /// <summary>
+        /// Gets or sets the Parent Id of the Relation (Source)
+        /// </summary>
+        [DataMember]
+        int ParentId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Child Id of the Relation (Destination)
+        /// </summary>
+        [DataMember]
+        int ChildId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="RelationType"/> for the Relation
+        /// </summary>
+        [DataMember]
+        IRelationType RelationType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a comment for the Relation
+        /// </summary>
+        [DataMember]
+        string Comment { get; set; }
+
+        /// <summary>
+        /// Gets the Id of the <see cref="RelationType"/> that this Relation is based on.
+        /// </summary>
+        [IgnoreDataMember]
+        int RelationTypeId { get; }
+    }
+}

src/Umbraco.Core/Models/IRelationType.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public interface IRelationType : IAggregateRoot
+    {
+        /// <summary>
+        /// Gets or sets the Name of the RelationType
+        /// </summary>
+        [DataMember]
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Alias of the RelationType
+        /// </summary>
+        [DataMember]
+        string Alias { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the RelationType is Bidirectional (true) or Parent to Child (false)
+        /// </summary>
+        [DataMember]
+        bool IsBidirectional { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Parents object type id
+        /// </summary>
+        /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
+        [DataMember]
+        Guid ParentObjectType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Childs object type id
+        /// </summary>
+        /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
+        [DataMember]
+        Guid ChildObjectType { get; set; }
+    }
+}