Update nuspec to ask for a valid nuget pkg

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

build/Build.bat

@@ -1,6 +1,6 @@
 @ECHO OFF
-SET release=6.2.0
-SET comment=beta
+SET release=6.2.2
+SET comment=
 SET version=%release%
 
 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)

build/Build.proj

@@ -299,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"
@@ -308,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

@@ -2,9 +2,9 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms.Core</id>
-        <version>6.2.0</version>
+        <version>6.2.2</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>
@@ -15,17 +15,23 @@
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-            <dependency id="Microsoft.AspNet.Mvc" version="4.0" />
-            <dependency id="Microsoft.AspNet.WebApi" version="4.0" />
-            <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
+            <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.0, 2.0.0)" />
-            <dependency id="ClientDependency-Mvc" version="[1.7.0, 2.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>
@@ -35,7 +41,6 @@
         <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\Examine.dll" target="lib\Examine.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" />
@@ -66,5 +71,6 @@
         <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

@@ -2,9 +2,9 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms</id>
-        <version>6.1.2</version>
+        <version>6.2.2</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>
@@ -19,11 +19,9 @@
         </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\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" />
@@ -32,15 +30,15 @@
 	<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\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" />

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.2</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/build/net40/UmbracoCms.targets

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
-</Project>

build/NuSpecs/build/net45/UmbracoCms.props

@@ -1,14 +0,0 @@
-<?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/net45/UmbracoCms.targets

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
-</Project>

build/NuSpecs/build/net451/UmbracoCms.props

@@ -1,14 +0,0 @@
-<?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/net451/UmbracoCms.targets

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AddUmbracoFilesToOutput">
-    <ItemGroup>
-      <UmbracoFiles Include=".\umbraco\**\*;" />
-      <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-      <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
-        <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
-        <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
-</Project>

build/NuSpecs/tools/Readme.txt

@@ -1,8 +1,17 @@
 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. Only the web.config will
-be overwritten by default to ensure that it has the necessary settings 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. 
+
+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.
+
 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).
@@ -10,8 +19,8 @@ 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 folders will now be automatically included when creating a deploy package or publishing to the file system:
-umbraco and umbraco_client.
+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

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/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/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/Cache/CacheKeys.cs

@@ -53,5 +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/CacheProviderExtensions.cs

@@ -41,6 +41,12 @@ namespace Umbraco.Core.Cache
             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);

src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs

@@ -1,198 +1,204 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading;
 
 namespace Umbraco.Core.Cache
 {
     internal abstract class DictionaryCacheProviderBase : ICacheProvider
     {
-        protected static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
-        protected abstract DictionaryCacheWrapper DictionaryCache { get; }
-
-        /// <summary>
-        /// Clears everything in umbraco's runtime cache
-        /// </summary>
-        /// <remarks>
-        /// Does not clear other stuff the user has put in httpruntime.cache!
-        /// </remarks>
-        public virtual void ClearAllCache()
-        {
-            using (new WriteLock(Locker))
-            {
-                var keysToRemove = DictionaryCache.Cast<object>()
-                                                  .Select(item => new DictionaryItemWrapper(item))
-                                                  .Where(c => c.Key is string && ((string)c.Key).StartsWith(CacheItemPrefix) && DictionaryCache[c.Key.ToString()] != null)
-                                                  .Select(c => c.Key)
-                                                  .ToList();
-
-                foreach (var k in keysToRemove)
-                {
-                    DictionaryCache.Remove(k);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Clears the item in umbraco's runtime cache with the given key 
-        /// </summary>
-        /// <param name="key">Key</param>
-        public virtual void ClearCacheItem(string key)
-        {
-            using (new WriteLock(Locker))
-            {
-                if (DictionaryCache[GetCacheKey(key)] == null) return;
-                DictionaryCache.Remove(GetCacheKey(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 virtual void ClearCacheObjectTypes(string typeName)
-        {
-            using (new WriteLock(Locker))
-            {
-                var keysToRemove = DictionaryCache
-                    .Cast<object>()
-                    .Select(item => new DictionaryItemWrapper(item))
-                    .Where(c =>
-                    {
-                        var k = c.Key.ToString();
-                        var v = DictionaryCache[k];
-                        return v != null && v.GetType().ToString().InvariantEquals(typeName);
-                    })
-                    .Select(c => c.Key)
-                    .ToList();
-
-                foreach (var k in keysToRemove)
-                    DictionaryCache.Remove(k);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>()
-        {
-            using (new WriteLock(Locker))
-            {
-                var typeOfT = typeof(T);
-                var keysToRemove = DictionaryCache
-                    .Cast<object>()
-                    .Select(item => new DictionaryItemWrapper(item))
-                    .Where(c =>
-                    {
-                        var k = c.Key.ToString();
-                        var v = DictionaryCache[k];
-                        return v != null && v.GetType() == typeOfT;
-                    })
-                    .Select(c => c.Key)
-                    .ToList();
-
-                foreach (var k in keysToRemove)
-                    DictionaryCache.Remove(k);
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        {
-            using (new WriteLock(Locker))
-            {
-                var typeOfT = typeof(T);
-                var keysToRemove = DictionaryCache
-                    .Cast<object>()
-                    .Select(item => new DictionaryItemWrapper(item))
-                    .Where(c =>
-                    {
-                        var k = c.Key.ToString();
-                        var v = DictionaryCache[k];
-                        return v != null && v.GetType() == typeOfT && predicate(k, (T)v);
-                    })
-                    .Select(c => c.Key)
-                    .ToList();
-
-                foreach (var k in keysToRemove)
-                    DictionaryCache.Remove(k);
-            }
-        }
-
-        /// <summary>
-        /// Clears all cache items that starts with the key passed.
-        /// </summary>
-        /// <param name="keyStartsWith">The start of the key</param>
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            var keysToRemove = DictionaryCache.Cast<object>()
-                                              .Select(item => new DictionaryItemWrapper(item))
-                                              .Where(c => c.Key is string && ((string)c.Key).InvariantStartsWith(string.Format("{0}-{1}", CacheItemPrefix, keyStartsWith)))
-                                              .Select(c => c.Key)
-                                              .ToList();
-
-            foreach (var k in keysToRemove)
-            {
-                DictionaryCache.Remove(k);
-            }
-        }
-
-        /// <summary>
-        /// Clears all cache items that have a key that matches the regular expression
-        /// </summary>
-        /// <param name="regexString"></param>
-        public virtual void ClearCacheByKeyExpression(string regexString)
-        {
-            var keysToRemove = new List<object>();
-            foreach (var item in DictionaryCache)
-            {
-                var c = new DictionaryItemWrapper(item);
-                var s = c.Key as string;
-                if (s != null)
-                {
-                    var withoutPrefix = s.TrimStart(string.Format("{0}-", CacheItemPrefix));
-                    if (Regex.IsMatch(withoutPrefix, regexString))
-                    {
-                        keysToRemove.Add(c.Key);
-                    }
-                }
-            }
-
-            foreach (var k in keysToRemove)
-            {
-                DictionaryCache.Remove(k);
-            }
-        }
-
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            return (from object item in DictionaryCache
-                    select new DictionaryItemWrapper(item)
-                    into c
-                    where c.Key is string && ((string) c.Key).InvariantStartsWith(string.Format("{0}-{1}", CacheItemPrefix, keyStartsWith))
-                    select c.Value).ToList();
-        }
-
-        /// <summary>
-        /// Returns a cache item by key, does not update the cache if it isn't there.
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        public virtual object GetCacheItem(string cacheKey)
-        {
-            var result = DictionaryCache.Get(GetCacheKey(cacheKey));
-            return result;
-        }
-
-        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);        
-
-        /// <summary>
-        /// We prefix all cache keys with this so that we know which ones this class has created when 
-        /// using the HttpRuntime cache so that when we clear it we don't clear other entries we didn't create.
-        /// </summary>
+        // 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/DictionaryCacheWrapper.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Umbraco.Core.Cache
-{
-    internal class DictionaryCacheWrapper : IEnumerable
-    {
-        private readonly IEnumerable _inner;
-        private readonly Func<object, object> _get;
-        private readonly Action<object> _remove;
-
-        public DictionaryCacheWrapper(
-            IEnumerable inner,
-            Func<object, object> get,
-            Action<object> remove)
-        {
-            _inner = inner;
-            _get = get;
-            _remove = remove;
-        }
-
-        public object this[object key]
-        {
-            get
-            {
-                return Get(key);
-            }            
-        }
-
-        public object Get(object key)
-        {
-            return _get(key);
-        }
-
-        public void Remove(object key)
-        {
-            _remove(key);
-        }
-
-        public IEnumerator GetEnumerator()
-        {
-            return _inner.GetEnumerator();
-        }
-    }
-}

src/Umbraco.Core/Cache/DictionaryItemWrapper.cs

@@ -1,14 +0,0 @@
-namespace Umbraco.Core.Cache
-{
-    internal class DictionaryItemWrapper
-    {
-        public DictionaryItemWrapper(dynamic item)
-        {
-            Key = item.Key;
-            Value = item.Value;
-        }
-        
-        public object Key { get; private set; }
-        public object Value { get; private set; }
-    }
-}

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Web;
 
 namespace Umbraco.Core.Cache
@@ -12,36 +11,115 @@ namespace Umbraco.Core.Cache
     /// </summary>
     internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
     {
-        private readonly Func<HttpContextBase> _context;
+        // 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;
 
-        public HttpRequestCacheProvider(HttpContext 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
         {
-            _context = () => new HttpContextWrapper(context);
+            //get { return _context1 != null ? _context1.Items : _context2().Items; }
+            get { return _context != null ? _context.Items : HttpContext.Current.Items; }
         }
 
-        public HttpRequestCacheProvider(Func<HttpContextBase> context)
+        // for unit tests
+        public HttpRequestCacheProvider(HttpContextBase context)
         {
             _context = context;
         }
 
-        protected override DictionaryCacheWrapper DictionaryCache
+        // 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
             {
-                var ctx = _context();
-                return new DictionaryCacheWrapper(
-                    ctx.Items,
-                    o => ctx.Items[o],
-                    o => ctx.Items.Remove(o));
+                return new MonitorLock(ContextItems.SyncRoot);
             }
         }
 
+        #endregion
+
+        #region Get
+
         public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
         {
-            var ctx = _context();
-            var ck = GetCacheKey(cacheKey);
-            return ctx.Items[ck] ?? (ctx.Items[ck] = 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

@@ -1,10 +1,9 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using System.Web;
 using System.Web.Caching;
-using Umbraco.Core.Logging;
 using CacheItemPriority = System.Web.Caching.CacheItemPriority;
 
 namespace Umbraco.Core.Cache
@@ -14,47 +13,51 @@ namespace Umbraco.Core.Cache
     /// </summary>
     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 readonly DictionaryCacheWrapper _wrapper;
-        
+
         public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
         {
             _cache = cache;
-            _wrapper = new DictionaryCacheWrapper(_cache, s => _cache.Get(s.ToString()), o => _cache.Remove(o.ToString()));
         }
 
-        protected override DictionaryCacheWrapper DictionaryCache
+        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
         {
-            get { return _wrapper; }
+            const string prefix = CacheItemPrefix + "-";
+            return _cache.Cast<DictionaryEntry>()
+                .Where(x => x.Key is string && ((string) x.Key).StartsWith(prefix));
         }
 
-        /// <summary>
-        /// Clears all objects in the System.Web.Cache with the System.Type specified that satisfy the predicate
-        /// </summary>
-        public override void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        protected override void RemoveEntry(string key)
         {
-            try
-            {
-                lock (Locker)
-                {
-                    foreach (DictionaryEntry c in _cache)
-                    {
-                        var key = c.Key.ToString();
-                        if (_cache[key] != null
-                            && _cache[key] is T
-                            && predicate(key, (T)_cache[key]))
-                        {
-                            _cache.Remove(c.Key.ToString());
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error<CacheHelper>("Cache clearing error", e);
-            }
+            _cache.Remove(key);
         }
 
+        protected override object GetEntry(string key)
+        {
+            return _cache.Get(key);
+        }
+
+        #region Lock
+
+        protected override IDisposable ReadLock
+        {
+            get { return new ReadLock(_locker); }
+        }
+
+        protected override IDisposable WriteLock
+        {
+            get { return new WriteLock(_locker); }
+        }
+
+        #endregion
+
+        #region Get
+
         /// <summary>
         /// Gets (and adds if necessary) an item from the cache with all of the default parameters
         /// </summary>
@@ -81,25 +84,64 @@ namespace Umbraco.Core.Cache
         {
             cacheKey = GetCacheKey(cacheKey);
 
-            using (var lck = new UpgradeableReadLock(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.
+
+            // 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))
             {
-                var result = DictionaryCache.Get(cacheKey);
-                if (result == null)
-                {
-                    lck.UpgradeToWriteLock();
-
-                    result = getCacheItem();
-                    if (result != null)
-                    {                        
-                        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);
-
-                        _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
-                    }
-
-                }
-                return result;
+                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 = 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);
+                }
+            }
+
+            // 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;
         }
 
         public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
@@ -112,6 +154,10 @@ namespace Umbraco.Core.Cache
             return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
         }
 
+        #endregion
+
+        #region Insert
+
         /// <summary>
         /// This overload is here for legacy purposes
         /// </summary>
@@ -124,15 +170,22 @@ namespace Umbraco.Core.Cache
         /// <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)
         {
-            var result = getCacheItem();
-            if (result == null) return;
+            // 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);
 
-            _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
+            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)
@@ -144,5 +197,7 @@ namespace Umbraco.Core.Cache
             }
             InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
         }
+
+        #endregion
     }
 }

src/Umbraco.Core/Cache/ICacheProvider.cs

@@ -16,7 +16,15 @@ namespace Umbraco.Core.Cache
         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/NullCacheProvider.cs

@@ -43,6 +43,11 @@ namespace Umbraco.Core.Cache
             return Enumerable.Empty<object>();
         }
 
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return Enumerable.Empty<object>();
+        }
+
         public virtual object GetCacheItem(string cacheKey)
         {
             return default(object);

src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs

@@ -16,17 +16,37 @@ namespace Umbraco.Core.Cache
     /// </summary>
     internal class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
     {
-        private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        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))
+            using (new WriteLock(_locker))
             {
                 MemoryCache.DisposeIfDisposable();
                 MemoryCache = new MemoryCache("in-memory");
@@ -35,7 +55,7 @@ namespace Umbraco.Core.Cache
 
         public virtual void ClearCacheItem(string key)
         {
-            using (new WriteLock(Locker))
+            using (new WriteLock(_locker))
             {
                 if (MemoryCache[key] == null) return;
                 MemoryCache.Remove(key);
@@ -44,124 +64,179 @@ namespace Umbraco.Core.Cache
 
         public virtual void ClearCacheObjectTypes(string typeName)
         {
-            using (new WriteLock(Locker))
+            using (new WriteLock(_locker))
             {
-                var keysToRemove = MemoryCache
-                    .Where(c => c.Value != null && c.Value.GetType().ToString().InvariantEquals(typeName))
-                    .Select(c => c.Key)
-                    .ToArray();
-                foreach (var k in keysToRemove)
-                    MemoryCache.Remove(k);
+                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))
+            using (new WriteLock(_locker))
             {
                 var typeOfT = typeof (T);
-                var keysToRemove = MemoryCache
-                    .Where(c => c.Value != null && c.Value.GetType() == typeOfT)
-                    .Select(c => c.Key)
-                    .ToArray();
-                foreach (var k in keysToRemove)
-                    MemoryCache.Remove(k);
+                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))
+            using (new WriteLock(_locker))
             {
                 var typeOfT = typeof(T);
-                var keysToRemove = MemoryCache
-                    .Where(c => c.Value != null && c.Value.GetType() == typeOfT && predicate(c.Key, (T)c.Value))
-                    .Select(c => c.Key)
-                    .ToArray();
-                foreach (var k in keysToRemove)
-                    MemoryCache.Remove(k);
+                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))
+            using (new WriteLock(_locker))
             {
-                var keysToRemove = (from c in MemoryCache where c.Key.InvariantStartsWith(keyStartsWith) select c.Key).ToList();
-                foreach (var k in keysToRemove)
-                {
-                    MemoryCache.Remove(k);
-                }
+                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))
+            using (new WriteLock(_locker))
             {
-                var keysToRemove = (from c in MemoryCache where Regex.IsMatch(c.Key, regexString) select c.Key).ToList();
-                foreach (var k in keysToRemove)
-                {
-                    MemoryCache.Remove(k);
-                }
+                foreach (var key in MemoryCache
+                    .Where(x => Regex.IsMatch(x.Key, regexString))
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
             }     
         }
 
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        #endregion
+
+        #region Get
+
+        public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
         {
-            return (from c in MemoryCache
-                    where c.Key.InvariantStartsWith(keyStartsWith)
-                    select c.Value).ToList();
+            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 virtual object GetCacheItem(string cacheKey)
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
         {
-            var result = MemoryCache.Get(cacheKey);
-            return result;
+            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 virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        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)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal,CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
-            using (var lck = new UpgradeableReadLock(Locker))
-            {
-                var result = MemoryCache.Get(cacheKey);
-                if (result == null)
-                {
-                    lck.UpgradeToWriteLock();
+            // see notes in HttpRuntimeCacheProvider
 
-                    result = getCacheItem();
-                    if (result != null)
-                    {
-                        var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
-                        MemoryCache.Set(cacheKey, result, policy);
-                    }
+            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;
             }
+
+            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)
         {
-            object result = getCacheItem();
-            if (result != null)
-            {
-                var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
-                MemoryCache.Set(cacheKey, result, policy);
-            }
+            // 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));

src/Umbraco.Core/Cache/StaticCacheProvider.cs

@@ -59,6 +59,13 @@ namespace Umbraco.Core.Cache
                     select c.Value).ToList();
         }
 
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return (from KeyValuePair<string, object> c in StaticCache
+                    where Regex.IsMatch(c.Key, regexString) 
+                    select c.Value).ToList();
+        }
+
         public virtual object GetCacheItem(string cacheKey)
         {
             var result = StaticCache[cacheKey];

src/Umbraco.Core/CacheHelper.cs

@@ -44,7 +44,7 @@ namespace Umbraco.Core
             : this(
                 new HttpRuntimeCacheProvider(HttpRuntime.Cache),
                 new StaticCacheProvider(),
-                new HttpRequestCacheProvider(() => new HttpContextWrapper(HttpContext.Current)))
+                new HttpRequestCacheProvider())
         {
         }
 
@@ -56,7 +56,7 @@ namespace Umbraco.Core
             : this(
                 new HttpRuntimeCacheProvider(cache),
                 new StaticCacheProvider(),
-                new HttpRequestCacheProvider(() => new HttpContextWrapper(HttpContext.Current)))
+                new HttpRequestCacheProvider())
         {
         }
 

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -5,11 +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
 {
@@ -265,7 +267,7 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfiguredMembershipProvidersLegacyEncoding(Constants.Conventions.Member.UmbracoMemberProviderName);
+                return IsConfiguredMembershipProviderUsingLegacyEncoding(Constants.Conventions.Member.UmbracoMemberProviderName);
             }
             set
             {
@@ -281,11 +283,11 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                return ConfiguredMembershipProvidersLegacyEncoding(Constants.Conventions.User.UmbracoUsersProviderName);
+                return IsConfiguredMembershipProviderUsingLegacyEncoding(UmbracoSettings.DefaultBackofficeProvider);
             }
             set
             {
-                SetMembershipProvidersLegacyEncoding(Constants.Conventions.User.UmbracoUsersProviderName, value);
+                SetMembershipProvidersLegacyEncoding(UmbracoSettings.DefaultBackofficeProvider, value);
             }
         }
 		
@@ -366,22 +368,17 @@ namespace Umbraco.Core.Configuration
             
             webConfigXml.Save(webConfigFilename, SaveOptions.DisableFormatting);
         }
-        
-        private static bool ConfiguredMembershipProvidersLegacyEncoding(string providerName)
+
+        private static bool IsConfiguredMembershipProviderUsingLegacyEncoding(string providerName)
         {
-            var webConfigFilename = GetFullWebConfigFileName();
-            var webConfigXml = XDocument.Load(webConfigFilename, LoadOptions.PreserveWhitespace);
+            //check if this can even be configured.
+            var membershipProvider = Membership.Providers[providerName] as MembershipProviderBase;
+            if (membershipProvider == null)
+            {
+                return false;
+            }
 
-            var membershipConfigs = webConfigXml.XPathSelectElements("configuration/system.web/membership/providers/add").ToList();
-
-            var provider = membershipConfigs.SingleOrDefault(c => c.Attribute("name") != null && c.Attribute("name").Value == providerName);
-            
-            var useLegacyEncodingAttribute = provider.Attribute("useLegacyEncoding");
-            
-            bool useLegacyEncoding;
-            bool.TryParse(useLegacyEncodingAttribute.Value, out useLegacyEncoding);
-
-            return useLegacyEncoding;
+            return membershipProvider.UseLegacyEncoding;
         }
 
         /// <summary>

src/Umbraco.Core/Configuration/UmbracoSettings.cs

@@ -658,7 +658,7 @@ namespace Umbraco.Core.Configuration
 			{
 				string defaultProvider = GetKey("/settings/providers/users/DefaultBackofficeProvider");
 				if (String.IsNullOrEmpty(defaultProvider))
-                    defaultProvider = Constants.Conventions.User.UmbracoUsersProviderName;
+                    defaultProvider = "UsersMembershipProvider";
 
 				return defaultProvider;
 			}
@@ -1083,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;
 				}

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.2.0");
+        private static readonly Version Version = new Version("6.2.2");
 
         /// <summary>
         /// Gets the current version of Umbraco.
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "beta"; } }
+        public static string CurrentComment { get { return ""; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

src/Umbraco.Core/Constants-Conventions.cs

@@ -93,20 +93,10 @@ namespace Umbraco.Core
 				/// </summary>
 				public const string Image = "Image";
 			}
-
-
-            /// <summary>
-            /// Constants for Umbraco user
-            /// </summary>
-		    public static class User
-		    {
-                public static readonly string UmbracoUsersProviderName = "UsersMembershipProvider";
-		    }
-
+            
 		    /// <summary>
 		    /// Constants for Umbraco Member property aliases.
-		    /// </summary>
-		    
+		    /// </summary>		    
 		    public static class Member
 		    {
                 public static readonly string UmbracoMemberProviderName = "UmbracoMembershipProvider";
@@ -116,63 +106,63 @@ namespace Umbraco.Core
                 /// <summary>
                 /// Property alias for a Members Password Question
                 /// </summary>
-                public const string PasswordQuestion = "umbracoPasswordRetrievalQuestionPropertyTypeAlias";
+                public const string PasswordQuestion = "umbracoMemberPasswordRetrievalQuestion";
 
                 public const string PasswordQuestionLabel = "Password Question";
 
                 /// <summary>
                 /// Property alias for Members Password Answer
                 /// </summary>
-                public const string PasswordAnswer = "umbracoPasswordRetrievalAnswerPropertyTypeAlias";
+                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 = "umbracoCommentPropertyTypeAlias";
+                public const string Comments = "umbracoMemberComments";
 
-		        public const string CommentsLabel = "Comments";
+                public const string CommentsLabel = "Comments";
 
                 /// <summary>
                 /// Property alias for the Approved boolean of a Member
                 /// </summary>
-                public const string IsApproved = "umbracoApprovePropertyTypeAlias";
+                public const string IsApproved = "umbracoMemberApproved";
 
-		        public const string IsApprovedLabel = "Is Approved";
+                public const string IsApprovedLabel = "Is Approved";
 
                 /// <summary>
                 /// Property alias for the Locked out boolean of a Member
                 /// </summary>
-                public const string IsLockedOut = "umbracoLockPropertyTypeAlias";
+                public const string IsLockedOut = "umbracoMemberLockedOut";
 
-		        public const string IsLockedOutLabel = "Is Locked Out";
+                public const string IsLockedOutLabel = "Is Locked Out";
 
                 /// <summary>
                 /// Property alias for the last date the Member logged in
                 /// </summary>
-                public const string LastLoginDate = "umbracoLastLoginPropertyTypeAlias";
+                public const string LastLoginDate = "umbracoMemberLastLogin";
 
-		        public const string LastLoginDateLabel = "Last Login Date";
+                public const string LastLoginDateLabel = "Last Login Date";
 
                 /// <summary>
                 /// Property alias for the last date a Member changed its password
                 /// </summary>
-                public const string LastPasswordChangeDate = "umbracoMemberLastPasswordChange";
+                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 = "umbracoMemberLastLockout";
+                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 = "umbracoFailedPasswordAttemptsPropertyTypeAlias";
+                public const string FailedPasswordAttempts = "umbracoMemberFailedPasswordAttempts";
 
                 public const string FailedPasswordAttemptsLabel = "Failed Password Attempts";
 

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/CoreBootManager.cs

@@ -275,7 +275,7 @@ namespace Umbraco.Core
 
             //the database migration objects
             MigrationResolver.Current = new MigrationResolver(
-                () => PluginManager.Current.ResolveMigrationTypes());
+                () => PluginManager.Current.ResolveTypes<IMigration>());
 
             // todo: remove once we drop IPropertyEditorValueConverter support.
             PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(

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;
@@ -426,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();
@@ -434,20 +442,25 @@ namespace Umbraco.Core
         }
 
         internal Result CreateDatabaseSchemaAndData()
-        {
-            var readyForInstall = CheckReadyForInstall();
-            if (readyForInstall.Success == false)
-            {
-                return readyForInstall.Result;
-            }
-            
+        {   
             try
             {
+                var readyForInstall = CheckReadyForInstall();
+                if (readyForInstall.Success == false)
+                {
+                    return readyForInstall.Result;
+                }
+
                 LogHelper.Info<DatabaseContext>("Database configuration status: Started");
 
                 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)
                 {
@@ -460,8 +473,9 @@ namespace Umbraco.Core
 
                     return new Result { Message = message, Success = false, Percentage = "15" };
                 }
+                */
 
-                message = GetResultMessageForMySql(supportsCaseInsensitiveQueries);
+                message = GetResultMessageForMySql();
 
                 var schemaResult = ValidateDatabaseSchema();
                 var installedVersion = schemaResult.DetermineInstalledVersion();
@@ -500,20 +514,21 @@ namespace Umbraco.Core
         /// <returns></returns>
         internal Result UpgradeSchemaAndData()
         {
-            var readyForInstall = CheckReadyForInstall();
-            if (readyForInstall.Success == false)
-            {
-                return readyForInstall.Result;
-            }
-
             try
             {
+
+                var readyForInstall = CheckReadyForInstall();
+                if (readyForInstall.Success == false)
+                {
+                    return readyForInstall.Result;
+                }
+
                 LogHelper.Info<DatabaseContext>("Database upgrade started");
 
                 var database = new UmbracoDatabase(_connectionString, ProviderName);
-                var supportsCaseInsensitiveQueries = SqlSyntaxContext.SqlSyntaxProvider.SupportsCaseInsensitiveQueries(database);                
+                //var supportsCaseInsensitiveQueries = SqlSyntaxContext.SqlSyntaxProvider.SupportsCaseInsensitiveQueries(database);                
 
-                var message = GetResultMessageForMySql(supportsCaseInsensitiveQueries);
+                var message = GetResultMessageForMySql();
 
                 var schemaResult = ValidateDatabaseSchema();
                 var installedVersion = schemaResult.DetermineInstalledVersion();
@@ -540,6 +555,23 @@ namespace Umbraco.Core
             }
         }
 
+        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)
@@ -563,10 +595,16 @@ namespace Umbraco.Core
                        "<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

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

@@ -4,14 +4,14 @@ using System.Web;
 
 namespace Umbraco.Core.Dynamics
 {
-	internal class PropertyResult : IPublishedProperty, IHtmlString
+	internal class PropertyResult : IPublishedContentProperty, IHtmlString
 	{
-	    private readonly IPublishedProperty _source;
+	    private readonly IPublishedContentProperty _source;
 	    private readonly string _alias;
 	    private readonly object _value;
         private readonly PropertyResultType _type;
 
-		internal PropertyResult(IPublishedProperty source, PropertyResultType type)
+		internal PropertyResult(IPublishedContentProperty source, PropertyResultType type)
         {
     		if (source == null) throw new ArgumentNullException("source");
             
@@ -37,6 +37,9 @@ namespace Umbraco.Core.Dynamics
         public object Value { get { return _source == null ? _value : _source.Value; } }
         public object XPathValue { get { return Value == null ? null : Value.ToString(); } }
 
+        public string Alias { get { return PropertyTypeAlias; }}
+        public Guid Version { get { return Guid.Empty; }}
+
         // implements IHtmlString.ToHtmlString
         public string ToHtmlString()
         {

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
 {
@@ -14,43 +15,13 @@ namespace Umbraco.Core
         public static IEnumerable<IEnumerable<T>> InGroupsOf<T>(this IEnumerable<T> source, int groupSize)
         {
             if (source == null)
-               throw new NullReferenceException("source");
+                throw new ArgumentNullException("source");
+            if (groupSize <= 0)
+                throw new ArgumentException("Must be greater than zero.", "groupSize");
 
-            // enumerate the source only once!
-            return new InGroupsEnumerator<T>(source, groupSize).Groups();
-        }
-
-        // this class makes sure that the source is enumerated only ONCE
-        // which means that when it is enumerated, the actual groups content
-        // has to be evaluated at the same time, and stored in an array.
-        private class InGroupsEnumerator<T>
-        {
-            private readonly IEnumerator<T> _source;
-            private readonly int _count;
-            private bool _mightHaveNext;
-
-            public InGroupsEnumerator(IEnumerable<T> source, int count)
-            {
-                _source = source.GetEnumerator();
-                _count = count;
-                _mightHaveNext = true;
-            }
-
-            public IEnumerable<IEnumerable<T>> Groups()
-            {
-                while (_mightHaveNext && _source.MoveNext())
-                    yield return Group().ToArray(); // see note above
-            }
-
-            private IEnumerable<T> Group()
-            {
-                var c = 0;
-                do
-                {
-                    yield return _source.Current;
-                } while (++c < _count && _source.MoveNext());
-                _mightHaveNext = c == _count;
-            }
+            return source
+                .Select((x, i) => Tuple.Create(i / groupSize, x))
+                .GroupBy(t => t.Item1, t => t.Item2);
         }
 
         /// <summary>The distinct by.</summary>
@@ -125,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>

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/IO/FileSystemExtensions.cs

@@ -19,7 +19,10 @@ namespace Umbraco.Core.IO
 
         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);
+            }
         }
 
         public static string GetExtension(this IFileSystem fs, string path)

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/UmbracoMediaFile.cs

@@ -133,16 +133,23 @@ namespace Umbraco.Core.IO
         {
             if (_size == null)
             {
-                EnsureFileSupportsResizing();
+                if (_fs.FileExists(Path))
+                {
+                    EnsureFileSupportsResizing();
 
-                var fs = _fs.OpenFile(Path);
-                var image = Image.FromStream(fs);
-                var fileWidth = image.Width;
-                var fileHeight = image.Height;
-                fs.Close();
-                image.Dispose();
+                    using (var fs = _fs.OpenFile(Path))
+                    using (var image = Image.FromStream(fs))
+                    {
 
-                _size = new Size(fileWidth, fileHeight);    
+                        var fileWidth = image.Width;
+                        var fileHeight = image.Height;
+                        _size = new Size(fileWidth, fileHeight);
+                    }
+                }
+                else
+                {
+                    _size = new Size(-1, -1);
+                }
             }
             return _size.Value;
         }

src/Umbraco.Core/Models/Content.cs

@@ -232,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; }
@@ -248,6 +249,7 @@ 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; }
@@ -314,6 +316,7 @@ namespace Umbraco.Core.Models
             PublishedState = state;
         }
 
+        [DataMember]
         internal PublishedState PublishedState { get; set; }
 
         /// <summary>
@@ -333,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>
@@ -432,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

@@ -15,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;
@@ -257,6 +260,7 @@ 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>
@@ -444,6 +448,7 @@ namespace Umbraco.Core.Models
         /// <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; }
@@ -465,5 +470,6 @@ namespace Umbraco.Core.Models
                 prop.ResetDirtyProperties(rememberPreviouslyChangedProperties);
             }
         }
+        
     }
 }

src/Umbraco.Core/Models/ContentExtensions.cs

@@ -222,6 +222,28 @@ 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>

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

@@ -120,38 +120,6 @@ namespace Umbraco.Core.Models
 
             return result;
         }
-        
-        /// <summary>
-        /// Creates a clone of the current entity
-        /// </summary>
-        /// <returns></returns>
-        public IContentType Clone(string alias)
-        {
-            var clone = (ContentType)this.MemberwiseClone();
-            clone.Alias = alias;
-            clone.Key = Guid.Empty;
-            var propertyGroups = this.PropertyGroups.Select(x => x.Clone()).ToList();
-            clone.PropertyGroups = new PropertyGroupCollection(propertyGroups);
-            clone.PropertyTypes = this.PropertyTypeCollection.Select(x => x.Clone()).ToList();
-            clone.ResetIdentity();
-            clone.ResetDirtyProperties(false);
-
-            foreach (var propertyGroup in clone.PropertyGroups)
-            {
-                propertyGroup.ResetIdentity();
-                foreach (var propertyType in propertyGroup.PropertyTypes)
-                {
-                    propertyType.ResetIdentity();
-                }
-            }
-
-            foreach (var propertyType in clone.PropertyTypes.Where(x => x.HasIdentity))
-            {
-                propertyType.ResetIdentity();
-            }
-
-            return clone;
-        }
 
         /// <summary>
         /// Method to call when Entity is being saved
@@ -165,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

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Strings;
 
 namespace Umbraco.Core.Models
 {
@@ -173,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);
             }
@@ -319,7 +321,7 @@ namespace Umbraco.Core.Models
             }
         }
 
-        private readonly IDictionary<string, object> _additionalData;
+        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>
@@ -349,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
         {
@@ -365,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
@@ -381,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>
@@ -577,5 +595,19 @@ namespace Umbraco.Core.Models
                 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)
@@ -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/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,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
@@ -96,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/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>
@@ -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

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using Umbraco.Core.Models.EntityBase;
 
 namespace Umbraco.Core.Models
@@ -23,5 +20,5 @@ namespace Umbraco.Core.Models
             var dirty = (IRememberBeingDirty)entity;
             return dirty.WasPropertyDirty("Id");
         }
-        }
-}
+    }
+}

src/Umbraco.Core/Models/File.cs

@@ -6,16 +6,6 @@ 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; }
-    }
-
     /// <summary>
     /// Represents an abstract file which provides basic functionality for a File with an Alias and Name
     /// </summary>
@@ -114,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

@@ -29,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/IDeepCloneable.cs

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

src/Umbraco.Core/Models/IPublishedContent.cs

@@ -107,7 +107,7 @@ namespace Umbraco.Core.Models
         /// <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<IPublishedProperty> Properties { get; }
+		ICollection<IPublishedContentProperty> Properties { get; }
 
         /// <summary>
         /// Gets a property identified by its alias.
@@ -119,7 +119,7 @@ namespace Umbraco.Core.Models
         /// <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>
-        IPublishedProperty GetProperty(string alias);
+        IPublishedContentProperty GetProperty(string alias);
 
         /// <summary>
         /// Gets a property identified by its alias.
@@ -133,7 +133,7 @@ namespace Umbraco.Core.Models
         /// 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>
-        IPublishedProperty GetProperty(string alias, bool recurse);
+        IPublishedContentProperty GetProperty(string alias, bool recurse);
 
         /// <summary>
 		/// Gets the value of a property identified by its alias.

src/Umbraco.Core/Models/IPublishedContentProperty.cs

@@ -1,9 +1,11 @@
+using System;
+
 namespace Umbraco.Core.Models
 {
     /// <summary>
     /// Represents a property of an <c>IPublishedContent</c>.
     /// </summary>
-	public interface IPublishedProperty
+	public interface IPublishedContentProperty
 	{
         /// <summary>
         /// Gets the alias of the property.
@@ -56,5 +58,8 @@ namespace Umbraco.Core.Models
         /// <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/Member.cs

@@ -14,66 +14,105 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Member : ContentBase, IMember
     {
-        private readonly IMemberType _contentType;
-        private string _contentTypeAlias;
+        private IMemberType _contentType;
+        private readonly string _contentTypeAlias;
         private string _username;
         private string _email;
-        private string _password;
+        private string _rawPasswordValue;
         private object _providerUserKey;
         private Type _userTypeKey;
 
+        /// <summary>
+        /// Constructor for creating an empty Member object
+        /// </summary>
+        /// <param name="contentType">ContentType for the current Content object</param>
+        public Member(IMemberType contentType)
+            : base("", -1, contentType, new PropertyCollection())
+        {
+            Mandate.ParameterNotNull(contentType, "contentType");
+
+            _contentTypeAlias = contentType.Alias;
+            _contentType = contentType;
+            IsApproved = true;
+
+            //this cannot be null but can be empty
+            _rawPasswordValue = "";
+            _email = "";
+            _username = "";
+        }
+
         /// <summary>
         /// Constructor for creating a Member object
         /// </summary>
         /// <param name="name">Name of the content</param>
         /// <param name="contentType">ContentType for the current Content object</param>
         public Member(string name, IMemberType contentType)
+            : this(contentType)
+        {
+            Mandate.ParameterNotNull(contentType, "contentType");
+            Mandate.ParameterNotNullOrEmpty(name, "name");
+
+            _contentTypeAlias = contentType.Alias;
+            _contentType = contentType;
+            IsApproved = true;
+
+            //this cannot be null but can be empty
+            _rawPasswordValue = "";
+            _email = "";
+            _username = "";
+        }
+
+        /// <summary>
+        /// Constructor for creating a Member object
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="email"></param>
+        /// <param name="username"></param>
+        /// <param name="contentType"></param>
+        public Member(string name, string email, string username, IMemberType contentType)
             : base(name, -1, contentType, new PropertyCollection())
-        {
-            _contentType = contentType;
-            IsApproved = true;
-        }
-
-        //TODO: Should we just get rid of this one? no reason to have a level set.
-        internal Member(string name, string email, string username, string password, int parentId, IMemberType contentType)
-            : base(name, parentId, contentType, new PropertyCollection())
         {
             Mandate.ParameterNotNull(contentType, "contentType");
+            Mandate.ParameterNotNullOrEmpty(name, "name");
+            Mandate.ParameterNotNullOrEmpty(email, "email");
+            Mandate.ParameterNotNullOrEmpty(username, "username");
 
+            _contentTypeAlias = contentType.Alias;
             _contentType = contentType;
             _email = email;
             _username = username;
-            _password = password;
             IsApproved = true;
+
+            //this cannot be null but can be empty
+            _rawPasswordValue = "";
         }
 
-        public Member(string name, string email, string username, string password, IMemberType contentType)
-            : this(name, email, username, password, -1, contentType)
+        /// <summary>
+        /// Constructor for creating a Member object
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="email"></param>
+        /// <param name="username"></param>
+        /// <param name="rawPasswordValue">
+        /// The password value passed in to this parameter should be the encoded/encrypted/hashed format of the member's password
+        /// </param>
+        /// <param name="contentType"></param>
+        public Member(string name, string email, string username, string rawPasswordValue, IMemberType contentType)
+            : base(name, -1, contentType, new PropertyCollection())
         {
             Mandate.ParameterNotNull(contentType, "contentType");
 
+            _contentTypeAlias = contentType.Alias;
             _contentType = contentType;
             _email = email;
             _username = username;
-            _password = password;
+            _rawPasswordValue = rawPasswordValue;
             IsApproved = true;
         }
 
-        //public Member(string name, string email, string username, string password, IContentBase parent, IMemberType contentType)
-        //    : base(name, parent, contentType, new PropertyCollection())
-        //{
-        //    Mandate.ParameterNotNull(contentType, "contentType");
-
-        //    _contentType = contentType;
-        //    _email = email;
-        //    _username = username;
-        //    _password = password;
-        //}
-
-        private static readonly PropertyInfo DefaultContentTypeAliasSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.ContentTypeAlias);
         private static readonly PropertyInfo UsernameSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Username);
         private static readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Email);
-        private static readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Password);
+        private static readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.RawPasswordValue);
         private static readonly PropertyInfo ProviderUserKeySelector = ExpressionHelper.GetPropertyInfo<Member, object>(x => x.ProviderUserKey);
         private static readonly PropertyInfo UserTypeKeySelector = ExpressionHelper.GetPropertyInfo<Member, Type>(x => x.ProviderUserKeyType);
 
@@ -112,19 +151,19 @@ namespace Umbraco.Core.Models
         }
 
         /// <summary>
-        /// Gets or sets the Password
+        /// Gets or sets the raw password value
         /// </summary>
-        [DataMember]
-        public string Password
+        [IgnoreDataMember]
+        public string RawPasswordValue
         {
-            get { return _password; }
+            get { return _rawPasswordValue; }
             set
             {
                 SetPropertyValueAndDetectChanges(o =>
                 {
-                    _password = value;
-                    return _password;
-                }, _password, PasswordSelector);
+                    _rawPasswordValue = value;
+                    return _rawPasswordValue;
+                }, _rawPasswordValue, PasswordSelector);
             }
         }
 
@@ -141,7 +180,7 @@ namespace Umbraco.Core.Models
         /// Alias: umbracoPasswordRetrievalQuestionPropertyTypeAlias
         /// Part of the standard properties collection.
         /// </remarks>
-        [IgnoreDataMember]
+        [DataMember]
         public string PasswordQuestion
         {
             get
@@ -164,14 +203,16 @@ namespace Umbraco.Core.Models
         }
 
         /// <summary>
-        /// Gets or sets the Password Answer
+        /// Gets or sets the raw password answer value
         /// </summary>
         /// <remarks>
+        /// For security reasons this value should be encrypted, the encryption process is handled by the memberhip provider
+        /// 
         /// Alias: umbracoPasswordRetrievalAnswerPropertyTypeAlias
         /// Part of the standard properties collection.
         /// </remarks>
         [IgnoreDataMember]
-        public string PasswordAnswer
+        public string RawPasswordAnswerValue
         {
             get
             {
@@ -199,7 +240,7 @@ namespace Umbraco.Core.Models
         /// Alias: umbracoCommentPropertyTypeAlias
         /// Part of the standard properties collection.
         /// </remarks>
-        [IgnoreDataMember]
+        [DataMember]
         public string Comments
         {
             get
@@ -228,7 +269,7 @@ namespace Umbraco.Core.Models
         /// Alias: umbracoApprovePropertyTypeAlias
         /// Part of the standard properties collection.
         /// </remarks>
-        [IgnoreDataMember]
+        [DataMember]
         public bool IsApproved
         {
             get
@@ -263,7 +304,7 @@ namespace Umbraco.Core.Models
         /// Alias: umbracoLockPropertyTypeAlias
         /// Part of the standard properties collection.
         /// </remarks>
-        [IgnoreDataMember]
+        [DataMember]
         public bool IsLockedOut
         {
             get
@@ -295,7 +336,7 @@ namespace Umbraco.Core.Models
         /// Alias: umbracoLastLoginPropertyTypeAlias
         /// Part of the standard properties collection.
         /// </remarks>
-        [IgnoreDataMember]
+        [DataMember]
         public DateTime LastLoginDate
         {
             get
@@ -327,7 +368,7 @@ namespace Umbraco.Core.Models
         /// Alias: umbracoMemberLastPasswordChange
         /// Part of the standard properties collection.
         /// </remarks>
-        [IgnoreDataMember]
+        [DataMember]
         public DateTime LastPasswordChangeDate
         {
             get
@@ -359,7 +400,7 @@ namespace Umbraco.Core.Models
         /// Alias: umbracoMemberLastLockout
         /// Part of the standard properties collection.
         /// </remarks>
-        [IgnoreDataMember]
+        [DataMember]
         public DateTime LastLockoutDate
         {
             get
@@ -392,7 +433,7 @@ namespace Umbraco.Core.Models
         /// Alias: umbracoFailedPasswordAttemptsPropertyTypeAlias
         /// Part of the standard properties collection.
         /// </remarks>
-        [IgnoreDataMember]
+        [DataMember]
         public int FailedPasswordAttempts
         {
             get
@@ -424,14 +465,6 @@ namespace Umbraco.Core.Models
         public virtual string ContentTypeAlias
         {
             get { return _contentTypeAlias; }
-            internal set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _contentTypeAlias = value;
-                    return _contentTypeAlias;
-                }, _contentTypeAlias, DefaultContentTypeAliasSelector);
-            }
         }
 
         /// <summary>
@@ -521,11 +554,17 @@ namespace Umbraco.Core.Models
         /* Internal experiment - only used for mapping queries. 
          * Adding these to have first level properties instead of the Properties collection.
          */
+        [IgnoreDataMember]
         internal string LongStringPropertyValue { get; set; }
+        [IgnoreDataMember]
         internal string ShortStringPropertyValue { get; set; }
+        [IgnoreDataMember]
         internal int IntegerropertyValue { get; set; }
+        [IgnoreDataMember]
         internal bool BoolPropertyValue { get; set; }
+        [IgnoreDataMember]
         internal DateTime DateTimePropertyValue { get; set; }
+        [IgnoreDataMember]
         internal string PropertyTypeAlias { get; set; }
 
         private Attempt<T> WarnIfPropertyTypeNotFoundOnGet<T>(string propertyAlias, string propertyName, T defaultVal)
@@ -595,5 +634,17 @@ namespace Umbraco.Core.Models
 
             return true;
         }
+
+        public override object DeepClone()
+        {
+            var clone = (Member)base.DeepClone();
+
+            //need to manually clone this since it's not settable
+            clone._contentType = (IMemberType)ContentType.DeepClone();
+            clone.ResetDirtyProperties(false);
+
+            return clone;
+
+        }
     }
 }

src/Umbraco.Core/Models/MemberType.cs

@@ -44,7 +44,9 @@ namespace Umbraco.Core.Models
 
                 SetPropertyValueAndDetectChanges(o =>
                 {
-                    _alias = value == "_umbracoSystemDefaultProtectType" ? value : value.ToSafeAlias();
+                    _alias = value == "_umbracoSystemDefaultProtectType" 
+                        ? value 
+                        : (value == null ? string.Empty : value.ToSafeAlias() );
                     return _alias;
                 }, _alias, AliasSelector);
             }

src/Umbraco.Core/Models/Membership/IMembershipUser.cs

@@ -9,9 +9,19 @@ namespace Umbraco.Core.Models.Membership
         object ProviderUserKey { get; set; }
         string Username { get; set; }
         string Email { get; set; }
-        string Password { get; set; }
+
+        /// <summary>
+        /// Gets or sets the raw password value
+        /// </summary>
+        string RawPasswordValue { get; set; }
+        
         string PasswordQuestion { get; set; }
-        string PasswordAnswer { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the raw password answer value
+        /// </summary>
+        string RawPasswordAnswerValue { get; set; }
+        
         string Comments { get; set; }
         bool IsApproved { get; set; }
         bool IsLockedOut { get; set; }

src/Umbraco.Core/Models/Membership/MemberCountType.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Services
+namespace Umbraco.Core.Models.Membership
 {
     /// <summary>
     /// The types of members to count

src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs

@@ -3,7 +3,7 @@ using System.Web.Security;
 
 namespace Umbraco.Core.Models.Membership
 {
-    internal static class MembershipExtensions
+    internal static class MembershipUserExtensions
     {
         internal static UmbracoMembershipMember AsConcreteMembershipUser(this IMembershipUser member, string providerName)
         {

src/Umbraco.Core/Models/Membership/User.cs

@@ -7,7 +7,7 @@ using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;
+
 
 namespace Umbraco.Core.Models.Membership
 {
@@ -20,13 +20,14 @@ namespace Umbraco.Core.Models.Membership
     /// </remarks>
     [Serializable]
     [DataContract(IsReference = true)]
-    public class User : TracksChangesEntityBase, IUser
+    public class User : Entity, IUser
     {
         public User(IUserType userType)
         {
             if (userType == null) throw new ArgumentNullException("userType");
 
             _userType = userType;
+            _defaultPermissions = _userType.Permissions;
             //Groups = new List<object> { userType };
             SessionTimeout = 60;
             _sectionCollection = new ObservableCollection<string>();
@@ -38,15 +39,17 @@ namespace Umbraco.Core.Models.Membership
             _isLockedOut = false;
             _startContentId = -1;
             _startMediaId = -1;
+            //cannot be null
+            _rawPasswordValue = "";
         }
 
-        public User(string name, string email, string username, string password, IUserType userType)
+        public User(string name, string email, string username, string rawPasswordValue, IUserType userType)
             : this(userType)
         {
             _name = name;
             _email = email;
             _username = username;
-            _password = password;
+            _rawPasswordValue = rawPasswordValue;
             _isApproved = true;
             _isLockedOut = false;
             _startContentId = -1;
@@ -54,20 +57,18 @@ namespace Umbraco.Core.Models.Membership
         }
 
         private IUserType _userType;
-        private bool _hasIdentity;
-        private int _id;
         private string _name;
         private Type _userTypeKey;
-        private readonly List<string> _addedSections;
-        private readonly List<string> _removedSections;
-        private readonly ObservableCollection<string> _sectionCollection;
+        private List<string> _addedSections;
+        private List<string> _removedSections;
+        private ObservableCollection<string> _sectionCollection;
         private int _sessionTimeout;
         private int _startContentId;
         private int _startMediaId;
 
         private string _username;
         private string _email;
-        private string _password;
+        private string _rawPasswordValue;
         private bool _isApproved;
         private bool _isLockedOut;
         private string _language;
@@ -78,64 +79,19 @@ namespace Umbraco.Core.Models.Membership
         private static readonly PropertyInfo StartContentIdSelector = ExpressionHelper.GetPropertyInfo<User, int>(x => x.StartContentId);
         private static readonly PropertyInfo StartMediaIdSelector = ExpressionHelper.GetPropertyInfo<User, int>(x => x.StartMediaId);
         private static readonly PropertyInfo AllowedSectionsSelector = ExpressionHelper.GetPropertyInfo<User, IEnumerable<string>>(x => x.AllowedSections);
-        private static readonly PropertyInfo IdSelector = ExpressionHelper.GetPropertyInfo<User, object>(x => x.Id);
         private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Name);
         private static readonly PropertyInfo UserTypeKeySelector = ExpressionHelper.GetPropertyInfo<User, Type>(x => x.ProviderUserKeyType);
         
         private static readonly PropertyInfo UsernameSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Username);
         private static readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Email);
-        private static readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Password);
+        private static readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.RawPasswordValue);
         private static readonly PropertyInfo IsLockedOutSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.IsLockedOut);
         private static readonly PropertyInfo IsApprovedSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.IsApproved);
         private static readonly PropertyInfo LanguageSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Language);
         private static readonly PropertyInfo DefaultPermissionsSelector = ExpressionHelper.GetPropertyInfo<User, IEnumerable<string>>(x => x.DefaultPermissions);
         private static readonly PropertyInfo DefaultToLiveEditingSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.DefaultToLiveEditing);
-        private static readonly PropertyInfo HasIdentitySelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.HasIdentity);
         private static readonly PropertyInfo UserTypeSelector = ExpressionHelper.GetPropertyInfo<User, IUserType>(x => x.UserType);
-
-        #region Implementation of IEntity
-
-        [IgnoreDataMember]
-        public bool HasIdentity
-        {
-            get
-            {
-                return _hasIdentity;
-            }
-            protected set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _hasIdentity = value;
-                    return _hasIdentity;
-                }, _hasIdentity, HasIdentitySelector);
-            }
-        }
-
-        [DataMember]
-        public int Id
-        {
-            get
-            {
-                return _id;
-            }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _id = value;
-                    HasIdentity = true; //set the has Identity
-                    return _id;
-                }, _id, IdSelector);
-            }
-        }
-
-        //this doesn't get used
-        [IgnoreDataMember]
-        public Guid Key { get; set; }
-
-        #endregion
-
+        
         #region Implementation of IMembershipUser
 
         [IgnoreDataMember]
@@ -204,16 +160,16 @@ namespace Umbraco.Core.Models.Membership
             }
         }
         [DataMember]
-        public string Password
+        public string RawPasswordValue
         {
-            get { return _password; }
+            get { return _rawPasswordValue; }
             set
             {
                 SetPropertyValueAndDetectChanges(o =>
                 {
-                    _password = value;
-                    return _password;
-                }, _password, PasswordSelector);
+                    _rawPasswordValue = value;
+                    return _rawPasswordValue;
+                }, _rawPasswordValue, PasswordSelector);
             }
         }
 
@@ -251,13 +207,9 @@ namespace Umbraco.Core.Models.Membership
         [IgnoreDataMember]
         public string PasswordQuestion { get; set; }
         [IgnoreDataMember]
-        public string PasswordAnswer { get; set; }
+        public string RawPasswordAnswerValue { get; set; }
         [IgnoreDataMember]
-        public string Comments { get; set; }
-        [IgnoreDataMember]
-        public DateTime CreateDate { get; set; }
-        [IgnoreDataMember]
-        public DateTime UpdateDate { get; set; }
+        public string Comments { get; set; }        
         [IgnoreDataMember]
         public DateTime LastLoginDate { get; set; }
         [IgnoreDataMember]
@@ -292,7 +244,10 @@ namespace Umbraco.Core.Models.Membership
 
         public void RemoveAllowedSection(string sectionAlias)
         {
-            _sectionCollection.Remove(sectionAlias);
+            if (_sectionCollection.Contains(sectionAlias))
+            {
+                _sectionCollection.Remove(sectionAlias);
+            }
         }
 
         public void AddAllowedSection(string sectionAlias)
@@ -471,24 +426,41 @@ namespace Umbraco.Core.Models.Membership
 
             if (e.Action == NotifyCollectionChangedAction.Add)
             {
-                //remove from the removed/added sections (since people could add/remove all they want in one request)
-                _removedSections.RemoveAll(s => s == e.NewItems.Cast<string>().First());
-                _addedSections.RemoveAll(s => s == e.NewItems.Cast<string>().First());
+                var item = e.NewItems.Cast<string>().First();
 
-                //add to the added sections
-                _addedSections.Add(e.NewItems.Cast<string>().First());
+                if (_addedSections.Contains(item) == false)
+                {
+                    _addedSections.Add(item);
+                }
             }
             else if (e.Action == NotifyCollectionChangedAction.Remove)
             {
-                //remove from the removed/added sections (since people could add/remove all they want in one request)
-                _removedSections.RemoveAll(s => s == e.OldItems.Cast<string>().First());
-                _addedSections.RemoveAll(s => s == e.OldItems.Cast<string>().First());
+                var item = e.OldItems.Cast<string>().First();
+
+                if (_removedSections.Contains(item) == false)
+                {
+                    _removedSections.Add(item);    
+                }
 
-                //add to the added sections
-                _removedSections.Add(e.OldItems.Cast<string>().First());
             }
         }
 
+        public override object DeepClone()
+        {
+            var clone = (User)base.DeepClone();
+
+            //need to create new collections otherwise they'll get copied by ref
+            clone._addedSections = new List<string>();
+            clone._removedSections = new List<string>();
+            clone._sectionCollection = new ObservableCollection<string>(_sectionCollection.ToList());
+            //re-create the event handler
+            clone._sectionCollection.CollectionChanged += clone.SectionCollectionChanged;
+
+            clone.ResetDirtyProperties(false);
+
+            return clone;
+        }
+
         /// <summary>
         /// Internal class used to wrap the user in a profile
         /// </summary>
@@ -512,6 +484,24 @@ namespace Umbraco.Core.Models.Membership
                 get { return _user.Name; }
                 set { _user.Name = value; }
             }
+
+            protected bool Equals(UserProfile other)
+            {
+                return _user.Equals(other._user);
+            }
+
+            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((UserProfile) obj);
+            }
+
+            public override int GetHashCode()
+            {
+                return _user.GetHashCode();
+            }
         }
     }
 }

src/Umbraco.Core/Models/Membership/UserType.cs

@@ -1,27 +1,55 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Strings;
 
 namespace Umbraco.Core.Models.Membership
 {
     /// <summary>
     /// Represents the Type for a Backoffice User
-    /// </summary>
-    /// <remarks>
-    /// Should be internal until a proper user/membership implementation
-    /// is part of the roadmap.
-    /// </remarks>
+    /// </summary>    
     [Serializable]
     [DataContract(IsReference = true)]
     internal class UserType : Entity, IUserType
     {
-        [DataMember]
-        public string Alias { get; set; }
+        private string _alias;
+        private string _name;
+        private IEnumerable<string> _permissions;
+
+        private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<UserType, string>(x => x.Name);
+        private static readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<UserType, string>(x => x.Alias);
+        private static readonly PropertyInfo PermissionsSelector = ExpressionHelper.GetPropertyInfo<UserType, IEnumerable<string>>(x => x.Permissions);
 
         [DataMember]
-        public string Name { get; set; }
+        public string Alias
+        {
+            get { return _alias; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _alias = value.ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase);
+                    return _alias;
+                }, _alias, AliasSelector);
+            }
+        }
+
+        [DataMember]
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _name = value;
+                    return _name;
+                }, _name, NameSelector);
+            }
+        }
 
         /// <summary>
         /// The set of default permissions for the user type
@@ -30,6 +58,17 @@ namespace Umbraco.Core.Models.Membership
         /// By default each permission is simply a single char but we've made this an enumerable{string} to support a more flexible permissions structure in the future.
         /// </remarks>
         [DataMember]
-        public IEnumerable<string> Permissions { get; set; }
+        public IEnumerable<string> Permissions
+        {
+            get { return _permissions; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _permissions = value;
+                    return _permissions;
+                }, _permissions, PermissionsSelector);
+            }
+        }
     }
 }

src/Umbraco.Core/Models/PreValue.cs

@@ -3,8 +3,15 @@
     /// <summary>
     /// Represents a stored pre-value field value
     /// </summary>
-    public class PreValue
+    public class PreValue : IDeepCloneable
     {
+        public PreValue(int id, string value, int sortOrder)
+        {
+            Id = id;
+            Value = value;       
+            SortOrder = sortOrder;
+        }
+
         public PreValue(int id, string value)
         {
             Value = value;
@@ -19,11 +26,23 @@
         /// <summary>
         /// The value stored for the pre-value field
         /// </summary>
-        public string Value { get; private set; }
+        public string Value { get; set; }
 
         /// <summary>
         /// The database id for the pre-value field value
         /// </summary>
         public int Id { get; private set; }
+
+        /// <summary>
+        /// The sort order stored for the pre-value field value
+        /// </summary>
+        public int SortOrder { get; private set; }
+
+        public virtual object DeepClone()
+        {
+            //Memberwise clone on PreValue will work since it doesn't have any deep elements
+            var clone = (PreValue)MemberwiseClone();            
+            return clone;
+        }
     }
 }

src/Umbraco.Core/Models/PreValueCollection.cs

@@ -14,7 +14,7 @@ namespace Umbraco.Core.Models
     /// Most legacy property editors won't support the dictionary format but new property editors should always use the dictionary format.
     /// In order to get overrideable pre-values working we need a dictionary since we'll have to reference a pre-value by a key.
     /// </remarks>
-    public class PreValueCollection
+    public class PreValueCollection : IDeepCloneable
     {
         private IDictionary<string, PreValue> _preValuesAsDictionary;
         private IEnumerable<PreValue> _preValuesAsArray;
@@ -82,5 +82,21 @@ namespace Umbraco.Core.Models
             }
             return result;
         }
+
+        public object DeepClone()
+        {
+            var clone = (PreValueCollection) MemberwiseClone();
+            if (_preValuesAsArray != null)
+            {
+                clone._preValuesAsArray = _preValuesAsArray.Select(x => (PreValue)x.DeepClone()).ToArray();    
+            }
+            if (_preValuesAsDictionary != null)
+            {
+                clone._preValuesAsDictionary = _preValuesAsDictionary.ToDictionary(x => x.Key, x => (PreValue)x.Value.DeepClone());    
+            }
+            
+
+            return clone;
+        }
     }
 }

src/Umbraco.Core/Models/Property.cs

@@ -13,7 +13,7 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Property : Entity
     {
-        private readonly PropertyType _propertyType;
+        private PropertyType _propertyType;
         private Guid _version;
         private object _value;
 
@@ -147,5 +147,16 @@ namespace Umbraco.Core.Models
         {
             return _propertyType.IsPropertyValueValid(value);
         }
+
+        public override object DeepClone()
+        {
+            var clone = (Property)base.DeepClone();
+
+            //need to manually assign since this is a readonly property
+            clone._propertyType = (PropertyType)PropertyType.DeepClone();
+            clone.ResetDirtyProperties(false);
+            
+            return clone;
+        }
     }
 }

src/Umbraco.Core/Models/PropertyCollection.cs

@@ -5,6 +5,7 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading;
+using Umbraco.Core.Models.EntityBase;
 
 namespace Umbraco.Core.Models
 {
@@ -13,7 +14,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    public class PropertyCollection : KeyedCollection<string, Property>, INotifyCollectionChanged
+    public class PropertyCollection : KeyedCollection<string, Property>, INotifyCollectionChanged, IDeepCloneable
     {
         private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();
         internal Action OnAdd;
@@ -195,5 +196,19 @@ namespace Umbraco.Core.Models
                 }
             }
         }
+
+        /// <summary>
+        /// Create a deep clone of this property collection
+        /// </summary>
+        /// <returns></returns>
+        public object DeepClone()
+        {
+            var newList = new PropertyCollection();
+            foreach (var p in this)
+            {
+                newList.Add((Property)p.DeepClone());
+            }
+            return newList;
+        }
     }
 }

src/Umbraco.Core/Models/PropertyExtensions.cs

@@ -22,42 +22,10 @@ namespace Umbraco.Core.Models
         /// <returns>Xml of the property and its value</returns>
         public static XElement ToXml(this Property property)
         {
-            return property.ToXml(ApplicationContext.Current.Services.DataTypeService);
+            var xmlSerializer = new EntityXmlSerializer();
+            return xmlSerializer.Serialize(ApplicationContext.Current.Services.DataTypeService, property);
         }
 
-        internal static XElement ToXml(this Property property, IDataTypeService dataTypeService)
-        {
-            var nodeName = UmbracoSettings.UseLegacyXmlSchema ? "data" : property.Alias.ToSafeAlias();
-
-            var xd = new XmlDocument();
-            var xmlNode = xd.CreateNode(XmlNodeType.Element, nodeName, "");
-
-            //Add the property alias to the legacy schema
-            if (UmbracoSettings.UseLegacyXmlSchema)
-            {
-                var alias = xd.CreateAttribute("alias");
-                alias.Value = property.Alias.ToSafeAlias();
-                xmlNode.Attributes.Append(alias);
-            }
-
-            //This seems to fail during testing 
-            //SD: With the new null checks below, this shouldn't fail anymore.
-            var dt = property.PropertyType.DataType(property.Id, dataTypeService);
-            if (dt != null && dt.Data != null)
-            {
-                //We've already got the value for the property so we're going to give it to the 
-                // data type's data property so it doesn't go re-look up the value from the db again.
-                var defaultData = dt.Data as IDataValueSetter;
-                if (defaultData != null)
-                {
-                    defaultData.SetValue(property.Value, property.PropertyType.DataTypeDatabaseType.ToString());
-                }
-
-                xmlNode.AppendChild(dt.Data.ToXMl(xd));
-            }
-
-            var element = xmlNode.GetXElement();
-            return element;
-        }
+        
     }
 }

src/Umbraco.Core/Models/PropertyGroup.cs

@@ -107,23 +107,6 @@ namespace Umbraco.Core.Models
             }
         }
 
-        internal PropertyGroup Clone()
-        {
-            var clone = (PropertyGroup) this.MemberwiseClone();
-            var collection = new PropertyTypeCollection();
-            foreach (var propertyType in this.PropertyTypes)
-            {
-                var property = propertyType.Clone();
-                property.ResetIdentity();
-                property.ResetDirtyProperties(false);
-                collection.Add(property);
-            }
-            clone.PropertyTypes = collection;
-            clone.ResetIdentity();
-            clone.ResetDirtyProperties(false);
-            return clone;
-        }
-
         /// <summary>
         /// Sets the ParentId from the lazy integer id
         /// </summary>
@@ -157,5 +140,6 @@ namespace Umbraco.Core.Models
             //Calculate the hash code for the product. 
             return hashName ^ hashId;
         }
+
     }
 }

src/Umbraco.Core/Models/PropertyGroupCollection.cs

@@ -5,6 +5,7 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading;
+using Umbraco.Core.Models.EntityBase;
 
 namespace Umbraco.Core.Models
 {
@@ -13,9 +14,10 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract]
-    public class PropertyGroupCollection : KeyedCollection<string, PropertyGroup>, INotifyCollectionChanged
+    public class PropertyGroupCollection : KeyedCollection<string, PropertyGroup>, INotifyCollectionChanged, IDeepCloneable
     {
         private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();
+        
         internal Action OnAdd;
 
         internal PropertyGroupCollection()
@@ -131,5 +133,15 @@ namespace Umbraco.Core.Models
                 CollectionChanged(this, args);
             }
         }
+
+        public object DeepClone()
+        {
+            var newGroup = new PropertyGroupCollection();
+            foreach (var p in this)
+            {
+                newGroup.Add((PropertyGroup)p.DeepClone());
+            }            
+            return newGroup;
+        }
     }
 }

src/Umbraco.Core/Models/PropertyType.cs

@@ -4,6 +4,7 @@ using System.Runtime.Serialization;
 using System.Text.RegularExpressions;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Strings;
 
 namespace Umbraco.Core.Models
 {
@@ -94,7 +95,7 @@ namespace Umbraco.Core.Models
             {
                 SetPropertyValueAndDetectChanges(o =>
                 {
-                    _alias = value;
+                    _alias = value.ToCleanString(CleanStringType.Alias | CleanStringType.UmbracoCase);
                     return _alias;
                 }, _alias, AliasSelector);
             }
@@ -388,7 +389,9 @@ namespace Umbraco.Core.Models
                 }
                 
             }
-
+            
+            //TODO: We must ensure that the property value can actually be saved based on the specified database type
+            
             //TODO Add PropertyEditor validation when its relevant to introduce
             /*if (value is IEditorModel && DataTypeControlId != Guid.Empty)
             {
@@ -402,14 +405,6 @@ namespace Umbraco.Core.Models
             return true;
         }
 
-        internal PropertyType Clone()
-        {
-            var clone = (PropertyType) this.MemberwiseClone();
-            clone.ResetIdentity();
-            clone.ResetDirtyProperties(false);
-            return clone;
-        }
-
         public bool Equals(PropertyType other)
         {
             //Check whether the compared object is null. 
@@ -433,5 +428,20 @@ namespace Umbraco.Core.Models
             //Calculate the hash code for the product. 
             return hashName ^ hashAlias;
         }
+
+        public override object DeepClone()
+        {
+            var clone = (PropertyType)base.DeepClone();
+
+            //need to manually assign the Lazy value as it will not be automatically mapped
+            if (PropertyGroupId != null)
+            {
+                clone._propertyGroupId = new Lazy<int>(() => PropertyGroupId.Value);    
+            }
+
+            clone.ResetDirtyProperties(false);
+
+            return clone;
+        }
     }
 }

src/Umbraco.Core/Models/PropertyTypeCollection.cs

@@ -5,6 +5,7 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Threading;
+using Umbraco.Core.Models.EntityBase;
 
 namespace Umbraco.Core.Models
 {
@@ -13,9 +14,12 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract]
-    public class PropertyTypeCollection : KeyedCollection<string, PropertyType>, INotifyCollectionChanged
+    public class PropertyTypeCollection : KeyedCollection<string, PropertyType>, INotifyCollectionChanged, IDeepCloneable
     {
+        [IgnoreDataMember]
         private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();
+
+        [IgnoreDataMember]
         internal Action OnAdd;
 
         internal PropertyTypeCollection()
@@ -131,5 +135,15 @@ namespace Umbraco.Core.Models
                 CollectionChanged(this, args);
             }
         }
+
+        public object DeepClone()
+        {
+            var newGroup = new PropertyTypeCollection();
+            foreach (var p in this)
+            {
+                newGroup.Add((PropertyType)p.DeepClone());
+            }
+            return newGroup;
+        }
     }
 }

src/Umbraco.Core/Models/PublishedContent/IPublishedContentExtended.cs

@@ -14,7 +14,7 @@ namespace Umbraco.Core.Models.PublishedContent
         /// Adds a property to the extended content.
         /// </summary>
         /// <param name="property">The property to add.</param>
-        void AddProperty(IPublishedProperty property);
+        void AddProperty(IPublishedContentProperty property);
 
         /// <summary>
         /// Gets a value indicating whether properties were added to the extended content.

src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs

@@ -66,10 +66,10 @@ namespace Umbraco.Core.Models.PublishedContent
 
         #region IPublishedContentExtended
 
-        void IPublishedContentExtended.AddProperty(IPublishedProperty property)
+        void IPublishedContentExtended.AddProperty(IPublishedContentProperty property)
         {
             if (_properties == null)
-                _properties = new Collection<IPublishedProperty>();
+                _properties = new Collection<IPublishedContentProperty>();
             _properties.Add(property);
         }
 
@@ -113,9 +113,9 @@ namespace Umbraco.Core.Models.PublishedContent
 
         #region Properties
 
-        private ICollection<IPublishedProperty> _properties;
+        private ICollection<IPublishedContentProperty> _properties;
 
-        public override ICollection<IPublishedProperty> Properties
+        public override ICollection<IPublishedContentProperty> Properties
         {
             get
             {
@@ -138,7 +138,7 @@ namespace Umbraco.Core.Models.PublishedContent
             }
         }
 
-        public override IPublishedProperty GetProperty(string alias)
+        public override IPublishedContentProperty GetProperty(string alias)
         {
             return _properties == null
                 ? Content.GetProperty(alias)

src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs

@@ -141,9 +141,21 @@ namespace Umbraco.Core.Models.PublishedContent
             if (GetPublishedContentTypeCallback != null)
                 return GetPublishedContentTypeCallback(alias);
 
-            var contentType = itemType == PublishedItemType.Content
-                ? (IContentTypeComposition)ApplicationContext.Current.Services.ContentTypeService.GetContentType(alias)
-                : (IContentTypeComposition)ApplicationContext.Current.Services.ContentTypeService.GetMediaType(alias);
+            IContentTypeComposition contentType;
+            switch (itemType)
+            {
+                case PublishedItemType.Content:
+                    contentType = ApplicationContext.Current.Services.ContentTypeService.GetContentType(alias);
+                    break;
+                case PublishedItemType.Media:
+                    contentType = ApplicationContext.Current.Services.ContentTypeService.GetMediaType(alias);
+                    break;
+                case PublishedItemType.Member:
+                    contentType = ApplicationContext.Current.Services.MemberTypeService.Get(alias);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException("itemType");
+            }
 
             if (contentType == null)
                 throw new Exception(string.Format("ContentTypeService failed to find a {0} type with alias \"{1}\".",

src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs

@@ -183,7 +183,7 @@ namespace Umbraco.Core.Models.PublishedContent
 
         #region Properties
 
-        public virtual ICollection<IPublishedProperty> Properties
+        public virtual ICollection<IPublishedContentProperty> Properties
         {
             get { return Content.Properties; }
         }
@@ -193,12 +193,12 @@ namespace Umbraco.Core.Models.PublishedContent
             get { return Content[alias]; }
         }
 
-        public virtual IPublishedProperty GetProperty(string alias)
+        public virtual IPublishedContentProperty GetProperty(string alias)
         {
             return Content.GetProperty(alias);
         }
 
-        public virtual IPublishedProperty GetProperty(string alias, bool recurse)
+        public virtual IPublishedContentProperty GetProperty(string alias, bool recurse)
         {
             return Content.GetProperty(alias, recurse);
         }

src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Models.PublishedContent
     /// Provides a base class for <c>IPublishedProperty</c> implementations which converts and caches
     /// the value source to the actual value to use when rendering content.
     /// </summary>
-    internal abstract class PublishedPropertyBase : IPublishedProperty
+    internal abstract class PublishedPropertyBase : IPublishedContentProperty
     {
         public readonly PublishedPropertyType PropertyType;
 
@@ -27,5 +27,8 @@ namespace Umbraco.Core.Models.PublishedContent
         public abstract object DataValue { get; }
         public abstract object Value { get; }
         public abstract object XPathValue { get; }
+
+        public string Alias { get { return PropertyTypeAlias; } }
+        public Guid Version { get { return Guid.Empty; } }
     }
 }

src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs

@@ -10,7 +10,7 @@ using Umbraco.Core.PropertyEditors;
 namespace Umbraco.Core.Models.PublishedContent
 {
     /// <summary>
-    /// Represents an <see cref="IPublishedProperty"/> type.
+    /// Represents an <see cref="IPublishedContentProperty"/> type.
     /// </summary>
     /// <remarks>Instances of the <see cref="PublishedPropertyType"/> class are immutable, ie
     /// if the property type changes, then a new class needs to be created.</remarks>

src/Umbraco.Core/Models/PublishedItemType.cs

@@ -13,6 +13,11 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// A media.
         /// </summary>
-		Media
+		Media,
+
+        /// <summary>
+        /// A member.
+        /// </summary>
+        Member
 	}
 }

src/Umbraco.Core/Models/Rdbms/PreviewXmlDto.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Models.Rdbms
     internal class PreviewXmlDto
     {
         [Column("nodeId")]
-        [PrimaryKeyColumn(AutoIncrement = false, Name = "", OnColumns = "nodeId, versionId")]
+        [PrimaryKeyColumn(AutoIncrement = false, Name = "PK_cmsContentPreviewXml", OnColumns = "nodeId, versionId")]
         [ForeignKey(typeof(ContentDto), Column = "nodeId")]
         public int NodeId { get; set; }
 

src/Umbraco.Core/Models/Rdbms/UserLoginDto.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models.Rdbms
     internal class UserLoginDto
     {
         [Column("contextID")]
-        [Index(IndexTypes.Clustered, Name = "umbracoUserLogins_Index")]
+        [Index(IndexTypes.Clustered, Name = "IX_umbracoUserLogins_Index")]
         public Guid ContextId { get; set; }
 
         [Column("userID")]

src/Umbraco.Core/Models/Relation.cs

@@ -107,5 +107,6 @@ namespace Umbraco.Core.Models
         {
             get { return _relationType.Id; }
         }
+
     }
 }

src/Umbraco.Core/Models/RelationType.cs

@@ -21,9 +21,18 @@ namespace Umbraco.Core.Models
 
         public RelationType(Guid childObjectType, Guid parentObjectType, string @alias)
         {
+            Mandate.ParameterNotNullOrEmpty(@alias, "alias");
             _childObjectType = childObjectType;
             _parentObjectType = parentObjectType;
             _alias = alias;
+            Name = _alias;
+        }
+
+        public RelationType(Guid childObjectType, Guid parentObjectType, string @alias, string name)
+            :this(childObjectType, parentObjectType, @alias)
+        {
+            Mandate.ParameterNotNullOrEmpty(name, "name");
+            Name = name;
         }
 
         private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<RelationType, string>(x => x.Name);
@@ -118,5 +127,6 @@ namespace Umbraco.Core.Models
                 }, _childObjectType, ChildObjectTypeSelector);
             }
         }
+
     }
 }

src/Umbraco.Core/Models/ServerRegistration.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Reflection;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Persistence.Mappers;
@@ -34,7 +35,7 @@ namespace Umbraco.Core.Models
         {
             UpdateDate = updateDate;
             CreateDate = createDate;
-            Key = Id.ToString().EncodeAsGuid();
+            Key = Id.ToString(CultureInfo.InvariantCulture).EncodeAsGuid();
             Id = id;
             ServerAddress = serverAddress;
             ComputerName = computerName;
@@ -51,7 +52,7 @@ namespace Umbraco.Core.Models
         {
             CreateDate = createDate;
             UpdateDate = createDate;
-            Key = 0.ToString().EncodeAsGuid();
+            Key = 0.ToString(CultureInfo.InvariantCulture).EncodeAsGuid();
             ServerAddress = serverAddress;
             ComputerName = computerName;
         }

src/Umbraco.Core/Models/Task.cs

@@ -132,5 +132,6 @@ namespace Umbraco.Core.Models
                 }, _comment, CommentSelector);    
             }
         }
+
     }
 }

src/Umbraco.Core/Models/Template.cs

@@ -4,6 +4,8 @@ using System.Reflection;
 using System.Runtime.Serialization;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Strings;
 
 namespace Umbraco.Core.Models
 {
@@ -14,20 +16,18 @@ namespace Umbraco.Core.Models
     [DataContract(IsReference = true)]
     public class Template : File, ITemplate
     {
-        private readonly string _alias;
-        private readonly string _name;
+        private string _alias;
+        private string _name;
         private int _creatorId;
         private int _level;
         private int _sortOrder;
         private int _parentId;
-        private int _masterTemplateId;
         private string _masterTemplateAlias;
 
         private static readonly PropertyInfo CreatorIdSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.CreatorId);
         private static readonly PropertyInfo LevelSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.Level);
         private static readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.SortOrder);
         private static readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.ParentId);
-        //private static readonly PropertyInfo MasterTemplateIdSelector = ExpressionHelper.GetPropertyInfo<Template, int>(x => x.MasterTemplateId);
         private static readonly PropertyInfo MasterTemplateAliasSelector = ExpressionHelper.GetPropertyInfo<Template, string>(x => x.MasterTemplateAlias);
         
 
@@ -43,8 +43,8 @@ namespace Umbraco.Core.Models
         {
             base.Path = path;
             ParentId = -1;
-            _name = name.Replace("/", ".").Replace("\\", "");
-            _alias = alias.ToSafeAlias();
+            _name = name; //.Replace("/", ".").Replace("\\", ""); // why? that's just the name!
+            _alias = alias.ToCleanString(CleanStringType.UnderscoreAlias);
         }
 
         [DataMember]
@@ -197,5 +197,18 @@ namespace Umbraco.Core.Models
         {
             MasterTemplateId = new Lazy<int>(() => masterTemplate.Id);
         }
+
+        public override object DeepClone()
+        {
+            var clone = (Template)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/UmbracoEntity.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Reflection;
 using Umbraco.Core.Models.EntityBase;
 
@@ -46,11 +47,13 @@ namespace Umbraco.Core.Models
         public UmbracoEntity()
         {
             AdditionalData = new Dictionary<string, object>();
+            UmbracoProperties = new List<UmbracoProperty>();
         }
 
         public UmbracoEntity(bool trashed)
         {
             AdditionalData = new Dictionary<string, object>();
+            UmbracoProperties = new List<UmbracoProperty>();
             Trashed = trashed;
         }
 
@@ -58,6 +61,7 @@ namespace Umbraco.Core.Models
         public UmbracoEntity(UInt64 trashed)
         {
             AdditionalData = new Dictionary<string, object>();
+            UmbracoProperties = new List<UmbracoProperty>();
             Trashed = trashed == 1;
         }
 
@@ -287,11 +291,39 @@ namespace Umbraco.Core.Models
         /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
         /// </summary>
         public IList<UmbracoProperty> UmbracoProperties { get; set; }
-
-        internal class UmbracoProperty
+        
+        internal class UmbracoProperty : IDeepCloneable
         {
             public Guid DataTypeControlId { get; set; }
             public string Value { get; set; }
+            public 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 = MemberwiseClone();
+                return clone;
+            }
+
+            protected bool Equals(UmbracoProperty other)
+            {
+                return DataTypeControlId.Equals(other.DataTypeControlId) && string.Equals(Value, other.Value);
+            }
+
+            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((UmbracoProperty) obj);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    return (DataTypeControlId.GetHashCode()*397) ^ (Value != null ? Value.GetHashCode() : 0);
+                }
+            }
         }
     }
 }

src/Umbraco.Core/MonitorLock.cs

@@ -0,0 +1,32 @@
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides an equivalent to the c# lock statement, to be used in a using block.
+    /// </summary>
+    /// <remarks>Ie replace <c>lock (o) {...}</c> by <c>using (new MonitorLock(o)) { ... }</c></remarks>
+    public class MonitorLock : IDisposable
+    {
+        private readonly object _locker;
+        private readonly bool _entered;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MonitorLock"/> class with an object to lock.
+        /// </summary>
+        /// <param name="locker">The object to lock.</param>
+        /// <remarks>Should always be used within a using block.</remarks>
+        public MonitorLock(object locker)
+        {
+            _locker = locker;
+            _entered = false;
+            System.Threading.Monitor.Enter(_locker, ref _entered);
+        }
+
+        void IDisposable.Dispose()
+        {
+            if (_entered)
+                System.Threading.Monitor.Exit(_locker);
+        }
+    }
+}

src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using umbraco.interfaces;
 
 namespace Umbraco.Core.ObjectResolution
@@ -8,7 +9,10 @@ namespace Umbraco.Core.ObjectResolution
 	/// <summary>
 	/// A resolver to return all IApplicationEvents objects
 	/// </summary>
-    internal sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>
+	/// <remarks>
+	/// This is disposable because after the app has started it should be disposed to release any memory being occupied by instances.
+	/// </remarks>
+    internal  sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>, IDisposable
 	{
 
 	    private readonly LegacyStartupHandlerResolver _legacyResolver;
@@ -53,7 +57,7 @@ namespace Umbraco.Core.ObjectResolution
 
 		protected override bool SupportsClear
 		{
-			get { return false; }
+            get { return false; }
 		}		
 
 		protected override bool SupportsInsert
@@ -61,7 +65,7 @@ namespace Umbraco.Core.ObjectResolution
 			get { return false; }			
 		}
 
-	    private class LegacyStartupHandlerResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationStartupHandler>
+	    private class LegacyStartupHandlerResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationStartupHandler>, IDisposable
 	    {
 	        internal LegacyStartupHandlerResolver(IEnumerable<Type> legacyStartupHandlers)
                 : base(legacyStartupHandlers)
@@ -73,7 +77,72 @@ namespace Umbraco.Core.ObjectResolution
             {
                 get { return Values; }
             }
-	    }	    
 
+	        public void Dispose()
+	        {
+                ResetCollections();
+	        }
+	    }
+
+	    private bool _disposed;
+		private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
+
+		/// <summary>
+		/// Gets a value indicating whether this instance is disposed.
+		/// </summary>
+		/// <value>
+		/// 	<c>true</c> if this instance is disposed; otherwise, <c>false</c>.
+		/// </value>
+		public bool IsDisposed
+		{
+			get { return _disposed; }
+		}
+
+		/// <summary>
+		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+		/// </summary>
+		/// <filterpriority>2</filterpriority>
+		public void Dispose()
+		{
+			Dispose(true);
+
+			// Use SupressFinalize in case a subclass of this type implements a finalizer.
+			GC.SuppressFinalize(this);
+		}
+
+        ~ApplicationEventsResolver()
+		{
+			// Run dispose but let the class know it was due to the finalizer running.
+			Dispose(false);
+		}
+
+		private void Dispose(bool disposing)
+		{
+			// Only operate if we haven't already disposed
+			if (IsDisposed || disposing == false) return;
+
+			using (new WriteLock(_disposalLocker))
+			{
+				// Check again now we're inside the lock
+				if (IsDisposed) return;
+
+				// Call to actually release resources. This method is only
+				// kept separate so that the entire disposal logic can be used as a VS snippet
+				DisposeResources();
+
+				// Indicate that the instance has been disposed.
+				_disposed = true;
+			}
+		}
+
+	    /// <summary>
+	    /// Clear out all of the instances, we don't want them hanging around and cluttering up memory
+	    /// </summary>
+	    private void DisposeResources()
+	    {
+            _legacyResolver.Dispose();
+            ResetCollections();
+	    }
+        
 	}
 }