Bump version to RC2

Merge pull request #1889 from umbraco/temp-U4-9758
U4-9758 New index can't be applied when CmsMember table has very long login names
2017-04-25 11:15:51 +02:00 · 2017-04-25 10:01:35 +01:00 · 2017-04-25 09:58:20 +01:00 · 2017-04-25 10:46:37 +02:00 · 2017-04-25 09:13:48 +01:00 · 2017-04-24 16:08:01 +01:00
929 changed files with 33098 additions and 14308 deletions
@@ -0,0 +1,10 @@
+root=true
+
+[*]
+end_of_line = lf
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.{cs,cshtml,csx,vb,vbx,vbhtml,fs,fsx,txt,ps1,sql}]
+indent_size = 4
@@ -14,66 +14,67 @@
    <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
    <language>en-US</language>
    <tags>umbraco</tags>
-    <dependencies>
+    <dependencies>      
+      <dependency id="log4net" version="[2.0.8,3.0.0)" />
+      <dependency id="Log4Net.Async" version="[2.0.4,3.0.0)" />
      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.3,6.0.0)" />
      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
+      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.0.1, 4.0.0)" />
      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.0.1, 4.0.0)" />
      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.0.1, 4.0.0)" />
      <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
-      <dependency id="HtmlAgilityPack" version="[1.4.9, 2.0.0)" />
+      <dependency id="HtmlAgilityPack" version="[1.4.9.5, 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.9.8, 7.0.0)" />
+      <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
      <dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
-      <dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
-	  <!-- AutoMapper can not be updated due to: https://github.com/AutoMapper/AutoMapper/issues/373#issuecomment-127644405 -->
+      <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
      <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
-      <dependency id="Examine" version="[0.1.80, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.1, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.0, 5.0.0)" />
-      <dependency id="semver" version="[1.1.2, 2.0.0)" />
-      <dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />	  
+      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
+      <dependency id="Examine" version="[0.1.82, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.5.3, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.8.3, 5.0.0)" />
+      <dependency id="semver" version="[2.0.4, 3.0.0)" />
 	  <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
-      <dependency id="Markdown" version="[1.14.4, 2.0.0)" />	  
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, 5.0.0)" />
+      <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
    </dependencies>
  </metadata>
  <files>
-    <file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\SQLCE4Umbraco.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
-    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
-    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.xml" target="lib\UmbracoExamine.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\net45\businesslogic.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\net45\businesslogic.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\net45\cms.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\net45\cms.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\net45\controls.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\net45\controls.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\net45\interfaces.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\net45\interfaces.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\net45\log4net.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net45\Microsoft.ApplicationBlocks.Data.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\net45\SQLCE4Umbraco.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\net45\SQLCE4Umbraco.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\net45\System.Data.SqlServerCe.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\net45\System.Data.SqlServerCe.Entity.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\net45\TidyNet.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\net45\Umbraco.Core.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\net45\Umbraco.Core.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\net45\umbraco.DataLayer.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\net45\umbraco.DataLayer.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\net45\umbraco.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\net45\umbraco.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\net45\umbraco.editorControls.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\net45\umbraco.editorControls.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\net45\umbraco.MacroEngines.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\net45\umbraco.MacroEngines.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\net45\umbraco.providers.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\net45\umbraco.providers.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net45\Umbraco.Web.UI.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net45\Umbraco.Web.UI.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\net45\UmbracoExamine.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.xml" target="lib\net45\UmbracoExamine.xml" />
    <file src="tools\install.core.ps1" target="tools\install.ps1" />

    <!-- Added to be able to produce a symbols package -->
@@ -104,4 +105,4 @@
    <file src="..\_BuildOutput\bin\UmbracoExamine.pdb" target="lib" />
    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
  </files>
-</package>
+</package>
@@ -16,9 +16,10 @@
    <tags>umbraco</tags>
    <dependencies>
      <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.5, 4.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.7, 4.0.0)" />
      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
+	  <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
    </dependencies>
  </metadata>
  <files>
@@ -45,6 +46,7 @@
    <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
    <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
    <file src="tools\processing.config.install.xdt" target="Content\Config\imageprocessor\processing.config.install.xdt" />
+    <file src="tools\cache.config.install.xdt" target="Content\Config\imageprocessor\cache.config.install.xdt" />
    <file src="build\**" target="build" />
  </files>
 </package>
@@ -41,16 +41,6 @@
        views/dashboard/developer/examinemanagement.html
      </control>
    </tab>
-    <tab caption="Health Check" xdt:Transform="InsertIfMissing" xdt:Locator="Match(caption)">
-      <control>
-        views/dashboard/developer/healthcheck.html
-      </control>
-    </tab>
-    <tab caption="Redirect URL Management" xdt:Transform="InsertIfMissing" xdt:Locator="Match(caption)">
-      <control>
-        views/dashboard/developer/redirecturls.html
-      </control>
-    </tab>	
  </section>
  
  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
@@ -80,4 +70,26 @@
 	<tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
 	<tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
  </section>
+
+  <section alias="RedirectUrlManagement" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas>
+      <area>content</area>
+    </areas>
+    <tab caption="Redirect URL Management">
+      <control>
+        views/dashboard/developer/redirecturls.html
+      </control>
+    </tab>
+  </section>
+
+  <section alias="UmbracoHealthCheck" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas>
+      <area>developer</area>
+    </areas>
+    <tab caption="Health Check">
+      <control>
+        views/dashboard/developer/healthcheck.html
+      </control>
+    </tab>
+  </section>
 </dashBoard>
@@ -8,8 +8,16 @@
                                                   
 ----------------------------------------------------

-Don't forget to build!
+*** IMPORTANT NOTICE FOR 7.6 UPGRADES ***

+Be sure to read the version specific upgrade information before proceeding:
+https://our.umbraco.org/documentation/Getting-Started/Setup/Upgrading/version-specific#version-7-6-0
+
+You will most likely need to make some changes to your web.config and you will need to be 
+aware of the breaking changes listed there to see if these affect your installation.
+
+
+Don't forget to build!

 We've done our best to transform your configuration files but in case something is not quite right: remember we
 backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
@@ -58,7 +58,7 @@
    <httpRuntime xdt:Transform="InsertIfMissing" />
    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
    <httpRuntime targetFramework="4.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
-    
+
    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
@@ -330,6 +330,8 @@
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
    </assemblyBinding>
  </runtime>

@@ -337,7 +339,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
      </dependentAssembly>
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
@@ -349,7 +351,7 @@
      </dependentAssembly>
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
      </dependentAssembly>
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -383,6 +385,10 @@
        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<caching xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <caches>
+    <cache name="DiskCache" trimCache="false" xdt:Transform="SetAttributes(trimCache)" xdt:Locator="Match(name)"  />
+  </caches>
+</caching>
@@ -53,7 +53,6 @@ if ($project) {
 		if(Test-Path $umbracoBinFolder\umbraco.providers.dll) { Remove-Item $umbracoBinFolder\umbraco.providers.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\UmbracoExamine.dll) { Remove-Item $umbracoBinFolder\UmbracoExamine.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\UrlRewritingNet.UrlRewriter.dll) { Remove-Item $umbracoBinFolder\UrlRewritingNet.UrlRewriter.dll -Force -Confirm:$false }
 		
 		# Delete files Umbraco depends upon
 		$amd64Folder = Join-Path $umbracoBinFolder "amd64"
@@ -34,10 +34,15 @@
       xdt:Transform="SetAttributes()" />
  <add application="settings" alias="templates" title="Templates" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="1" 
       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
+       xdt:Transform="SetAttributes()" /> 
+  
+  <add application="settings" alias="partialViews" type="Umbraco.Web.Trees.PartialViewsTree, umbraco"
+       xdt:Locator="Match(application,alias,type)"
+       xdt:Transform="Remove()" />
+  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, umbraco" sortOrder="2"
+       xdt:Locator="Match(application,alias)"
+       xdt:Transform="InsertIfMissing"  />
+  
  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
@@ -84,9 +89,14 @@
  <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
+  
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco"
+       xdt:Locator="Match(application,alias,type)" 
+       xdt:Transform="Remove()" />
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder"
+       xdt:Locator="Match(application,alias)"
+       xdt:Transform="InsertIfMissing"  />
+  
  <add application="developer" alias="python" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="Remove" />
@@ -1,3 +1,3 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
 7.6.0
-alpha056
+RC2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -49,9 +49,11 @@
    <Reference Include="System.Core" />
    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+      <Private>True</Private>
    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@@ -240,7 +240,7 @@ namespace SqlCE4Umbraco
            {
                var cmd = trx == null ? new SqlCeCommand(commandText, conn) : new SqlCeCommand(commandText, conn, trx);
                AttachParameters(cmd, commandParameters);
-                return cmd.ExecuteReader(CommandBehavior.CloseConnection);
+                return cmd.ExecuteReader();
            }
            catch
            {
@@ -4,7 +4,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -30,6 +30,10 @@
        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
@@ -12,4 +12,4 @@ using System.Resources;
 [assembly: AssemblyVersion("1.0.*")]

 [assembly: AssemblyFileVersion("7.6.0")]
-[assembly: AssemblyInformationalVersion("7.6.0-alpha056")]
+[assembly: AssemblyInformationalVersion("7.6.0-RC2")]
@@ -1,12 +1,11 @@
 using System;
 using System.Configuration;
 using System.Threading;
-using System.Threading.Tasks;
-using System.Web;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Profiling;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;

@@ -162,6 +161,11 @@ namespace Umbraco.Core
    	/// </summary>
    	public static ApplicationContext Current { get; internal set; }

+        /// <summary>
+        /// Gets the scope provider.
+        /// </summary>
+        internal IScopeProvider ScopeProvider { get { return _databaseContext == null ? null : _databaseContext.ScopeProvider; } }
+
 		/// <summary>
 		/// Returns the application wide cache accessor
 		/// </summary>
@@ -418,10 +422,17 @@ namespace Umbraco.Core
                this.ApplicationCache = null;
                if (_databaseContext != null) //need to check the internal field here
                {
+                    if (_databaseContext.ScopeProvider.AmbientScope != null)
+                    {
+                        var scope = _databaseContext.ScopeProvider.AmbientScope;
+                        scope.Dispose();
+                    }
+                    /*
                    if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.Database != null)
                    {
                        DatabaseContext.Database.Dispose();       
-                    }                    
+                    } 
+                    */                   
                }
                this.DatabaseContext = null;
                this.Services = null;
@@ -0,0 +1,49 @@
+using System;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Web;
+using Umbraco.Core;
+
+[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")]
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Manages any assembly binding redirects that cannot be done via config (i.e. unsigned --> signed assemblies)
+    /// </summary>
+    public sealed class BindingRedirects
+    {
+        public static void Initialize()
+        {
+            // this only gets called when an assembly can't be resolved
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+        }
+
+        private static readonly Regex Log4NetAssemblyPattern = new Regex("log4net, Version=([\\d\\.]+?), Culture=neutral, PublicKeyToken=\\w+$", RegexOptions.Compiled);
+        private const string Log4NetReplacement = "log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a";
+        
+        /// <summary>
+        /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            //log4net:            
+            if (Log4NetAssemblyPattern.IsMatch(args.Name) && args.Name != Log4NetReplacement)
+            {
+                return Assembly.Load(Log4NetAssemblyPattern.Replace(args.Name, Log4NetReplacement));
+            }
+            
+            //AutoMapper:
+            // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
+            // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
+            if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null"))
+                return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
+
+            return null;
+            
+        }
+    }
+}
@@ -26,6 +26,9 @@ namespace Umbraco.Core.Cache

        public DeepCloneRuntimeCacheProvider(IRuntimeCacheProvider innerProvider)
        {
+            if (innerProvider.GetType() == typeof(DeepCloneRuntimeCacheProvider))
+                throw new InvalidOperationException("A " + typeof(DeepCloneRuntimeCacheProvider) + " cannot wrap another instance of " + typeof(DeepCloneRuntimeCacheProvider));
+
            InnerProvider = innerProvider;
        }

@@ -105,9 +108,11 @@ namespace Umbraco.Core.Cache
                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                if (value == null) return null; // do not store null values (backward compat)

+                //Clone/reset to go into the cache
                return CheckCloneableAndTracksChanges(value);
            }, timeout, isSliding, priority, removedCallback, dependentFiles);

+            //Clone/reset to go out of the cache
            return CheckCloneableAndTracksChanges(cached);
        }

@@ -1,268 +1,250 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Scoping;

 namespace Umbraco.Core.Cache
 {
    /// <summary>
-    /// The default cache policy for retrieving a single entity
+    /// Represents the default cache policy.
    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="TId"></typeparam>
+    /// <typeparam name="TEntity">The type of the entity.</typeparam>
+    /// <typeparam name="TId">The type of the identifier.</typeparam>
    /// <remarks>
-    /// This cache policy uses sliding expiration and caches instances for 5 minutes. However if allow zero count is true, then we use the
-    /// default policy with no expiry.
+    /// <para>The default cache policy caches entities with a 5 minutes sliding expiration.</para>
+    /// <para>Each entity is cached individually.</para>
+    /// <para>If options.GetAllCacheAllowZeroCount then a 'zero-count' array is cached when GetAll finds nothing.</para>
+    /// <para>If options.GetAllCacheValidateCount then we check against the db when getting many entities.</para>
    /// </remarks>
    internal class DefaultRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
        where TEntity : class, IAggregateRoot
    {
+        private static readonly TEntity[] EmptyEntities = new TEntity[0]; // const
        private readonly RepositoryCachePolicyOptions _options;
-       
+
        public DefaultRepositoryCachePolicy(IRuntimeCacheProvider cache, RepositoryCachePolicyOptions options)
            : base(cache)
-        {            
+        {
            if (options == null) throw new ArgumentNullException("options");
-            _options = options;         
+            _options = options;
        }

-        protected string GetCacheIdKey(object id)
+        public override IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
+        {
+            return new ScopedRepositoryCachePolicy<TEntity, TId>(this, runtimeCache, scope);
+        }
+
+        protected string GetEntityCacheKey(object id)
        {
            if (id == null) throw new ArgumentNullException("id");
-
-            return string.Format("{0}{1}", GetCacheTypeKey(), id);
+            return GetEntityTypeCacheKey() + id;
        }

-        protected string GetCacheTypeKey()
+        protected string GetEntityTypeCacheKey()
        {
            return string.Format("uRepo_{0}_", typeof(TEntity).Name);
        }

-        public override void CreateOrUpdate(TEntity entity, Action<TEntity> persistMethod)
+        protected virtual void InsertEntity(string cacheKey, TEntity entity)
+        {
+            Cache.InsertCacheItem(cacheKey, () => entity, TimeSpan.FromMinutes(5), true);
+        }
+
+        protected virtual void InsertEntities(TId[] ids, TEntity[] entities)
+        {
+            if (ids.Length == 0 && entities.Length == 0 && _options.GetAllCacheAllowZeroCount)
+            {
+                // getting all of them, and finding nothing.
+                // if we can cache a zero count, cache an empty array,
+                // for as long as the cache is not cleared (no expiration)
+                Cache.InsertCacheItem(GetEntityTypeCacheKey(), () => EmptyEntities);
+            }
+            else
+            {
+                // individually cache each item
+                foreach (var entity in entities)
+                {
+                    var capture = entity;
+                    Cache.InsertCacheItem(GetEntityCacheKey(entity.Id), () => capture, TimeSpan.FromMinutes(5), true);
+                }
+            }
+        }
+
+        /// <inheritdoc />
+        public override void Create(TEntity entity, Action<TEntity> persistNew)
        {
            if (entity == null) throw new ArgumentNullException("entity");
-            if (persistMethod == null) throw new ArgumentNullException("persistMethod");

            try
            {
-                persistMethod(entity);
+                persistNew(entity);

-                //set the disposal action                
-                SetCacheAction(() =>
+                // just to be safe, we cannot cache an item without an identity
+                if (entity.HasIdentity)
                {
-                    //just to be safe, we cannot cache an item without an identity
-                    if (entity.HasIdentity)
-                    {
-                        Cache.InsertCacheItem(GetCacheIdKey(entity.Id), () => entity,
-                            timeout: TimeSpan.FromMinutes(5),
-                            isSliding: true);
-                    }
-                    
-                    //If there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                    Cache.ClearCacheItem(GetCacheTypeKey());
-                });
-                
+                    Cache.InsertCacheItem(GetEntityCacheKey(entity.Id), () => entity, TimeSpan.FromMinutes(5), true);
+                }
+
+                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
+                Cache.ClearCacheItem(GetEntityTypeCacheKey());
            }
            catch
            {
-                //set the disposal action                
-                SetCacheAction(() =>
-                {
-                    //if an exception is thrown we need to remove the entry from cache, this is ONLY a work around because of the way
-                    // that we cache entities: http://issues.umbraco.org/issue/U4-4259
-                    Cache.ClearCacheItem(GetCacheIdKey(entity.Id));
+                // if an exception is thrown we need to remove the entry from cache,
+                // this is ONLY a work around because of the way
+                // that we cache entities: http://issues.umbraco.org/issue/U4-4259
+                Cache.ClearCacheItem(GetEntityCacheKey(entity.Id));
+
+                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
+                Cache.ClearCacheItem(GetEntityTypeCacheKey());

-                    //If there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                    Cache.ClearCacheItem(GetCacheTypeKey());
-                });
-                
                throw;
            }
        }

-        public override void Remove(TEntity entity, Action<TEntity> persistMethod)
+        /// <inheritdoc />
+        public override void Update(TEntity entity, Action<TEntity> persistUpdated)
        {
            if (entity == null) throw new ArgumentNullException("entity");
-            if (persistMethod == null) throw new ArgumentNullException("persistMethod");

            try
            {
-                persistMethod(entity);
-            }
-            finally
-            {
-                //set the disposal action
-                var cacheKey = GetCacheIdKey(entity.Id);
-                SetCacheAction(() =>
+                persistUpdated(entity);
+
+                // just to be safe, we cannot cache an item without an identity
+                if (entity.HasIdentity)
                {
-                    Cache.ClearCacheItem(cacheKey);
-                    //If there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                    Cache.ClearCacheItem(GetCacheTypeKey());
-                });
+                    Cache.InsertCacheItem(GetEntityCacheKey(entity.Id), () => entity, TimeSpan.FromMinutes(5), true);
+                }
+
+                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
+                Cache.ClearCacheItem(GetEntityTypeCacheKey());
+            }
+            catch
+            {
+                // if an exception is thrown we need to remove the entry from cache,
+                // this is ONLY a work around because of the way
+                // that we cache entities: http://issues.umbraco.org/issue/U4-4259
+                Cache.ClearCacheItem(GetEntityCacheKey(entity.Id));
+
+                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
+                Cache.ClearCacheItem(GetEntityTypeCacheKey());
+
+                throw;
            }
        }

-        public override TEntity Get(TId id, Func<TId, TEntity> getFromRepo)
+        /// <inheritdoc />
+        public override void Delete(TEntity entity, Action<TEntity> persistDeleted)
        {
-            if (getFromRepo == null) throw new ArgumentNullException("getFromRepo");
+            if (entity == null) throw new ArgumentNullException("entity");

-            var cacheKey = GetCacheIdKey(id);
+            try
+            {
+                persistDeleted(entity);
+            }
+            finally
+            {
+                // whatever happens, clear the cache
+                var cacheKey = GetEntityCacheKey(entity.Id);
+                Cache.ClearCacheItem(cacheKey);
+                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
+                Cache.ClearCacheItem(GetEntityTypeCacheKey());
+            }
+        }
+
+        /// <inheritdoc />
+        public override TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            var cacheKey = GetEntityCacheKey(id);
            var fromCache = Cache.GetCacheItem<TEntity>(cacheKey);
+
+            // if found in cache then return else fetch and cache
            if (fromCache != null)
                return fromCache;
-            
-            var entity = getFromRepo(id);
+            var entity = performGet(id);

-            //set the disposal action
-            SetCacheAction(cacheKey, entity);
+            if (entity != null && entity.HasIdentity)
+                InsertEntity(cacheKey, entity);

            return entity;
        }

-        public override TEntity Get(TId id)
+        /// <inheritdoc />
+        public override TEntity GetCached(TId id)
        {
-            var cacheKey = GetCacheIdKey(id);
+            var cacheKey = GetEntityCacheKey(id);
            return Cache.GetCacheItem<TEntity>(cacheKey);
        }

-        public override bool Exists(TId id, Func<TId, bool> getFromRepo)
+        /// <inheritdoc />
+        public override bool Exists(TId id, Func<TId, bool> performExists, Func<TId[], IEnumerable<TEntity>> performGetAll)
        {
-            if (getFromRepo == null) throw new ArgumentNullException("getFromRepo");
-
-            var cacheKey = GetCacheIdKey(id);
+            // if found in cache the return else check
+            var cacheKey = GetEntityCacheKey(id);
            var fromCache = Cache.GetCacheItem<TEntity>(cacheKey);
-            return fromCache != null || getFromRepo(id);
+            return fromCache != null || performExists(id);
        }

-        public override TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> getFromRepo)            
+        /// <inheritdoc />
+        public override TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> performGetAll)
        {
-            if (getFromRepo == null) throw new ArgumentNullException("getFromRepo");
-
-            if (ids.Any())
+            if (ids.Length > 0)
            {
-                var entities = ids.Select(Get).ToArray();
-                if (ids.Length.Equals(entities.Length) && entities.Any(x => x == null) == false)
-                    return entities;
+                // try to get each entity from the cache
+                // if we can find all of them, return
+                var entities = ids.Select(GetCached).WhereNotNull().ToArray();
+                if (ids.Length.Equals(entities.Length))
+                    return entities; // no need for null checks, we are not caching nulls
            }
            else
            {
-                var allEntities = GetAllFromCache();
-                if (allEntities.Any())
+                // get everything we have
+                var entities = Cache.GetCacheItemsByKeySearch<TEntity>(GetEntityTypeCacheKey())
+                    .ToArray(); // no need for null checks, we are not caching nulls
+
+                if (entities.Length > 0)
                {
+                    // if some of them were in the cache...
                    if (_options.GetAllCacheValidateCount)
                    {
-                        //Get count of all entities of current type (TEntity) to ensure cached result is correct
+                        // need to validate the count, get the actual count and return if ok
                        var totalCount = _options.PerformCount();
-                        if (allEntities.Length == totalCount)
-                            return allEntities;
+                        if (entities.Length == totalCount)
+                            return entities;
                    }
                    else
                    {
-                        return allEntities;
+                        // no need to validate, just return what we have and assume it's all there is
+                        return entities;
                    }
                }
                else if (_options.GetAllCacheAllowZeroCount)
                {
-                    //if the repository allows caching a zero count, then check the zero count cache
-                    if (HasZeroCountCache())
-                    {
-                        //there is a zero count cache so return an empty list
-                        return new TEntity[] {};
-                    }
+                    // if none of them were in the cache
+                    // and we allow zero count - check for the special (empty) entry
+                    var empty = Cache.GetCacheItem<TEntity[]>(GetEntityTypeCacheKey());
+                    if (empty != null) return empty;
                }
            }

-            //we need to do the lookup from the repo
-            var entityCollection = getFromRepo(ids)
-                //ensure we don't include any null refs in the returned collection!
-                .WhereNotNull()
+            // cache failed, get from repo and cache
+            var repoEntities = performGetAll(ids)
+                .WhereNotNull() // exclude nulls!
+                .Where(x => x.HasIdentity) // be safe, though would be weird...
                .ToArray();

-            //set the disposal action
-            SetCacheAction(ids, entityCollection);
+            // note: if empty & allow zero count, will cache a special (empty) entry
+            InsertEntities(ids, repoEntities);

-            return entityCollection;
+            return repoEntities;
        }

-        /// <summary>
-        /// Looks up the zero count cache, must return null if it doesn't exist
-        /// </summary>
-        /// <returns></returns>
-        protected bool HasZeroCountCache()
+        /// <inheritdoc />
+        public override void ClearAll()
        {
-            var zeroCount = Cache.GetCacheItem<TEntity[]>(GetCacheTypeKey());
-            return (zeroCount != null && zeroCount.Any() == false);
+            Cache.ClearAllCache();
        }
-
-        /// <summary>
-        /// Performs the lookup for all entities of this type from the cache
-        /// </summary>
-        /// <returns></returns>
-        protected TEntity[] GetAllFromCache()
-        {
-            var allEntities = Cache.GetCacheItemsByKeySearch<TEntity>(GetCacheTypeKey())
-                    .WhereNotNull()
-                    .ToArray();
-            return allEntities.Any() ? allEntities : new TEntity[] {};
-        }       
-
-        /// <summary>
-        /// Sets the action to execute on disposal for a single entity
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <param name="entity"></param>
-        protected virtual void SetCacheAction(string cacheKey, TEntity entity)
-        {
-            if (entity == null) return;
-
-            SetCacheAction(() =>
-            {
-                //just to be safe, we cannot cache an item without an identity
-                if (entity.HasIdentity)
-                {
-                    Cache.InsertCacheItem(cacheKey, () => entity,
-                        timeout: TimeSpan.FromMinutes(5),
-                        isSliding: true);
-                }
-            });
-        }
-
-        /// <summary>
-        /// Sets the action to execute on disposal for an entity collection
-        /// </summary>
-        /// <param name="ids"></param>
-        /// <param name="entityCollection"></param>
-        protected virtual void SetCacheAction(TId[] ids, TEntity[] entityCollection)
-        {
-            SetCacheAction(() =>
-            {
-                //This option cannot execute if we are looking up specific Ids
-                if (ids.Any() == false && entityCollection.Length == 0 && _options.GetAllCacheAllowZeroCount)
-                {
-                    //there was nothing returned but we want to cache a zero count result so add an TEntity[] to the cache
-                    // to signify that there is a zero count cache
-                    //NOTE: Don't set expiry/sliding for a zero count
-                    Cache.InsertCacheItem(GetCacheTypeKey(), () => new TEntity[] {});
-                }
-                else
-                {
-                    //This is the default behavior, we'll individually cache each item so that if/when these items are resolved 
-                    // by id, they are returned from the already existing cache.
-                    foreach (var entity in entityCollection.WhereNotNull())
-                    {
-                        var localCopy = entity;
-                        //just to be safe, we cannot cache an item without an identity
-                        if (localCopy.HasIdentity)
-                        {
-                            Cache.InsertCacheItem(GetCacheIdKey(entity.Id), () => localCopy,
-                                timeout: TimeSpan.FromMinutes(5),
-                                isSliding: true);
-                        }
-                    }
-                }
-            });
-        }
-        
    }
 }
@@ -1,27 +0,0 @@
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Creates cache policies
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="TId"></typeparam>
-    internal class DefaultRepositoryCachePolicyFactory<TEntity, TId> : IRepositoryCachePolicyFactory<TEntity, TId>
-        where TEntity : class, IAggregateRoot
-    {
-        private readonly IRuntimeCacheProvider _runtimeCache;
-        private readonly RepositoryCachePolicyOptions _options;
-
-        public DefaultRepositoryCachePolicyFactory(IRuntimeCacheProvider runtimeCache, RepositoryCachePolicyOptions options)
-        {
-            _runtimeCache = runtimeCache;
-            _options = options;
-        }
-
-        public virtual IRepositoryCachePolicy<TEntity, TId> CreatePolicy()
-        {
-            return new DefaultRepositoryCachePolicy<TEntity, TId>(_runtimeCache, _options);
-        }
-    }
-}
@@ -3,227 +3,178 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Collections;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Scoping;

 namespace Umbraco.Core.Cache
 {
    /// <summary>
-    /// A caching policy that caches an entire dataset as a single collection
+    /// Represents a caching policy that caches the entire entities set as a single collection.
    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="TId"></typeparam>
+    /// <typeparam name="TEntity">The type of the entity.</typeparam>
+    /// <typeparam name="TId">The type of the identifier.</typeparam>
+    /// <remarks>
+    /// <para>Caches the entire set of entities as a single collection.</para>
+    /// <para>Used by Content-, Media- and MemberTypeRepository, DataTypeRepository, DomainRepository,
+    /// LanguageRepository, PublicAccessRepository, TemplateRepository... things that make sense to
+    /// keep as a whole in memory.</para>
+    /// </remarks>
    internal class FullDataSetRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
        where TEntity : class, IAggregateRoot
    {
-        private readonly Func<TEntity, TId> _getEntityId;
-        private readonly Func<IEnumerable<TEntity>> _getAllFromRepo;
+        private readonly Func<TEntity, TId> _entityGetId;
        private readonly bool _expires;

-        public FullDataSetRepositoryCachePolicy(IRuntimeCacheProvider cache, Func<TEntity, TId> getEntityId, Func<IEnumerable<TEntity>> getAllFromRepo, bool expires)
+        public FullDataSetRepositoryCachePolicy(IRuntimeCacheProvider cache, Func<TEntity, TId> entityGetId, bool expires)
            : base(cache)
        {
-            _getEntityId = getEntityId;
-            _getAllFromRepo = getAllFromRepo;
+            _entityGetId = entityGetId;
            _expires = expires;
        }

-        private bool? _hasZeroCountCache;
+        public override IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
+        {
+            return new ScopedRepositoryCachePolicy<TEntity, TId>(this, runtimeCache, scope);
+        }

+        protected static readonly TId[] EmptyIds = new TId[0]; // const

-        protected string GetCacheTypeKey()
+        protected string GetEntityTypeCacheKey()
        {
            return string.Format("uRepo_{0}_", typeof(TEntity).Name);
        }

-        public override void CreateOrUpdate(TEntity entity, Action<TEntity> persistMethod)
+        protected void InsertEntities(TEntity[] entities)
        {
-            if (entity == null) throw new ArgumentNullException("entity");
-            if (persistMethod == null) throw new ArgumentNullException("persistMethod");
+            // cache is expected to be a deep-cloning cache ie it deep-clones whatever is
+            // IDeepCloneable when it goes in, and out. it also resets dirty properties,
+            // making sure that no 'dirty' entity is cached.
+            //
+            // this policy is caching the entire list of entities. to ensure that entities
+            // are properly deep-clones when cached, it uses a DeepCloneableList. however,
+            // we don't want to deep-clone *each* entity in the list when fetching it from
+            // cache as that would not be efficient for Get(id). so the DeepCloneableList is
+            // set to ListCloneBehavior.CloneOnce ie it will clone *once* when inserting,
+            // and then will *not* clone when retrieving.

-            try
+            if (_expires)
            {
-                persistMethod(entity);
-
-                //set the disposal action                
-                SetCacheAction(() =>
-                {
-                    //Clear all
-                    Cache.ClearCacheItem(GetCacheTypeKey());
-                });
+                Cache.InsertCacheItem(GetEntityTypeCacheKey(), () => new DeepCloneableList<TEntity>(entities), TimeSpan.FromMinutes(5), true);
            }
-            catch
+            else
            {
-                //set the disposal action                
-                SetCacheAction(() =>
-                {
-                    //Clear all
-                    Cache.ClearCacheItem(GetCacheTypeKey());
-                });
-                throw;
+                Cache.InsertCacheItem(GetEntityTypeCacheKey(), () => new DeepCloneableList<TEntity>(entities));
            }
        }

-        public override void Remove(TEntity entity, Action<TEntity> persistMethod)
+        /// <inheritdoc />
+        public override void Create(TEntity entity, Action<TEntity> persistNew)
        {
            if (entity == null) throw new ArgumentNullException("entity");
-            if (persistMethod == null) throw new ArgumentNullException("persistMethod");

            try
            {
-                persistMethod(entity);
+                persistNew(entity);
            }
            finally
            {
-                //set the disposal action
-                SetCacheAction(() =>
-                {
-                    //Clear all
-                    Cache.ClearCacheItem(GetCacheTypeKey());
-                });
+                ClearAll();
            }
        }

-        public override TEntity Get(TId id, Func<TId, TEntity> getFromRepo)
+        /// <inheritdoc />
+        public override void Update(TEntity entity, Action<TEntity> persistUpdated)
        {
-            //Force get all with cache
-            var found = GetAll(new TId[] { }, ids => _getAllFromRepo().WhereNotNull());
+            if (entity == null) throw new ArgumentNullException("entity");

-            //we don't have anything in cache (this should never happen), just return from the repo
-            if (found == null) return getFromRepo(id);
-            var entity = found.FirstOrDefault(x => _getEntityId(x).Equals(id));
-            if (entity == null) return null;
-
-            //We must ensure to deep clone each one out manually since the deep clone list only clones one way
-            return (TEntity)entity.DeepClone();
-        }
-
-        public override TEntity Get(TId id)
-        {
-            //Force get all with cache
-            var found = GetAll(new TId[] { }, ids => _getAllFromRepo().WhereNotNull());
-
-            //we don't have anything in cache (this should never happen), just return null
-            if (found == null) return null;
-            var entity = found.FirstOrDefault(x => _getEntityId(x).Equals(id));
-            if (entity == null) return null;
-
-            //We must ensure to deep clone each one out manually since the deep clone list only clones one way
-            return (TEntity)entity.DeepClone();
-        }
-
-        public override bool Exists(TId id, Func<TId, bool> getFromRepo)
-        {
-            //Force get all with cache
-            var found = GetAll(new TId[] { }, ids => _getAllFromRepo().WhereNotNull());
-
-            //we don't have anything in cache (this should never happen), just return from the repo
-            return found == null
-                ? getFromRepo(id)
-                : found.Any(x => _getEntityId(x).Equals(id));
-        }
-
-        public override TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> getFromRepo)
-        {
-            //process getting all including setting the cache callback
-            var result = PerformGetAll(getFromRepo);
-
-            //now that the base result has been calculated, they will all be cached. 
-            // Now we can just filter by ids if they have been supplied
-
-            return (ids.Any()
-                ? result.Where(x => ids.Contains(_getEntityId(x))).ToArray()
-                : result)
-                //We must ensure to deep clone each one out manually since the deep clone list only clones one way
-                .Select(x => (TEntity)x.DeepClone())
-                .ToArray();
-        }
-
-        private TEntity[] PerformGetAll(Func<TId[], IEnumerable<TEntity>> getFromRepo)
-        {
-            var allEntities = GetAllFromCache();
-            if (allEntities.Any())
+            try
            {
-                return allEntities;
+                persistUpdated(entity);
            }
-
-            //check the zero count cache
-            if (HasZeroCountCache())
+            finally
            {
-                //there is a zero count cache so return an empty list
-                return new TEntity[] { };
+                ClearAll();
            }
-
-            //we need to do the lookup from the repo
-            var entityCollection = getFromRepo(new TId[] { })
-                //ensure we don't include any null refs in the returned collection!
-                .WhereNotNull()
-                .ToArray();
-
-            //set the disposal action
-            SetCacheAction(entityCollection);
-
-            return entityCollection;
        }

-        /// <summary>
-        /// For this type of caching policy, we don't cache individual items
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <param name="entity"></param>
-        protected void SetCacheAction(string cacheKey, TEntity entity)
+        /// <inheritdoc />
+        public override void Delete(TEntity entity, Action<TEntity> persistDeleted)
        {
-            //No-op
-        }
+            if (entity == null) throw new ArgumentNullException("entity");

-        /// <summary>
-        /// Sets the action to execute on disposal for an entity collection
-        /// </summary>
-        /// <param name="entityCollection"></param>
-        protected void SetCacheAction(TEntity[] entityCollection)
-        {
-            //set the disposal action
-            SetCacheAction(() =>
+            try
            {
-                //We want to cache the result as a single collection
-
-                if (_expires)
-                {
-                    Cache.InsertCacheItem(GetCacheTypeKey(), () => new DeepCloneableList<TEntity>(entityCollection),
-                        timeout: TimeSpan.FromMinutes(5),
-                        isSliding: true);
-                }
-                else
-                {
-                    Cache.InsertCacheItem(GetCacheTypeKey(), () => new DeepCloneableList<TEntity>(entityCollection));
-                }
-            });
+                persistDeleted(entity);
+            }
+            finally
+            {
+                ClearAll();
+            }
        }

-        /// <summary>
-        /// Looks up the zero count cache, must return null if it doesn't exist
-        /// </summary>
-        /// <returns></returns>
-        protected bool HasZeroCountCache()
+        /// <inheritdoc />
+        public override TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll)
        {
-            if (_hasZeroCountCache.HasValue)
-                return _hasZeroCountCache.Value;
+            // get all from the cache, then look for the entity
+            var all = GetAllCached(performGetAll);
+            var entity = all.FirstOrDefault(x => _entityGetId(x).Equals(id));

-            _hasZeroCountCache = Cache.GetCacheItem<DeepCloneableList<TEntity>>(GetCacheTypeKey()) != null;
-            return _hasZeroCountCache.Value;
+            // see note in InsertEntities - what we get here is the original
+            // cached entity, not a clone, so we need to manually ensure it is deep-cloned.
+            return entity == null ? null : (TEntity) entity.DeepClone();
        }

-        /// <summary>
-        /// This policy will cache the full data set as a single collection
-        /// </summary>
-        /// <returns></returns>
-        protected TEntity[] GetAllFromCache()
+        /// <inheritdoc />
+        public override TEntity GetCached(TId id)
        {
-            var found = Cache.GetCacheItem<DeepCloneableList<TEntity>>(GetCacheTypeKey());
+            // get all from the cache -- and only the cache, then look for the entity
+            var all = Cache.GetCacheItem<DeepCloneableList<TEntity>>(GetEntityTypeCacheKey());
+            var entity = all == null ? null : all.FirstOrDefault(x => _entityGetId(x).Equals(id));

-            //This method will get called before checking for zero count cache, so we'll just set the flag here
-            _hasZeroCountCache = found != null;
-
-            return found == null ? new TEntity[] { } : found.WhereNotNull().ToArray();
+            // see note in InsertEntities - what we get here is the original
+            // cached entity, not a clone, so we need to manually ensure it is deep-cloned.
+            return entity == null ? null : (TEntity)entity.DeepClone();
        }

+        /// <inheritdoc />
+        public override bool Exists(TId id, Func<TId, bool> performExits, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            // get all as one set, then look for the entity
+            var all = GetAllCached(performGetAll);
+            return all.Any(x => _entityGetId(x).Equals(id));
+        }
+
+        /// <inheritdoc />
+        public override TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            // get all as one set, from cache if possible, else repo
+            var all = GetAllCached(performGetAll);
+
+            // if ids have been specified, filter
+            if (ids.Length > 0) all = all.Where(x => ids.Contains(_entityGetId(x)));
+
+            // and return
+            // see note in SetCacheActionToInsertEntities - what we get here is the original
+            // cached entities, not clones, so we need to manually ensure they are deep-cloned.
+            return all.Select(x => (TEntity) x.DeepClone()).ToArray();
+        }
+
+        // does NOT clone anything, so be nice with the returned values
+        private IEnumerable<TEntity> GetAllCached(Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            // try the cache first
+            var all = Cache.GetCacheItem<DeepCloneableList<TEntity>>(GetEntityTypeCacheKey());
+            if (all != null) return all.ToArray();
+
+            // else get from repo and cache
+            var entities = performGetAll(EmptyIds).WhereNotNull().ToArray();
+            InsertEntities(entities); // may be an empty array...
+            return entities;
+        }
+
+        /// <inheritdoc />
+        public override void ClearAll()
+        {
+            Cache.ClearCacheItem(GetEntityTypeCacheKey());
+        }
    }
 }
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Creates cache policies
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="TId"></typeparam>
-    internal class FullDataSetRepositoryCachePolicyFactory<TEntity, TId> : IRepositoryCachePolicyFactory<TEntity, TId>
-        where TEntity : class, IAggregateRoot
-    {
-        private readonly IRuntimeCacheProvider _runtimeCache;
-        private readonly Func<TEntity, TId> _getEntityId;
-        private readonly Func<IEnumerable<TEntity>> _getAllFromRepo;
-        private readonly bool _expires;
-
-        public FullDataSetRepositoryCachePolicyFactory(IRuntimeCacheProvider runtimeCache, Func<TEntity, TId> getEntityId, Func<IEnumerable<TEntity>> getAllFromRepo, bool expires)
-        {
-            _runtimeCache = runtimeCache;
-            _getEntityId = getEntityId;
-            _getAllFromRepo = getAllFromRepo;
-            _expires = expires;
-        }
-
-        public virtual IRepositoryCachePolicy<TEntity, TId> CreatePolicy()
-        {
-            return new FullDataSetRepositoryCachePolicy<TEntity, TId>(_runtimeCache, _getEntityId, _getAllFromRepo, _expires);
-        }
-    }
-}
@@ -1,18 +1,97 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Scoping;

 namespace Umbraco.Core.Cache
 {
-    internal interface IRepositoryCachePolicy<TEntity, TId> : IDisposable
+    internal interface IRepositoryCachePolicy<TEntity, TId>
        where TEntity : class, IAggregateRoot
    {
-        TEntity Get(TId id, Func<TId, TEntity> getFromRepo);
-        TEntity Get(TId id);
-        bool Exists(TId id, Func<TId, bool> getFromRepo);
-        
-        void CreateOrUpdate(TEntity entity, Action<TEntity> persistMethod);
-        void Remove(TEntity entity, Action<TEntity> persistMethod);
-        TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> getFromRepo);
+        // note:
+        // at the moment each repository instance creates its corresponding cache policy instance
+        // we could reduce allocations by using static cache policy instances but then we would need
+        // to modify all methods here to pass the repository and cache eg:
+        //
+        // TEntity Get(TRepository repository, IRuntimeCacheProvider cache, TId id);
+        //
+        // it is not *that* complicated but then RepositoryBase needs to have a TRepository generic
+        // type parameter and it all becomes convoluted - keeping it simple for the time being.
+
+        /// <summary>
+        /// Creates a scoped version of this cache policy.
+        /// </summary>
+        /// <param name="runtimeCache">The global isolated runtime cache for this policy.</param>
+        /// <param name="scope">The scope.</param>
+        /// <remarks>When a policy is scoped, it means that it has been created with a scoped
+        /// isolated runtime cache, and now it needs to be wrapped into something that can apply
+        /// changes to the global isolated runtime cache.</remarks>
+        IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope);
+
+        /// <summary>
+        /// Gets an entity from the cache, else from the repository.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <param name="performGet">The repository PerformGet method.</param>
+        /// <param name="performGetAll">The repository PerformGetAll method.</param>
+        /// <returns>The entity with the specified identifier, if it exits, else null.</returns>
+        /// <remarks>First considers the cache then the repository.</remarks>
+        TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll);
+
+        /// <summary>
+        /// Gets an entity from the cache.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>The entity with the specified identifier, if it is in the cache already, else null.</returns>
+        /// <remarks>Does not consider the repository at all.</remarks>
+        TEntity GetCached(TId id);
+
+        /// <summary>
+        /// Gets a value indicating whether an entity with a specified identifier exists.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <param name="performExists">The repository PerformExists method.</param>
+        /// <param name="performGetAll">The repository PerformGetAll method.</param>
+        /// <returns>A value indicating whether an entity with the specified identifier exists.</returns>
+        /// <remarks>First considers the cache then the repository.</remarks>
+        bool Exists(TId id, Func<TId, bool> performExists, Func<TId[], IEnumerable<TEntity>> performGetAll);
+
+        /// <summary>
+        /// Creates an entity.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <param name="persistNew">The repository PersistNewItem method.</param>
+        /// <remarks>Creates the entity in the repository, and updates the cache accordingly.</remarks>
+        void Create(TEntity entity, Action<TEntity> persistNew);
+
+        /// <summary>
+        /// Updates an entity.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <param name="persistUpdated">The reopsitory PersistUpdatedItem method.</param>
+        /// <remarks>Updates the entity in the repository, and updates the cache accordingly.</remarks>
+        void Update(TEntity entity, Action<TEntity> persistUpdated);
+
+        /// <summary>
+        /// Removes an entity.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <param name="persistDeleted">The repository PersistDeletedItem method.</param>
+        /// <remarks>Removes the entity from the repository and clears the cache.</remarks>
+        void Delete(TEntity entity, Action<TEntity> persistDeleted);
+
+        /// <summary>
+        /// Gets entities.
+        /// </summary>
+        /// <param name="ids">The identifiers.</param>
+        /// <param name="performGetAll">The repository PerformGetAll method.</param>
+        /// <returns>If <paramref name="ids"/> is empty, all entities, else the entities with the specified identifiers.</returns>
+        /// <remarks>Get all the entities. Either from the cache or the repository depending on the implementation.</remarks>
+        TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> performGetAll);
+
+        /// <summary>
+        /// Clears the entire cache.
+        /// </summary>
+        void ClearAll();
    }
 }
@@ -1,9 +0,0 @@
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Cache
-{
-    internal interface IRepositoryCachePolicyFactory<TEntity, TId> where TEntity : class, IAggregateRoot
-    {
-        IRepositoryCachePolicy<TEntity, TId> CreatePolicy();
-    }
-}
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Scoping;
+
+namespace Umbraco.Core.Cache
+{
+    internal class NoRepositoryCachePolicy<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId> 
+        where TEntity : class, IAggregateRoot
+    {
+        private static readonly NoRepositoryCachePolicy<TEntity, TId> StaticInstance = new NoRepositoryCachePolicy<TEntity, TId>();
+
+        private NoRepositoryCachePolicy()
+        { }
+
+        public static NoRepositoryCachePolicy<TEntity, TId> Instance { get { return StaticInstance; } }
+
+        public IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
+        {
+            throw new NotImplementedException();
+        }
+
+        public TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            return performGet(id);
+        }
+
+        public TEntity GetCached(TId id)
+        {
+            return null;
+        }
+
+        public bool Exists(TId id, Func<TId, bool> performExists, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            return performExists(id);
+        }
+
+        public void Create(TEntity entity, Action<TEntity> persistNew)
+        {
+            persistNew(entity);
+        }
+
+        public void Update(TEntity entity, Action<TEntity> persistUpdated)
+        {
+            persistUpdated(entity);
+        }
+
+        public void Delete(TEntity entity, Action<TEntity> persistDeleted)
+        {
+            persistDeleted(entity);
+        }
+
+        public TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            return performGetAll(ids).ToArray();
+        }
+
+        public void ClearAll()
+        { }
+    }
+}
@@ -1,27 +0,0 @@
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Creates cache policies
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="TId"></typeparam>
-    internal class OnlySingleItemsRepositoryCachePolicyFactory<TEntity, TId> : IRepositoryCachePolicyFactory<TEntity, TId>
-        where TEntity : class, IAggregateRoot
-    {
-        private readonly IRuntimeCacheProvider _runtimeCache;
-        private readonly RepositoryCachePolicyOptions _options;
-
-        public OnlySingleItemsRepositoryCachePolicyFactory(IRuntimeCacheProvider runtimeCache, RepositoryCachePolicyOptions options)
-        {
-            _runtimeCache = runtimeCache;
-            _options = options;
-        }
-
-        public virtual IRepositoryCachePolicy<TEntity, TId> CreatePolicy()
-        {
-            return new SingleItemsOnlyRepositoryCachePolicy<TEntity, TId>(_runtimeCache, _options);
-        }
-    }
-}
@@ -1,48 +1,51 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Scoping;

 namespace Umbraco.Core.Cache
 {
-    internal abstract class RepositoryCachePolicyBase<TEntity, TId> : DisposableObject, IRepositoryCachePolicy<TEntity, TId>
+    /// <summary>
+    /// A base class for repository cache policies.
+    /// </summary>
+    /// <typeparam name="TEntity">The type of the entity.</typeparam>
+    /// <typeparam name="TId">The type of the identifier.</typeparam>
+    internal abstract class RepositoryCachePolicyBase<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
        where TEntity : class, IAggregateRoot
    {
-        private Action _action;
-
        protected RepositoryCachePolicyBase(IRuntimeCacheProvider cache)
        {
-            if (cache == null) throw new ArgumentNullException("cache");
-            
+            if (cache == null) throw new ArgumentNullException("cache");            
            Cache = cache;
        }

+        public abstract IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope);
+
        protected IRuntimeCacheProvider Cache { get; private set; }

-        /// <summary>
-        /// The disposal performs the caching
-        /// </summary>
-        protected override void DisposeResources()
-        {
-            if (_action != null)
-            {
-                _action();
-            }
-        }
+        /// <inheritdoc />
+        public abstract TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll);

-        /// <summary>
-        /// Sets the action to execute on disposal
-        /// </summary>
-        /// <param name="action"></param>
-        protected void SetCacheAction(Action action)
-        {
-            _action = action;
-        }
+        /// <inheritdoc />
+        public abstract TEntity GetCached(TId id);
+
+        /// <inheritdoc />
+        public abstract bool Exists(TId id, Func<TId, bool> performExists, Func<TId[], IEnumerable<TEntity>> performGetAll);
+
+        /// <inheritdoc />
+        public abstract void Create(TEntity entity, Action<TEntity> persistNew);
+
+        /// <inheritdoc />
+        public abstract void Update(TEntity entity, Action<TEntity> persistUpdated);
+
+        /// <inheritdoc />
+        public abstract void Delete(TEntity entity, Action<TEntity> persistDeleted);
+
+        /// <inheritdoc />
+        public abstract TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> performGetAll);
+
+        /// <inheritdoc />
+        public abstract void ClearAll();

-        public abstract TEntity Get(TId id, Func<TId, TEntity> getFromRepo);
-        public abstract TEntity Get(TId id);
-        public abstract bool Exists(TId id, Func<TId, bool> getFromRepo);
-        public abstract void CreateOrUpdate(TEntity entity, Action<TEntity> persistMethod);
-        public abstract void Remove(TEntity entity, Action<TEntity> persistMethod);
-        public abstract TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> getFromRepo);
    }
 }
@@ -2,6 +2,9 @@ using System;

 namespace Umbraco.Core.Cache
 {
+    /// <summary>
+    /// Specifies how a repository cache policy should cache entities.
+    /// </summary>
    internal class RepositoryCachePolicyOptions
    {
        /// <summary>
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Scoping;
+
+namespace Umbraco.Core.Cache
+{
+    internal class ScopedRepositoryCachePolicy<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
+        where TEntity : class, IAggregateRoot
+    {
+        private readonly IRepositoryCachePolicy<TEntity, TId> _cachePolicy;
+        private readonly IRuntimeCacheProvider _globalIsolatedCache;
+        private readonly IScope _scope;
+
+        public ScopedRepositoryCachePolicy(IRepositoryCachePolicy<TEntity, TId> cachePolicy, IRuntimeCacheProvider globalIsolatedCache, IScope scope)
+        {
+            _cachePolicy = cachePolicy;
+            _globalIsolatedCache = globalIsolatedCache;
+            _scope = scope;
+        }
+
+        public IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
+        {
+            throw new InvalidOperationException(); // obviously
+        }
+
+        public TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            // loads into the local cache only, ok for now
+            return _cachePolicy.Get(id, performGet, performGetAll);
+        }
+
+        public TEntity GetCached(TId id)
+        {
+            // loads into the local cache only, ok for now
+            return _cachePolicy.GetCached(id);
+        }
+
+        public bool Exists(TId id, Func<TId, bool> performExists, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            // loads into the local cache only, ok for now
+            return _cachePolicy.Exists(id, performExists, performGetAll);
+        }
+
+        public void Create(TEntity entity, Action<TEntity> persistNew)
+        {
+            // writes into the local cache
+            _cachePolicy.Create(entity, persistNew);
+        }
+
+        public void Update(TEntity entity, Action<TEntity> persistUpdated)
+        {
+            // writes into the local cache
+            _cachePolicy.Update(entity, persistUpdated);
+        }
+
+        public void Delete(TEntity entity, Action<TEntity> persistDeleted)
+        {
+            // deletes the local cache
+            _cachePolicy.Delete(entity, persistDeleted);
+        }
+
+        public TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            // loads into the local cache only, ok for now
+            return _cachePolicy.GetAll(ids, performGetAll);
+        }
+
+        public void ClearAll()
+        {
+            // clears the local cache
+            _cachePolicy.ClearAll();
+        }
+    }
+}
@@ -1,24 +1,27 @@
-using System.Linq;
-using Umbraco.Core.Collections;
 using Umbraco.Core.Models.EntityBase;

 namespace Umbraco.Core.Cache
 {
    /// <summary>
-    /// A caching policy that ignores all caches for GetAll - it will only cache calls for individual items
+    /// Represents a special policy that does not cache the result of GetAll.
    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="TId"></typeparam>
+    /// <typeparam name="TEntity">The type of the entity.</typeparam>
+    /// <typeparam name="TId">The type of the identifier.</typeparam>
+    /// <remarks>
+    /// <para>Overrides the default repository cache policy and does not writes the result of GetAll
+    /// to cache, but only the result of individual Gets. It does read the cache for GetAll, though.</para>
+    /// <para>Used by DictionaryRepository.</para>
+    /// </remarks>
    internal class SingleItemsOnlyRepositoryCachePolicy<TEntity, TId> : DefaultRepositoryCachePolicy<TEntity, TId>
        where TEntity : class, IAggregateRoot
    {
-        public SingleItemsOnlyRepositoryCachePolicy(IRuntimeCacheProvider cache, RepositoryCachePolicyOptions options) : base(cache, options)
+        public SingleItemsOnlyRepositoryCachePolicy(IRuntimeCacheProvider cache, RepositoryCachePolicyOptions options)
+            : base(cache, options)
+        { }
+
+        protected override void InsertEntities(TId[] ids, TEntity[] entities)
        {
-        }
-        
-        protected override void SetCacheAction(TId[] ids, TEntity[] entityCollection)
-        {            
-            //no-op
+            // nop
        }
    }
 }
@@ -21,6 +21,10 @@ namespace Umbraco.Core
        private static readonly ICacheProvider NullRequestCache = new NullCacheProvider();
        private static readonly ICacheProvider NullStaticCache = new NullCacheProvider();
        private static readonly IRuntimeCacheProvider NullRuntimeCache = new NullCacheProvider();
+        private static readonly IsolatedRuntimeCache NullIsolatedCache = new IsolatedRuntimeCache(_ => NullRuntimeCache);
+        private static readonly CacheHelper NullCache = new CacheHelper(NullRuntimeCache, NullStaticCache, NullRequestCache, NullIsolatedCache);
+
+        public static CacheHelper NoCache { get { return NullCache; } }
        
        /// <summary>
        /// Creates a cache helper with disabled caches
@@ -31,7 +35,10 @@ namespace Umbraco.Core
        /// </remarks>
        public static CacheHelper CreateDisabledCacheHelper()
        {
-            return new CacheHelper(NullRuntimeCache, NullStaticCache, NullRequestCache, new IsolatedRuntimeCache(t => NullRuntimeCache));
+            // do *not* return NoCache
+            // NoCache is a special instance that is detected by RepositoryBase and disables all cache policies
+            // CreateDisabledCacheHelper is used in tests to use no cache, *but* keep all cache policies
+            return new CacheHelper(NullRuntimeCache, NullStaticCache, NullRequestCache, NullIsolatedCache);
        }

 	    /// <summary>
@@ -0,0 +1,15 @@
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+    internal class UmbracoUdiTypeAttribute : Attribute
+    {
+        public string UdiType { get; private set; }
+
+        public UmbracoUdiTypeAttribute(string udiType)
+        {
+            UdiType = udiType;
+        }
+    }
+}
@@ -0,0 +1,9 @@
+namespace Umbraco.Core.Configuration
+{
+    internal enum ContentXmlStorage
+    {
+        Default,
+        AspNetTemp,
+        EnvironmentTemp
+    }
+}
@@ -0,0 +1,31 @@
+using System;
+
+namespace Umbraco.Core.Configuration
+{
+    internal static class CoreDebugExtensions
+    {
+        private static CoreDebug _coreDebug;
+
+        public static CoreDebug CoreDebug(this UmbracoConfig config)
+        {
+            return _coreDebug ?? (_coreDebug = new CoreDebug());
+        }
+    }
+
+    internal class CoreDebug
+    {
+        public CoreDebug()
+        {
+            var appSettings = System.Configuration.ConfigurationManager.AppSettings;
+            LogUncompletedScopes = string.Equals("true", appSettings["Umbraco.CoreDebug.LogUncompletedScopes"], StringComparison.OrdinalIgnoreCase);
+            DumpOnTimeoutThreadAbort = string.Equals("true", appSettings["Umbraco.CoreDebug.DumpOnTimeoutThreadAbort"], StringComparison.OrdinalIgnoreCase);
+        }
+
+        // when true, Scope logs the stack trace for any scope that gets disposed without being completed.
+        // this helps troubleshooting rogue scopes that we forget to complete
+        public bool LogUncompletedScopes { get; private set; }
+        // when true, the Logger creates a minidump of w3wp in ~/App_Data/MiniDump whenever it logs
+        // an error due to a ThreadAbortException that is due to a timeout.
+        public bool DumpOnTimeoutThreadAbort { get; private set; }
+    }
+}
@@ -517,12 +517,25 @@ namespace Umbraco.Core.Configuration
        }

        internal static bool ContentCacheXmlStoredInCodeGen
+        {
+            get { return ContentCacheXmlStorageLocation == ContentXmlStorage.AspNetTemp; }
+        }
+
+        internal static ContentXmlStorage ContentCacheXmlStorageLocation
        {
            get
            {
-                //defaults to false
-                return ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLUseLocalTemp") 
-                    && bool.Parse(ConfigurationManager.AppSettings["umbracoContentXMLUseLocalTemp"]); //default to false
+                if (ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLStorage"))
+                {
+                    return Enum<ContentXmlStorage>.Parse(ConfigurationManager.AppSettings["umbracoContentXMLStorage"]);
+                }
+                if (ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLUseLocalTemp"))
+                {
+                    return bool.Parse(ConfigurationManager.AppSettings["umbracoContentXMLUseLocalTemp"]) 
+                        ? ContentXmlStorage.AspNetTemp 
+                        : ContentXmlStorage.Default;
+                }
+                return ContentXmlStorage.Default;
            }
        }

@@ -159,6 +159,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            get { return GetOptionalTextElement("defaultDocumentTypeProperty", "Textstring"); }
        }

+        [ConfigurationProperty("showDeprecatedPropertyEditors")]
+        internal InnerTextConfigurationElement<bool> ShowDeprecatedPropertyEditors
+        {
+            get { return GetOptionalTextElement("showDeprecatedPropertyEditors", false); }
+        }
+
        [ConfigurationProperty("EnableInheritedDocumentTypes")]
        internal InnerTextConfigurationElement<bool> EnableInheritedDocumentTypes
        {
@@ -171,6 +177,18 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            get { return GetOptionalTextElement("EnableInheritedMediaTypes", true); }
        }

+        [ConfigurationProperty("EnablePropertyValueConverters")]
+        internal InnerTextConfigurationElement<bool> EnablePropertyValueConverters
+        {
+            get { return GetOptionalTextElement("EnablePropertyValueConverters", false); }
+        }
+
+        [ConfigurationProperty("loginBackgroundImage")]
+        internal InnerTextConfigurationElement<string> LoginBackgroundImage
+        {
+            get { return GetOptionalTextElement("loginBackgroundImage", string.Empty); }
+        }
+
        string IContentSection.NotificationEmailAddress
        {
            get { return Notifications.NotificationEmailAddress; }
@@ -306,6 +324,11 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            get { return DefaultDocumentTypeProperty; }
        }

+        bool IContentSection.ShowDeprecatedPropertyEditors
+        {
+            get { return ShowDeprecatedPropertyEditors; }
+        }
+
        bool IContentSection.EnableInheritedDocumentTypes
        {
            get { return EnableInheritedDocumentTypes; }
@@ -315,5 +338,14 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        {
            get { return EnableInheritedMediaTypes; }
        }
+        bool IContentSection.EnablePropertyValueConverters
+        {
+            get { return EnablePropertyValueConverters; }
+        }
+
+        string IContentSection.LoginBackgroundImage
+        {
+            get { return LoginBackgroundImage; }
+        }
    }
 }
@@ -60,8 +60,18 @@ namespace Umbraco.Core.Configuration.UmbracoSettings

        string DefaultDocumentTypeProperty { get; }

+        /// <summary>
+        /// The default for this is false but if you would like deprecated property editors displayed 
+        /// in the data type editor you can enable this
+        /// </summary>
+        bool ShowDeprecatedPropertyEditors { get; }
+
        bool EnableInheritedDocumentTypes { get; }

        bool EnableInheritedMediaTypes { get; }
+
+        bool EnablePropertyValueConverters { get; }
+
+        string LoginBackgroundImage { get; }
    }
 }
@@ -24,7 +24,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 "alpha056"; } }
+        public static string CurrentComment { get { return "RC2"; } }

        // 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
@@ -89,6 +89,11 @@ namespace Umbraco.Core
            /// </summary>
            public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C";

+            /// <summary>
+            /// Guid for a Document object.
+            /// </summary>
+            public static readonly Guid MediaGuid = new Guid(Media);
+
            /// <summary>
            /// Guid for the Media Recycle Bin.
            /// </summary>
@@ -109,11 +114,21 @@ namespace Umbraco.Core
            /// </summary>
            public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560";

+            /// <summary>
+            /// Guid for a Media Type object.
+            /// </summary>
+            public static readonly Guid MemberGuid = new Guid(Member);
+
            /// <summary>
            /// Guid for a Member Group object.
            /// </summary>
            public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";

+            /// <summary>
+            /// Guid for a Member Group object.
+            /// </summary>
+            public static readonly Guid MemberGroupGuid = new Guid(MemberGroup);
+
            /// <summary>
            /// Guid for a Member Type object.
            /// </summary>
@@ -143,6 +158,11 @@ namespace Umbraco.Core
            /// </summary>
            public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D";

+            /// <summary>
+            /// Guid for a Template object.
+            /// </summary>
+            public static readonly Guid TemplateTypeGuid = new Guid(Template);
+
            /// <summary>
            /// Guid for a Lock object.
            /// </summary>
@@ -174,24 +194,24 @@ namespace Umbraco.Core
            public static readonly Guid FormsFormGuid = new Guid(FormsForm);

            /// <summary>
-            /// Guid for a Forms Workflow.
+            /// Guid for a Forms PreValue Source.
            /// </summary>
-            public const string FormsWorkflow = "42D7BF9B-A362-4FEE-B45A-674D5C064B70";
+            public const string FormsPreValue = "42D7BF9B-A362-4FEE-B45A-674D5C064B70";

            /// <summary>
-            /// Guid for a Forms Workflow.
+            /// Guid for a Forms PreValue Source.
            /// </summary>
-            public static readonly Guid FormsWorkflowGuid = new Guid(FormsWorkflow);
+            public static readonly Guid FormsPreValueGuid = new Guid(FormsPreValue);

            /// <summary>
-            /// Guid for a Forms Record.
+            /// Guid for a Forms DataSource.
            /// </summary>
-            public const string FormsRecord = "CFED6CE4-9359-443E-9977-9956FEB1D867";
+            public const string FormsDataSource = "CFED6CE4-9359-443E-9977-9956FEB1D867";

            /// <summary>
-            /// Guid for a Forms Record.
+            /// Guid for a Forms DataSource.
            /// </summary>
-            public static readonly Guid FormsRecordGuid = new Guid(FormsRecord);
+            public static readonly Guid FormsDataSourceGuid = new Guid(FormsDataSource);
        }
    }
 }
@@ -42,10 +42,14 @@ namespace Umbraco.Core
            [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
            public const string ContentPicker = "158AA029-24ED-4948-939E-C3DA209E5FBA";

+            
+            [Obsolete("This is an obsoleted content picker, use ContentPicker2Alias instead")]
+            public const string ContentPickerAlias = "Umbraco.ContentPickerAlias";
+
            /// <summary>
            /// Alias for the Content Picker datatype.
            /// </summary>
-            public const string ContentPickerAlias = "Umbraco.ContentPickerAlias";
+            public const string ContentPicker2Alias = "Umbraco.ContentPicker2";

            /// <summary>
            /// Guid for the Date datatype.
@@ -192,11 +196,15 @@ namespace Umbraco.Core
            [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
            public const string MediaPicker = "EAD69342-F06D-4253-83AC-28000225583B";

+            [Obsolete("This is an obsoleted picker, use MediaPicker2Alias instead")]
+            public const string MediaPickerAlias = "Umbraco.MediaPicker";
+
            /// <summary>
            /// Alias for the Media Picker datatype.
            /// </summary>
-            public const string MediaPickerAlias = "Umbraco.MediaPicker";
+            public const string MediaPicker2Alias = "Umbraco.MediaPicker2";

+            [Obsolete("This is an obsoleted picker, use MediaPicker2Alias instead")]
            public const string MultipleMediaPickerAlias = "Umbraco.MultipleMediaPicker";

            /// <summary>
@@ -205,26 +213,32 @@ namespace Umbraco.Core
            [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
            public const string MemberPicker = "39F533E4-0551-4505-A64B-E0425C5CE775";

+            [Obsolete("This is an obsoleted picker, use MemberPicker2Alias instead")]
+            public const string MemberPickerAlias = "Umbraco.MemberPicker";
+
            /// <summary>
            /// Alias for the Member Picker datatype.
            /// </summary>
-            public const string MemberPickerAlias = "Umbraco.MemberPicker";
+            public const string MemberPicker2Alias = "Umbraco.MemberPicker2";

            /// <summary>
            /// Alias for the Member Group Picker datatype.
            /// </summary>
            public const string MemberGroupPickerAlias = "Umbraco.MemberGroupPicker";
-
+            
            /// <summary>
            /// Guid for the Multi-Node Tree Picker datatype
            /// </summary>
            [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
            public const string MultiNodeTreePicker = "7E062C13-7C41-4AD9-B389-41D88AEEF87C";

+            [Obsolete("This is an obsoleted picker, use MultiNodeTreePicker2Alias instead")]
+            public const string MultiNodeTreePickerAlias = "Umbraco.MultiNodeTreePicker";
+
            /// <summary>
            /// Alias for the Multi-Node Tree Picker datatype
            /// </summary>
-            public const string MultiNodeTreePickerAlias = "Umbraco.MultiNodeTreePicker";
+            public const string MultiNodeTreePicker2Alias = "Umbraco.MultiNodeTreePicker2";

            /// <summary>
            /// Guid for the Multiple Textstring datatype.
@@ -275,11 +289,14 @@ namespace Umbraco.Core
            /// </summary>
            [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
            public const string RelatedLinks = "71B8AD1A-8DC2-425C-B6B8-FAA158075E63";
+            
+            [Obsolete("This is an obsoleted picker, use RelatedLinks2Alias instead")]
+            public const string RelatedLinksAlias = "Umbraco.RelatedLinks";

            /// <summary>
-            /// Alias for the Related Links datatype.
+            /// Alias for the Related Links property editor.
            /// </summary>
-            public const string RelatedLinksAlias = "Umbraco.RelatedLinks";
+            public const string RelatedLinks2Alias = "Umbraco.RelatedLinks2";

            /// <summary>
            /// Guid for the Slider datatype.
@@ -28,6 +28,7 @@ using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Publishing;
 using Umbraco.Core.Macros;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 using Umbraco.Core.Strings;
@@ -108,8 +109,11 @@ namespace Umbraco.Core
            var dbFactory = new DefaultDatabaseFactory(Constants.System.UmbracoConnectionName, ProfilingLogger.Logger);
            Database.Mapper = new PetaPocoMapper();

+            var scopeProvider = new ScopeProvider(dbFactory);
+            dbFactory.ScopeProvider = scopeProvider;
+
            var dbContext = new DatabaseContext(
-                dbFactory,
+                scopeProvider,
                ProfilingLogger.Logger,
                SqlSyntaxProviders.CreateDefault(ProfilingLogger.Logger));

@@ -117,7 +121,7 @@ namespace Umbraco.Core
            dbContext.Initialize();

            //get the service context
-            var serviceContext = CreateServiceContext(dbContext, dbFactory);
+            var serviceContext = CreateServiceContext(dbContext, scopeProvider);

            //set property and singleton from response
            ApplicationContext.Current = ApplicationContext = CreateApplicationContext(dbContext, serviceContext);
@@ -160,17 +164,15 @@ namespace Umbraco.Core
        /// Creates and returns the service context for the app
        /// </summary>
        /// <param name="dbContext"></param>
-        /// <param name="dbFactory"></param>
+        /// <param name="scopeProvider"></param>
        /// <returns></returns>
-        protected virtual ServiceContext CreateServiceContext(DatabaseContext dbContext, IDatabaseFactory dbFactory)
+        protected virtual ServiceContext CreateServiceContext(DatabaseContext dbContext, IScopeProvider scopeProvider)
        {
            //default transient factory
            var msgFactory = new TransientMessagesFactory();
            return new ServiceContext(
                new RepositoryFactory(ApplicationCache, ProfilingLogger.Logger, dbContext.SqlSyntax, UmbracoConfig.For.UmbracoSettings()),
-                new PetaPocoUnitOfWorkProvider(dbFactory),
-                new FileUnitOfWorkProvider(),
-                new PublishingStrategy(msgFactory, ProfilingLogger.Logger),
+                new PetaPocoUnitOfWorkProvider(scopeProvider),
                ApplicationCache,
                ProfilingLogger.Logger,
                msgFactory);
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.Data.SqlServerCe;
 using System.IO;
@@ -14,6 +13,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Persistence.Migrations.Initial;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;

 namespace Umbraco.Core
@@ -26,20 +26,33 @@ namespace Umbraco.Core
    /// </remarks>
    public class DatabaseContext
    {
-        private readonly IDatabaseFactory _factory;
+        internal readonly IScopeProviderInternal ScopeProvider;
        private readonly ILogger _logger;
        private readonly SqlSyntaxProviders _syntaxProviders;
        private bool _configured;
        private string _connectionString;
        private string _providerName;
        private DatabaseSchemaResult _result;
-        private DateTime? _connectionLastChecked = null;
+        private DateTime? _connectionLastChecked;

        /// <summary>
        /// The number of minutes to throttle the checks to CanConnect
        /// </summary>
        private const int ConnectionCheckMinutes = 1;

+        #region Compatibility with 7.5
+
+        // note: the ctors accepting IDatabaseFactory are here only for backward compatibility purpose
+        //
+        // problem: IDatabaseFactory2 adds the CreateNewDatabase() method which creates a new database
+        // 'cos IDatabaseFactory CreateDatabase() is supposed to also manage the ambient thing. We
+        // want to keep these ctors for backward compatibility reasons (in case ppl use them in tests)
+        // so we need to create a scope provider (else nothing would work) and so we need a IDatabaseFactory2,
+        // so...?
+        // solution: wrap IDatabaseFactory and pretend we have a IDatabaseFactory2, it *should* work in most
+        // cases but really, it depends on what ppl are doing in their tests... yet, cannot really see any
+        // other way to do it?
+
        [Obsolete("Use the constructor specifying all dependencies instead")]
        public DatabaseContext(IDatabaseFactory factory)
            : this(factory, LoggerResolver.Current.Logger, new SqlSyntaxProviders(new ISqlSyntaxProvider[]
@@ -48,8 +61,7 @@ namespace Umbraco.Core
                new SqlCeSyntaxProvider(),
                new SqlServerSyntaxProvider()
            }))
-        {
-        }
+        { }

        /// <summary>
        /// Default constructor
@@ -63,7 +75,11 @@ namespace Umbraco.Core
            if (logger == null) throw new ArgumentNullException("logger");
            if (syntaxProviders == null) throw new ArgumentNullException("syntaxProviders");

-            _factory = factory;
+            var asDbFactory2 = factory as IDatabaseFactory2;
+            ScopeProvider = asDbFactory2 == null
+                ? new ScopeProvider(new DatabaseFactoryWrapper(factory))
+                : new ScopeProvider(asDbFactory2);
+
            _logger = logger;
            _syntaxProviders = syntaxProviders;
        }
@@ -80,22 +96,86 @@ namespace Umbraco.Core
            _providerName = providerName;
            SqlSyntax = sqlSyntax;
            SqlSyntaxContext.SqlSyntaxProvider = SqlSyntax;
-            _factory = factory;
+
+            var asDbFactory2 = factory as IDatabaseFactory2;
+            ScopeProvider = asDbFactory2 == null
+                ? new ScopeProvider(new DatabaseFactoryWrapper(factory))
+                : new ScopeProvider(asDbFactory2);
+
            _logger = logger;
            _configured = true;
        }

-#if DEBUG_DATABASES
-        public List<UmbracoDatabase> Databases
+        private class DatabaseFactoryWrapper : IDatabaseFactory2
        {
-            get
+            private readonly IDatabaseFactory _factory;
+
+            public DatabaseFactoryWrapper(IDatabaseFactory factory)
            {
-                var factory = _factory as DefaultDatabaseFactory;
-                if (factory == null) throw new NotSupportedException();
-                return factory.Databases;
+                _factory = factory;
+            }
+
+            public UmbracoDatabase CreateDatabase()
+            {
+                return _factory.CreateDatabase();
+            }
+
+            public UmbracoDatabase CreateNewDatabase()
+            {
+                return CreateDatabase();
+            }
+
+            public void Dispose()
+            {
+                _factory.Dispose();
            }
        }
-#endif
+
+        #endregion
+
+        [Obsolete("Use the constructor specifying all dependencies instead")]
+        internal DatabaseContext(IScopeProviderInternal scopeProvider)
+            : this(scopeProvider, LoggerResolver.Current.Logger, new SqlSyntaxProviders(new ISqlSyntaxProvider[]
+            {
+                new MySqlSyntaxProvider(LoggerResolver.Current.Logger),
+                new SqlCeSyntaxProvider(),
+                new SqlServerSyntaxProvider()
+            }))
+        { }
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="scopeProvider"></param>
+        /// <param name="logger"></param>
+        /// <param name="syntaxProviders"></param>
+        internal DatabaseContext(IScopeProviderInternal scopeProvider, ILogger logger, SqlSyntaxProviders syntaxProviders)
+        {
+            if (scopeProvider == null) throw new ArgumentNullException("scopeProvider");
+            if (logger == null) throw new ArgumentNullException("logger");
+            if (syntaxProviders == null) throw new ArgumentNullException("syntaxProviders");
+
+            ScopeProvider = scopeProvider;
+            _logger = logger;
+            _syntaxProviders = syntaxProviders;
+        }
+
+        /// <summary>
+        /// Create a configured DatabaseContext
+        /// </summary>
+        /// <param name="scopeProvider"></param>
+        /// <param name="logger"></param>
+        /// <param name="sqlSyntax"></param>
+        /// <param name="providerName"></param>
+        internal DatabaseContext(IScopeProviderInternal scopeProvider, ILogger logger, ISqlSyntaxProvider sqlSyntax, string providerName)
+        {
+            _providerName = providerName;
+            SqlSyntax = sqlSyntax;
+            SqlSyntaxContext.SqlSyntaxProvider = SqlSyntax;
+            ScopeProvider = scopeProvider;
+            _logger = logger;
+            _configured = true;
+        }

        public ISqlSyntaxProvider SqlSyntax { get; private set; }

@@ -110,33 +190,17 @@ namespace Umbraco.Core
        /// </remarks>
        public virtual UmbracoDatabase Database
        {
-            get { return _factory.CreateDatabase(); }
-        }
-
-        /// <summary>
-        /// Replaces the "ambient" database (if any) and by a new temp database.
-        /// </summary>
-        /// <remarks>
-        /// <para>The returned IDisposable *must* be diposed in order to properly dispose the temp database and
-        /// restore the original "ambient" database (if any).</para>
-        /// <para>This is to be used in background tasks to ensure that they have an "ambient" database which
-        /// will be properly removed from call context and does not interfere with anything else. In most case
-        /// it is not replacing anything, just temporarily installing a database in context.</para>
-        /// </remarks>
-        public virtual IDisposable UseSafeDatabase(bool force = false)
-        {
-            var factory = _factory as DefaultDatabaseFactory;
-            if (factory == null) throw new NotSupportedException();
-
-            if (DefaultDatabaseFactory.HasAmbientDatabase)
+            get
            {
-                return force
-                    ? new UsingDatabase(DefaultDatabaseFactory.DetachAmbientDatabase(), factory.CreateDatabase())
-                    : new UsingDatabase(null, null);
-            }
+            	if (IsDatabaseConfigured == false)
+                {
+                    throw new InvalidOperationException("Cannot create a database instance, there is no available connection string");
+                }

-            // create a new, temp, database (will be disposed with UsingDatabase)
-            return new UsingDatabase(null, factory.CreateDatabase());
+                return ScopeProvider.GetAmbientOrNoScope().Database;
+                //var scope = ScopeProvider.AmbientScope;
+                //return scope != null ? scope.Database : ScopeProvider.CreateNoScope().Database;
+            }
        }

        /// <summary>
@@ -159,7 +223,7 @@ namespace Umbraco.Core

                //Don't check again if the timeout period hasn't elapsed
                //this ensures we don't keep checking the connection too many times in a row like during startup.
-                //Do check if the _connectionLastChecked is null which means we're just initializing or it could 
+                //Do check if the _connectionLastChecked is null which means we're just initializing or it could
                //not connect last time it was checked.
                if ((_connectionLastChecked.HasValue && (DateTime.Now - _connectionLastChecked.Value).TotalMinutes > ConnectionCheckMinutes)
                    || _connectionLastChecked.HasValue == false)
@@ -202,7 +266,7 @@ namespace Umbraco.Core
                }
                else
                {
-                    throw new InvalidOperationException("Can't find a connection string with the name '" + Constants.System.UmbracoConnectionName + "'");
+                    throw new NullReferenceException("Can't find a connection string with the name '" + Constants.System.UmbracoConnectionName + "'");
                }
                return _providerName;
            }
@@ -809,6 +873,7 @@ namespace Umbraco.Core
            return true;
        }

+        /*
        private class UsingDatabase : IDisposable
        {
            private readonly UmbracoDatabase _orig;
@@ -831,5 +896,6 @@ namespace Umbraco.Core
                GC.SuppressFinalize(this);
            }
        }
+        */
    }
 }
@@ -16,6 +16,7 @@ namespace Umbraco.Core.Deploy
            if (udi == null)
                throw new ArgumentNullException("udi");
            Udi = udi;
+            Name = Udi.ToString();

            Dependencies = dependencies ?? Enumerable.Empty<ArtifactDependency>();
            _checksum = new Lazy<string>(GetChecksum);
@@ -48,5 +49,8 @@ namespace Umbraco.Core.Deploy
        }

        #endregion
+
+        public string Name { get; set; }
+        public string Alias { get; set; }
    }
 }
@@ -4,5 +4,8 @@ namespace Umbraco.Core.Deploy
    /// Represents an artifact ie an object that can be transfered between environments.
    /// </summary>
    public interface IArtifact : IArtifactSignature
-    { }
+    {
+        string Name { get; }
+        string Alias { get; }
+    }
 }
@@ -66,10 +66,20 @@ namespace Umbraco.Core.Deploy
        /// <returns>The length of the file, or -1 if the file does not exist.</returns>
        Task<long> GetFileLengthAsync(StringUdi udi, CancellationToken token);

-        // fixme - doc
-        void GetFiles(IEnumerable<StringUdi> udis, IFileStore fileStore);
+        /// <summary>
+        /// Gets files and store them using a file store.
+        /// </summary>
+        /// <param name="udis">The udis of the files to get.</param>
+        /// <param name="fileTypes">A collection of file types which can store the files.</param>
+        void GetFiles(IEnumerable<StringUdi> udis, IFileTypeCollection fileTypes);

-        Task GetFilesAsync(IEnumerable<StringUdi> udis, IFileStore fileStore, CancellationToken token);
+        /// <summary>
+        /// Gets files and store them using a file store.
+        /// </summary>
+        /// <param name="udis">The udis of the files to get.</param>
+        /// <param name="fileTypes">A collection of file types which can store the files.</param>
+        /// <param name="token">A cancellation token.</param>
+        Task GetFilesAsync(IEnumerable<StringUdi> udis, IFileTypeCollection fileTypes, CancellationToken token);

        ///// <summary>
        ///// Gets the content of a file as a bytes array.
@@ -1,9 +0,0 @@
-using System.IO;
-
-namespace Umbraco.Core.Deploy
-{
-    public interface IFileStore
-    {
-        void SaveStream(StringUdi udi, Stream stream);
-    }
-}
@@ -0,0 +1,32 @@
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Deploy
+{
+    public interface IFileType
+    {
+        Stream GetStream(StringUdi udi);
+
+        Task<Stream> GetStreamAsync(StringUdi udi, CancellationToken token);
+
+        Stream GetChecksumStream(StringUdi udi);
+
+        long GetLength(StringUdi udi);
+
+        void SetStream(StringUdi udi, Stream stream);
+
+        Task SetStreamAsync(StringUdi udi, Stream stream, CancellationToken token);
+
+        bool CanSetPhysical { get; }
+
+        void Set(StringUdi udi, string physicalPath, bool copy = false);
+
+        // this is not pretty as *everywhere* in Deploy we take care of ignoring
+        // the physical path and always rely on Core's virtual IFileSystem but
+        // Cloud wants to add some of these files to Git and needs the path...
+        string GetPhysicalPath(StringUdi udi);
+
+        string GetVirtualPath(StringUdi udi);
+    }
+}
@@ -0,0 +1,9 @@
+namespace Umbraco.Core.Deploy
+{
+    public interface IFileTypeCollection
+    {
+        IFileType this[string entityType] { get; }
+
+        bool Contains(string entityType);
+    }
+}
@@ -1,8 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    public interface IPrettyArtifact
-    {
-        string Name { get; }
-        string Alias { get; }
-    }
-}
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using umbraco.interfaces;
 using Umbraco.Core;

 namespace Umbraco.Core.Deploy
@@ -8,7 +9,7 @@ namespace Umbraco.Core.Deploy
    /// <summary>
    /// Connects to an Umbraco service.
    /// </summary>
-    public interface IServiceConnector
+    public interface IServiceConnector : IDiscoverable
    {
        /// <summary>
        /// Gets an artifact.
@@ -0,0 +1,135 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using Umbraco.Core.IO;
+
+namespace Umbraco.Core.Diagnostics
+{
+    // taken from https://blogs.msdn.microsoft.com/dondu/2010/10/24/writing-minidumps-in-c/
+    // and https://blogs.msdn.microsoft.com/dondu/2010/10/31/writing-minidumps-from-exceptions-in-c/
+    // which itself got it from http://blog.kalmbach-software.de/2008/12/13/writing-minidumps-in-c/
+
+    internal static class MiniDump
+    {
+        private static readonly object LockO = new object();
+
+        [Flags]
+        public enum Option : uint
+        {
+            // From dbghelp.h:
+            Normal = 0x00000000,
+            WithDataSegs = 0x00000001,
+            WithFullMemory = 0x00000002,
+            WithHandleData = 0x00000004,
+            FilterMemory = 0x00000008,
+            ScanMemory = 0x00000010,
+            WithUnloadedModules = 0x00000020,
+            WithIndirectlyReferencedMemory = 0x00000040,
+            FilterModulePaths = 0x00000080,
+            WithProcessThreadData = 0x00000100,
+            WithPrivateReadWriteMemory = 0x00000200,
+            WithoutOptionalData = 0x00000400,
+            WithFullMemoryInfo = 0x00000800,
+            WithThreadInfo = 0x00001000,
+            WithCodeSegs = 0x00002000,
+            WithoutAuxiliaryState = 0x00004000,
+            WithFullAuxiliaryState = 0x00008000,
+            WithPrivateWriteCopyMemory = 0x00010000,
+            IgnoreInaccessibleMemory = 0x00020000,
+            ValidTypeFlags = 0x0003ffff,
+        }
+
+        //typedef struct _MINIDUMP_EXCEPTION_INFORMATION {
+        //    DWORD ThreadId;
+        //    PEXCEPTION_POINTERS ExceptionPointers;
+        //    BOOL ClientPointers;
+        //} MINIDUMP_EXCEPTION_INFORMATION, *PMINIDUMP_EXCEPTION_INFORMATION;
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]  // Pack=4 is important! So it works also for x64!
+        public struct MiniDumpExceptionInformation
+        {
+            public uint ThreadId;
+            public IntPtr ExceptionPointers;
+            [MarshalAs(UnmanagedType.Bool)]
+            public bool ClientPointers;
+        }
+
+        //BOOL
+        //WINAPI
+        //MiniDumpWriteDump(
+        //    __in HANDLE hProcess,
+        //    __in DWORD ProcessId,
+        //    __in HANDLE hFile,
+        //    __in MINIDUMP_TYPE DumpType,
+        //    __in_opt PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+        //    __in_opt PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+        //    __in_opt PMINIDUMP_CALLBACK_INFORMATION CallbackParam
+        //    );
+
+        // Overload requiring MiniDumpExceptionInformation
+        [DllImport("dbghelp.dll", EntryPoint = "MiniDumpWriteDump", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
+        private static extern bool MiniDumpWriteDump(IntPtr hProcess, uint processId, SafeHandle hFile, uint dumpType, ref MiniDumpExceptionInformation expParam, IntPtr userStreamParam, IntPtr callbackParam);
+
+        // Overload supporting MiniDumpExceptionInformation == NULL
+        [DllImport("dbghelp.dll", EntryPoint = "MiniDumpWriteDump", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
+        private static extern bool MiniDumpWriteDump(IntPtr hProcess, uint processId, SafeHandle hFile, uint dumpType, IntPtr expParam, IntPtr userStreamParam, IntPtr callbackParam);
+
+        [DllImport("kernel32.dll", EntryPoint = "GetCurrentThreadId", ExactSpelling = true)]
+        private static extern uint GetCurrentThreadId();
+
+        private static bool Write(SafeHandle fileHandle, Option options, bool withException = false)
+        {
+            var currentProcess = Process.GetCurrentProcess();
+            var currentProcessHandle = currentProcess.Handle;
+            var currentProcessId = (uint)currentProcess.Id;
+
+            MiniDumpExceptionInformation exp;
+
+            exp.ThreadId = GetCurrentThreadId();
+            exp.ClientPointers = false;
+            exp.ExceptionPointers = IntPtr.Zero;
+
+            if (withException)
+                exp.ExceptionPointers = Marshal.GetExceptionPointers();
+
+            var bRet = exp.ExceptionPointers == IntPtr.Zero
+                ? MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint) options, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero)
+                : MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint) options, ref exp, IntPtr.Zero, IntPtr.Zero);
+
+            return bRet;
+        }
+
+        public static bool Dump(Option options = Option.WithFullMemory, bool withException = false)
+        {
+            lock (LockO)
+            {
+                // work around "stack trace is not available while minidump debugging",
+                // by making sure a local var (that we can inspect) contains the stack trace.
+                // getting the call stack before it is unwound would require a special exception
+                // filter everywhere in our code = not!
+                var stacktrace = withException ? Environment.StackTrace : string.Empty;
+
+                var filepath = IOHelper.MapPath("~/App_Data/MiniDump");
+                if (Directory.Exists(filepath) == false)
+                    Directory.CreateDirectory(filepath);
+
+                var filename = Path.Combine(filepath, string.Format("{0:yyyyMMddTHHmmss}.{1}.dmp", DateTime.UtcNow, Guid.NewGuid().ToString("N").Substring(0, 4)));
+                using (var stream = new FileStream(filename, FileMode.Create, FileAccess.ReadWrite, FileShare.Write))
+                {
+                    return Write(stream.SafeFileHandle, options, withException);
+                }
+            }
+        }
+
+        public static bool OkToDump()
+        {
+            lock (LockO)
+            {
+                var filepath = IOHelper.MapPath("~/App_Data/MiniDump");
+                if (Directory.Exists(filepath) == false) return true;
+                var count = Directory.GetFiles(filepath, "*.dmp").Length;
+                return count < 8;
+            }
+        }
+    }
+}
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
@@ -67,22 +68,15 @@ namespace Umbraco.Core
            }
        }

-        /// <summary>The for each.</summary>
-        /// <param name="items">The items.</param>
-        /// <param name="func">The func.</param>
-        /// <typeparam name="TItem">item type</typeparam>
-        /// <typeparam name="TResult">Result type</typeparam>
-        /// <returns>the Results</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use a normal foreach loop instead, this adds more allocations than necessary")]
        public static TResult[] ForEach<TItem, TResult>(this IEnumerable<TItem> items, Func<TItem, TResult> func)
        {
            return items.Select(func).ToArray();
        }

-        /// <summary>The for each.</summary>
-        /// <param name="items">The items.</param>
-        /// <param name="action">The action.</param>
-        /// <typeparam name="TItem">Item type</typeparam>
-        /// <returns>list of TItem</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use a normal foreach loop instead, this adds more allocations than necessary")]
        public static IEnumerable<TItem> ForEach<TItem>(this IEnumerable<TItem> items, Action<TItem> action)
        {
            if (items != null)
@@ -101,6 +95,7 @@ namespace Umbraco.Core
        /// <param name="f">The select child.</param>
        /// <typeparam name="T">Item type</typeparam>
        /// <returns>list of TItem</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
        [Obsolete("Do not use, use SelectRecursive instead which has far less potential of re-iterating an iterator which may cause significantly more SQL queries")]
        public static IEnumerable<T> FlattenList<T>(this IEnumerable<T> e, Func<T, IEnumerable<T>> f)
        {
@@ -300,6 +295,5 @@ namespace Umbraco.Core
            return list1Groups.Count == list2Groups.Count
               && list1Groups.All(g => g.Count() == list2Groups[g.Key].Count());
        }
-
    }
 }
@@ -10,8 +10,8 @@ namespace Umbraco.Core.Events
 	/// Event args for that can support cancellation
 	/// </summary>
 	[HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-	public class CancellableEventArgs : EventArgs
-	{
+	public class CancellableEventArgs : EventArgs, IEquatable<CancellableEventArgs>
+    {
 		private bool _cancel;

        public CancellableEventArgs(bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
@@ -98,6 +98,36 @@ namespace Umbraco.Core.Events
        /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility 
        /// so we cannot change the strongly typed nature for some events.
        /// </remarks>
-        public ReadOnlyDictionary<string, object> AdditionalData { get; private set; } 
-    }
+        public ReadOnlyDictionary<string, object> AdditionalData { get; private set; }
+
+	    public bool Equals(CancellableEventArgs other)
+	    {
+	        if (ReferenceEquals(null, other)) return false;
+	        if (ReferenceEquals(this, other)) return true;
+	        return Equals(AdditionalData, other.AdditionalData);
+	    }
+
+	    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((CancellableEventArgs) obj);
+	    }
+
+	    public override int GetHashCode()
+	    {
+	        return (AdditionalData != null ? AdditionalData.GetHashCode() : 0);
+	    }
+
+	    public static bool operator ==(CancellableEventArgs left, CancellableEventArgs right)
+	    {
+	        return Equals(left, right);
+	    }
+
+	    public static bool operator !=(CancellableEventArgs left, CancellableEventArgs right)
+	    {
+	        return !Equals(left, right);
+	    }
+	}
 }
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Security.Permissions;
 using Umbraco.Core.Models;
@@ -10,7 +11,7 @@ namespace Umbraco.Core.Events
 	/// </summary>
 	/// <typeparam name="T"></typeparam>
 	[HostProtection(SecurityAction.LinkDemand, SharedState = true)]
-	public class CancellableObjectEventArgs<T> : CancellableEventArgs
+	public class CancellableObjectEventArgs<T> : CancellableEventArgs, IEquatable<CancellableObjectEventArgs<T>>
 	{
 	    public CancellableObjectEventArgs(T eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
            : base(canCancel, messages, additionalData)
@@ -48,5 +49,37 @@ namespace Umbraco.Core.Events
 		/// </remarks>
 		protected T EventObject { get; set; }

+	    public bool Equals(CancellableObjectEventArgs<T> other)
+	    {
+	        if (ReferenceEquals(null, other)) return false;
+	        if (ReferenceEquals(this, other)) return true;
+	        return base.Equals(other) && EqualityComparer<T>.Default.Equals(EventObject, other.EventObject);
+	    }
+
+	    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((CancellableObjectEventArgs<T>) obj);
+	    }
+
+	    public override int GetHashCode()
+	    {
+	        unchecked
+	        {
+	            return (base.GetHashCode() * 397) ^ EqualityComparer<T>.Default.GetHashCode(EventObject);
+	        }
+	    }
+
+	    public static bool operator ==(CancellableObjectEventArgs<T> left, CancellableObjectEventArgs<T> right)
+	    {
+	        return Equals(left, right);
+	    }
+
+	    public static bool operator !=(CancellableObjectEventArgs<T> left, CancellableObjectEventArgs<T> right)
+	    {
+	        return !Equals(left, right);
+	    }
 	}
 }
@@ -1,6 +1,9 @@
+using System;
+using System.Collections.Generic;
+
 namespace Umbraco.Core.Events
 {
-    public class CopyEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
+    public class CopyEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>, IEquatable<CopyEventArgs<TEntity>>
    {
        public CopyEventArgs(TEntity original, TEntity copy, bool canCancel, int parentId)
            : base(original, canCancel)
@@ -43,5 +46,42 @@ namespace Umbraco.Core.Events
        public int ParentId { get; private set; }

        public bool RelateToOriginal { get; set; }
+
+        public bool Equals(CopyEventArgs<TEntity> other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && EqualityComparer<TEntity>.Default.Equals(Copy, other.Copy) && ParentId == other.ParentId && RelateToOriginal == other.RelateToOriginal;
+        }
+
+        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((CopyEventArgs<TEntity>) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = base.GetHashCode();
+                hashCode = (hashCode * 397) ^ EqualityComparer<TEntity>.Default.GetHashCode(Copy);
+                hashCode = (hashCode * 397) ^ ParentId;
+                hashCode = (hashCode * 397) ^ RelateToOriginal.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(CopyEventArgs<TEntity> left, CopyEventArgs<TEntity> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(CopyEventArgs<TEntity> left, CopyEventArgs<TEntity> right)
+        {
+            return !Equals(left, right);
+        }
    }
 }
@@ -1,8 +1,9 @@
+using System;
 using System.Collections.Generic;

 namespace Umbraco.Core.Events
 {
-	public class DeleteEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
+    public class DeleteEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>, IEquatable<DeleteEventArgs<TEntity>>, IDeletingMediaFilesEventArgs
 	{
 	    /// <summary>
 	    /// Constructor accepting multiple entities that are used in the delete operation
@@ -99,10 +100,43 @@ namespace Umbraco.Core.Events
        /// <summary>
        /// A list of media files that can be added to during a deleted operation for which Umbraco will ensure are removed
        /// </summary>
-        public List<string> MediaFilesToDelete { get; private set; } 
+        public List<string> MediaFilesToDelete { get; private set; }
+
+	    public bool Equals(DeleteEventArgs<TEntity> other)
+	    {
+	        if (ReferenceEquals(null, other)) return false;
+	        if (ReferenceEquals(this, other)) return true;
+	        return base.Equals(other) && MediaFilesToDelete.Equals(other.MediaFilesToDelete);
+	    }
+
+	    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((DeleteEventArgs<TEntity>) obj);
+	    }
+
+	    public override int GetHashCode()
+	    {
+	        unchecked
+	        {
+	            return (base.GetHashCode() * 397) ^ MediaFilesToDelete.GetHashCode();
+	        }
+	    }
+
+	    public static bool operator ==(DeleteEventArgs<TEntity> left, DeleteEventArgs<TEntity> right)
+	    {
+	        return Equals(left, right);
+	    }
+
+	    public static bool operator !=(DeleteEventArgs<TEntity> left, DeleteEventArgs<TEntity> right)
+	    {
+	        return !Equals(left, right);
+	    }
 	}

-	public class DeleteEventArgs : CancellableEventArgs
+	public class DeleteEventArgs : CancellableEventArgs, IEquatable<DeleteEventArgs>
 	{
        public DeleteEventArgs(int id, bool canCancel, EventMessages eventMessages)
            : base(canCancel, eventMessages)
@@ -125,5 +159,38 @@ namespace Umbraco.Core.Events
 		/// Gets the Id of the object being deleted.
 		/// </summary>
 		public int Id { get; private set; }
+
+	    public bool Equals(DeleteEventArgs other)
+	    {
+	        if (ReferenceEquals(null, other)) return false;
+	        if (ReferenceEquals(this, other)) return true;
+	        return base.Equals(other) && Id == other.Id;
+	    }
+
+	    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((DeleteEventArgs) obj);
+	    }
+
+	    public override int GetHashCode()
+	    {
+	        unchecked
+	        {
+	            return (base.GetHashCode() * 397) ^ Id;
+	        }
+	    }
+
+	    public static bool operator ==(DeleteEventArgs left, DeleteEventArgs right)
+	    {
+	        return Equals(left, right);
+	    }
+
+	    public static bool operator !=(DeleteEventArgs left, DeleteEventArgs right)
+	    {
+	        return !Equals(left, right);
+	    }
 	}
 }
@@ -2,7 +2,7 @@ using System;

 namespace Umbraco.Core.Events
 {
-	public class DeleteRevisionsEventArgs : DeleteEventArgs
+	public class DeleteRevisionsEventArgs : DeleteEventArgs, IEquatable<DeleteRevisionsEventArgs>
 	{
 		public DeleteRevisionsEventArgs(int id, bool canCancel, Guid specificVersion = default(Guid), bool deletePriorVersions = false, DateTime dateToRetain = default(DateTime))
 			: base(id, canCancel)
@@ -31,5 +31,42 @@ namespace Umbraco.Core.Events
 		{
 			get { return SpecificVersion != default(Guid); }
 		}
+
+	    public bool Equals(DeleteRevisionsEventArgs other)
+	    {
+	        if (ReferenceEquals(null, other)) return false;
+	        if (ReferenceEquals(this, other)) return true;
+	        return base.Equals(other) && DateToRetain.Equals(other.DateToRetain) && DeletePriorVersions == other.DeletePriorVersions && SpecificVersion.Equals(other.SpecificVersion);
+	    }
+
+	    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((DeleteRevisionsEventArgs) obj);
+	    }
+
+	    public override int GetHashCode()
+	    {
+	        unchecked
+	        {
+	            int hashCode = base.GetHashCode();
+	            hashCode = (hashCode * 397) ^ DateToRetain.GetHashCode();
+	            hashCode = (hashCode * 397) ^ DeletePriorVersions.GetHashCode();
+	            hashCode = (hashCode * 397) ^ SpecificVersion.GetHashCode();
+	            return hashCode;
+	        }
+	    }
+
+	    public static bool operator ==(DeleteRevisionsEventArgs left, DeleteRevisionsEventArgs right)
+	    {
+	        return Equals(left, right);
+	    }
+
+	    public static bool operator !=(DeleteRevisionsEventArgs left, DeleteRevisionsEventArgs right)
+	    {
+	        return !Equals(left, right);
+	    }
 	}
 }
@@ -0,0 +1,73 @@
+using System;
+
+namespace Umbraco.Core.Events
+{
+    internal class EventDefinition : EventDefinitionBase
+    {
+        private readonly EventHandler _trackedEvent;
+        private readonly object _sender;
+        private readonly EventArgs _args;
+
+        public EventDefinition(EventHandler trackedEvent, object sender, EventArgs args, string eventName = null)
+            : base(sender, args, eventName)
+        {
+            _trackedEvent = trackedEvent;
+            _sender = sender;
+            _args = args;
+        }
+
+        public override void RaiseEvent()
+        {
+            if (_trackedEvent != null)
+            {
+                _trackedEvent(_sender, _args);
+            }
+        }
+    }
+
+    internal class EventDefinition<TEventArgs> : EventDefinitionBase
+    {
+        private readonly EventHandler<TEventArgs> _trackedEvent;
+        private readonly object _sender;
+        private readonly TEventArgs _args;
+
+        public EventDefinition(EventHandler<TEventArgs> trackedEvent, object sender, TEventArgs args, string eventName = null)
+            : base(sender, args, eventName)
+        {
+            _trackedEvent = trackedEvent;
+            _sender = sender;
+            _args = args;
+        }
+
+        public override void RaiseEvent()
+        {
+            if (_trackedEvent != null)
+            {
+                _trackedEvent(_sender, _args);
+            }
+        }
+    }
+
+    internal class EventDefinition<TSender, TEventArgs> : EventDefinitionBase
+    {
+        private readonly TypedEventHandler<TSender, TEventArgs> _trackedEvent;
+        private readonly TSender _sender;
+        private readonly TEventArgs _args;
+
+        public EventDefinition(TypedEventHandler<TSender, TEventArgs> trackedEvent, TSender sender, TEventArgs args, string eventName = null) 
+            : base(sender, args, eventName)
+        {
+            _trackedEvent = trackedEvent;
+            _sender = sender;
+            _args = args;
+        }
+
+        public override void RaiseEvent()
+        {
+            if (_trackedEvent != null)
+            {
+                _trackedEvent(_sender, _args);
+            }
+        }
+    }
+}
@@ -0,0 +1,70 @@
+using System;
+using System.Reflection;
+
+namespace Umbraco.Core.Events
+{
+    public abstract class EventDefinitionBase : IEventDefinition, IEquatable<EventDefinitionBase>
+    {
+        protected EventDefinitionBase(object sender, object args, string eventName = null)
+        {
+            if (sender == null) throw new ArgumentNullException("sender");
+            if (args == null) throw new ArgumentNullException("args");
+            Sender = sender;
+            Args = args;
+            EventName = eventName;
+
+            if (EventName.IsNullOrWhiteSpace())
+            {
+                var findResult = EventNameExtractor.FindEvent(sender, args, 
+                    //don't match "Ing" suffixed names
+                    exclude:EventNameExtractor.MatchIngNames);
+
+                if (findResult.Success == false)
+                    throw new AmbiguousMatchException("Could not automatically find the event name, the event name will need to be explicitly registered for this event definition. Error: " + findResult.Result.Error);
+                EventName = findResult.Result.Name;
+            }
+        }
+
+        public object Sender { get; private set; }
+        public object Args { get; private set; }
+        public string EventName { get; private set; }
+        
+        public abstract void RaiseEvent();
+
+        public bool Equals(EventDefinitionBase other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return Args.Equals(other.Args) && string.Equals(EventName, other.EventName) && Sender.Equals(other.Sender);
+        }
+
+        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((EventDefinitionBase) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = Args.GetHashCode();
+                hashCode = (hashCode * 397) ^ EventName.GetHashCode();
+                hashCode = (hashCode * 397) ^ Sender.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(EventDefinitionBase left, EventDefinitionBase right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(EventDefinitionBase left, EventDefinitionBase right)
+        {
+            return Equals(left, right) == false;
+        }
+    }
+}
@@ -0,0 +1,24 @@
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// The filter used in the <see cref="IEventDispatcher"/> GetEvents method which determines
+    /// how the result list is filtered
+    /// </summary>
+    public enum EventDefinitionFilter
+    {
+        /// <summary>
+        /// Returns all events tracked
+        /// </summary>
+        All,
+
+        /// <summary>
+        /// Deduplicates events and only returns the first duplicate instance tracked
+        /// </summary>
+        FirstIn,
+
+        /// <summary>
+        /// Deduplicates events and only returns the last duplicate instance tracked
+        /// </summary>
+        LastIn
+    }
+}
@@ -2,6 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
+using Umbraco.Core.Persistence.UnitOfWork;

 namespace Umbraco.Core.Events
 {
@@ -10,73 +12,40 @@ namespace Umbraco.Core.Events
 	/// </summary>
 	public static class EventExtensions
 	{
-        /// <summary>
-        /// Raises the event and returns a boolean value indicating if the event was cancelled
-        /// </summary>
-        /// <typeparam name="TSender"></typeparam>
-        /// <typeparam name="TArgs"></typeparam>
-        /// <param name="eventHandler"></param>
-        /// <param name="args"></param>
-        /// <param name="sender"></param>
-        /// <returns></returns>
-        public static bool IsRaisedEventCancelled<TSender, TArgs>(
-			this TypedEventHandler<TSender, TArgs> eventHandler,
-			TArgs args,
-			TSender sender)
-			where TArgs : CancellableEventArgs
-		{
-			if (eventHandler != null)
-				eventHandler(sender, args);
+        // keep these two for backward compatibility reasons but understand that
+        // they are *not* part of any scope / event dispatcher / anything...

+        /// <summary>
+        /// Raises a cancelable event and returns a value indicating whether the event should be cancelled.
+        /// </summary>
+        /// <typeparam name="TSender">The type of the event source.</typeparam>
+        /// <typeparam name="TArgs">The type of the event data.</typeparam>
+        /// <param name="eventHandler">The event handler.</param>
+        /// <param name="args">The event source.</param>
+        /// <param name="sender">The event data.</param>
+        /// <returns>A value indicating whether the cancelable event should be cancelled</returns>
+        /// <remarks>A cancelable event is raised by a component when it is about to perform an action that can be canceled.</remarks>
+        public static bool IsRaisedEventCancelled<TSender, TArgs>(this TypedEventHandler<TSender, TArgs> eventHandler, TArgs args, TSender sender)
+			where TArgs : CancellableEventArgs
+        {
+            if (eventHandler == null) return args.Cancel;
+			eventHandler(sender, args);
 			return args.Cancel;
 		}
-        
+
        /// <summary>
-        /// Raises the event
+        /// Raises an event.
        /// </summary>
-        /// <typeparam name="TSender"></typeparam>
-        /// <typeparam name="TArgs"></typeparam>
-        /// <param name="eventHandler"></param>
-        /// <param name="args"></param>
-        /// <param name="sender"></param>
-        public static void RaiseEvent<TSender, TArgs>(
-			this TypedEventHandler<TSender, TArgs> eventHandler,
-			TArgs args,
-			TSender sender)
-			where TArgs : EventArgs
-		{
-			if (eventHandler != null)
-				eventHandler(sender, args);
-		}
-
-        // moves the last handler that was added to an instance event, to first position
-	    public static void PromoteLastHandler(object sender, string eventName)
-	    {
-            var fieldInfo = sender.GetType().GetField(eventName, BindingFlags.Instance | BindingFlags.NonPublic);
-            if (fieldInfo == null) throw new InvalidOperationException("No event named " + eventName + ".");
-            PromoteLastHandler(sender, fieldInfo);
-        }
-
-        // moves the last handler that was added to a static event, to first position
-        public static void PromoteLastHandler<TSender>(string eventName)
+        /// <typeparam name="TSender">The type of the event source.</typeparam>
+        /// <typeparam name="TArgs">The type of the event data.</typeparam>
+        /// <param name="eventHandler">The event handler.</param>
+        /// <param name="args">The event source.</param>
+        /// <param name="sender">The event data.</param>
+        public static void RaiseEvent<TSender, TArgs>(this TypedEventHandler<TSender, TArgs> eventHandler, TArgs args, TSender sender)
+            where TArgs : EventArgs
        {
-            var fieldInfo = typeof(TSender).GetField(eventName, BindingFlags.Static | BindingFlags.NonPublic);
-            if (fieldInfo == null) throw new InvalidOperationException("No event named " + eventName + ".");
-            PromoteLastHandler(null, fieldInfo);
-        }
-
-	    private static void PromoteLastHandler(object sender, FieldInfo fieldInfo)
-	    {
-            var d = fieldInfo.GetValue(sender) as Delegate;
-	        if (d == null) return;
-
-            var l = d.GetInvocationList();
-            var x = l[l.Length - 1];
-            for (var i = l.Length - 1; i > 0; i--)
-                l[i] = l[i - 1];
-            l[0] = x;
-
-            fieldInfo.SetValue(sender, Delegate.Combine(l));
+            if (eventHandler == null) return;
+            eventHandler(sender, args);
        }
    }
 }
@@ -0,0 +1,159 @@
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// There is actually no way to discover an event name in c# at the time of raising the event. It is possible 
+    /// to get the event name from the handler that is being executed based on the event being raised, however that is not 
+    /// what we want in this case. We need to find the event name before it is being raised - you would think that it's possible
+    /// with reflection or anything but that is not the case, the delegate that defines an event has no info attached to it, it
+    /// is literally just an event.
+    /// 
+    /// So what this does is take the sender and event args objects, looks up all public/static events on the sender that have
+    /// a generic event handler with generic arguments (but only) one, then we match the type of event arguments with the ones
+    /// being passed in. As it turns out, in our services this will work for the majority of our events! In some cases it may not
+    /// work and we'll have to supply a string but hopefully this saves a bit of magic strings. 
+    /// 
+    /// We can also write tests to validate these are all working correctly for all services.
+    /// </summary>
+    internal class EventNameExtractor
+    {
+
+        /// <summary>
+        /// Finds the event name on the sender that matches the args type
+        /// </summary>
+        /// <param name="senderType"></param>
+        /// <param name="argsType"></param>
+        /// <param name="exclude">
+        /// A filter to exclude matched event names, this filter should return true to exclude the event name from being matched
+        /// </param>
+        /// <returns>
+        /// null if not found or an ambiguous match
+        /// </returns>
+        public static Attempt<EventNameExtractorResult> FindEvent(Type senderType, Type argsType, Func<string, bool> exclude)
+        {   
+            var found = MatchedEventNames.GetOrAdd(new Tuple<Type, Type>(senderType, argsType), tuple =>
+            {
+                var events = CandidateEvents.GetOrAdd(senderType, t =>
+                {
+                    return t.GetEvents(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
+                        //we can only look for events handlers with generic types because that is the only
+                        // way that we can try to find a matching event based on the arg type passed in
+                        .Where(x => x.EventHandlerType.IsGenericType)
+                        .Select(x => new EventInfoArgs(x, x.EventHandlerType.GetGenericArguments()))
+                        //we are only looking for event handlers that have more than one generic argument
+                        .Where(x =>
+                        {
+                            if (x.GenericArgs.Length == 1) return true;
+
+                            //special case for our own TypedEventHandler
+                            if (x.EventInfo.EventHandlerType.GetGenericTypeDefinition() == typeof(TypedEventHandler<,>) && x.GenericArgs.Length == 2)
+                            {
+                                return true;
+                            }
+
+                            return false;
+                        })
+                        .ToArray();
+                });
+
+                return events.Where(x =>
+                {
+                    if (x.GenericArgs.Length == 1 && x.GenericArgs[0] == tuple.Item2)
+                        return true;
+
+                    //special case for our own TypedEventHandler
+                    if (x.EventInfo.EventHandlerType.GetGenericTypeDefinition() == typeof(TypedEventHandler<,>)
+                        && x.GenericArgs.Length == 2
+                        && x.GenericArgs[1] == tuple.Item2)
+                    {
+                        return true;
+                    }
+
+                    return false;
+                }).Select(x => x.EventInfo.Name).ToArray();
+            });
+
+            var filtered = found.Where(x => exclude(x) == false).ToArray();
+
+            if (filtered.Length == 0)
+                return Attempt.Fail(new EventNameExtractorResult(EventNameExtractorError.NoneFound));
+
+            if (filtered.Length == 1)
+                return Attempt.Succeed(new EventNameExtractorResult(filtered[0]));
+
+            //there's more than one left so it's ambiguous!
+            return Attempt.Fail(new EventNameExtractorResult(EventNameExtractorError.Ambiguous));
+        }
+
+        /// <summary>
+        /// Finds the event name on the sender that matches the args type
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="args"></param>
+        /// <param name="exclude">
+        /// A filter to exclude matched event names, this filter should return true to exclude the event name from being matched
+        /// </param>
+        /// <returns>
+        /// null if not found or an ambiguous match
+        /// </returns>
+        public static Attempt<EventNameExtractorResult> FindEvent(object sender, object args, Func<string, bool> exclude)
+        {
+            return FindEvent(sender.GetType(), args.GetType(), exclude);
+        }
+
+        /// <summary>
+        /// Return true if the event is named with an ING name such as "Saving" or "RollingBack"
+        /// </summary>
+        /// <param name="eventName"></param>
+        /// <returns></returns>
+        internal static bool MatchIngNames(string eventName)
+        {
+            var splitter = new Regex(@"(?<!^)(?=[A-Z])");
+            var words = splitter.Split(eventName);
+            if (words.Length == 0)
+                return false;
+            return words[0].EndsWith("ing");
+        }
+
+        /// <summary>
+        /// Return true if the event is not named with an ING name such as "Saving" or "RollingBack"
+        /// </summary>
+        /// <param name="eventName"></param>
+        /// <returns></returns>
+        internal static bool MatchNonIngNames(string eventName)
+        {
+            var splitter = new Regex(@"(?<!^)(?=[A-Z])");
+            var words = splitter.Split(eventName);
+            if (words.Length == 0)
+                return false;
+            return words[0].EndsWith("ing") == false;
+        }
+
+        private class EventInfoArgs
+        {
+            public EventInfo EventInfo { get; private set; }
+            public Type[] GenericArgs { get; private set; }
+
+            public EventInfoArgs(EventInfo eventInfo, Type[] genericArgs)
+            {
+                EventInfo = eventInfo;
+                GenericArgs = genericArgs;
+            }
+        }
+
+        /// <summary>
+        /// Used to cache all candidate events for a given type so we don't re-look them up
+        /// </summary>
+        private static readonly ConcurrentDictionary<Type, EventInfoArgs[]> CandidateEvents = new ConcurrentDictionary<Type, EventInfoArgs[]>();
+
+        /// <summary>
+        /// Used to cache all matched event names by (sender type + arg type) so we don't re-look them up
+        /// </summary>
+        private static readonly ConcurrentDictionary<Tuple<Type, Type>, string[]> MatchedEventNames = new ConcurrentDictionary<Tuple<Type, Type>, string[]>();
+    }
+}
@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Events
+{
+    internal enum EventNameExtractorError
+    {
+        NoneFound,
+        Ambiguous
+    }
+}
@@ -0,0 +1,18 @@
+namespace Umbraco.Core.Events
+{
+    internal class EventNameExtractorResult
+    {
+        public EventNameExtractorError? Error { get; private set; }
+        public string Name { get; private set; }
+
+        public EventNameExtractorResult(string name)
+        {
+            Name = name;
+        }
+
+        public EventNameExtractorResult(EventNameExtractorError error)
+        {
+            Error = error;
+        }
+    }
+}
@@ -1,9 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Xml.Linq;

 namespace Umbraco.Core.Events
 {
-    public class ExportEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
+    public class ExportEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>, IEquatable<ExportEventArgs<TEntity>>
    {
        /// <summary>
        /// Constructor accepting a single entity instance
@@ -48,5 +49,38 @@ namespace Umbraco.Core.Events
        /// Returns the xml relating to the export event
        /// </summary>
        public XElement Xml { get; private set; }
+
+        public bool Equals(ExportEventArgs<TEntity> other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && Equals(Xml, other.Xml);
+        }
+
+        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((ExportEventArgs<TEntity>) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (base.GetHashCode() * 397) ^ (Xml != null ? Xml.GetHashCode() : 0);
+            }
+        }
+
+        public static bool operator ==(ExportEventArgs<TEntity> left, ExportEventArgs<TEntity> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(ExportEventArgs<TEntity> left, ExportEventArgs<TEntity> right)
+        {
+            return !Equals(left, right);
+        }
    }
 }
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    internal interface IDeletingMediaFilesEventArgs
+    {
+        List<string> MediaFilesToDelete { get; }
+    }
+}
@@ -0,0 +1,13 @@
+using System;
+
+namespace Umbraco.Core.Events
+{
+    public interface IEventDefinition
+    {
+        object Sender { get; }
+        object Args { get; }
+        string EventName { get; }
+
+        void RaiseEvent();
+    }
+}
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Dispatches events from within a scope.
+    /// </summary>
+    /// <remarks>
+    /// <para>The name of the event is auto-magically discovered by matching the sender type, args type, and
+    /// eventHandler type. If the match is not unique, then the name parameter must be used to specify the
+    /// name in an explicit way.</para>
+    /// <para>What happens when an event is dispatched depends on the scope settings. It can be anything from
+    /// "trigger immediately" to "just ignore". Refer to the scope documentation for more details.</para>
+    /// </remarks>
+    public interface IEventDispatcher
+    {
+        // not sure about the Dispatch & DispatchCancelable signatures at all for now
+        // nor about the event name thing, etc - but let's keep it like this
+
+        /// <summary>
+        /// Dispatches a cancelable event.
+        /// </summary>
+        /// <param name="eventHandler">The event handler.</param>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="args">The event data.</param>
+        /// <param name="name">The optional name of the event.</param>
+        /// <returns>A value indicating whether the cancelable event was cancelled.</returns>
+        /// <remarks>See general remarks on the interface.</remarks>
+        bool DispatchCancelable(EventHandler eventHandler, object sender, CancellableEventArgs args, string name = null);
+
+        /// <summary>
+        /// Dispatches a cancelable event.
+        /// </summary>
+        /// <param name="eventHandler">The event handler.</param>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="args">The event data.</param>
+        /// <param name="name">The optional name of the event.</param>
+        /// <returns>A value indicating whether the cancelable event was cancelled.</returns>
+        /// <remarks>See general remarks on the interface.</remarks>
+        bool DispatchCancelable<TArgs>(EventHandler<TArgs> eventHandler, object sender, TArgs args, string name = null)
+            where TArgs : CancellableEventArgs;
+
+        /// <summary>
+        /// Dispatches a cancelable event.
+        /// </summary>
+        /// <param name="eventHandler">The event handler.</param>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="args">The event data.</param>
+        /// <param name="name">The optional name of the event.</param>
+        /// <returns>A value indicating whether the cancelable event was cancelled.</returns>
+        /// <remarks>See general remarks on the interface.</remarks>
+        bool DispatchCancelable<TSender, TArgs>(TypedEventHandler<TSender, TArgs> eventHandler, TSender sender, TArgs args, string name = null)
+            where TArgs : CancellableEventArgs;
+
+        /// <summary>
+        /// Dispatches an event.
+        /// </summary>
+        /// <param name="eventHandler">The event handler.</param>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="args">The event data.</param>
+        /// <param name="name">The optional name of the event.</param>
+        /// <remarks>See general remarks on the interface.</remarks>
+        void Dispatch(EventHandler eventHandler, object sender, EventArgs args, string name = null);
+
+        /// <summary>
+        /// Dispatches an event.
+        /// </summary>
+        /// <param name="eventHandler">The event handler.</param>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="args">The event data.</param>
+        /// <param name="name">The optional name of the event.</param>
+        /// <remarks>See general remarks on the interface.</remarks>
+        void Dispatch<TArgs>(EventHandler<TArgs> eventHandler, object sender, TArgs args, string name = null);
+
+        /// <summary>
+        /// Dispatches an event.
+        /// </summary>
+        /// <param name="eventHandler">The event handler.</param>
+        /// <param name="sender">The object that raised the event.</param>
+        /// <param name="args">The event data.</param>
+        /// <param name="name">The optional name of the event.</param>
+        /// <remarks>See general remarks on the interface.</remarks>
+        void Dispatch<TSender, TArgs>(TypedEventHandler<TSender, TArgs> eventHandler, TSender sender, TArgs args, string name = null);
+
+        /// <summary>
+        /// Notifies the dispatcher that the scope is exiting.
+        /// </summary>
+        /// <param name="completed">A value indicating whether the scope completed.</param>
+        void ScopeExit(bool completed);
+
+        /// <summary>
+        /// Gets the collected events.
+        /// </summary>
+        /// <returns>The collected events.</returns>
+        IEnumerable<IEventDefinition> GetEvents(EventDefinitionFilter filter);
+    }
+}
@@ -1,9 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Xml.Linq;

 namespace Umbraco.Core.Events
 {
-    public class ImportEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
+    public class ImportEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>, IEquatable<ImportEventArgs<TEntity>>
    {
        /// <summary>
        /// Constructor accepting an XElement with the xml being imported
@@ -46,5 +47,38 @@ namespace Umbraco.Core.Events
        /// Returns the xml relating to the import event
        /// </summary>
        public XElement Xml { get; private set; }
+
+        public bool Equals(ImportEventArgs<TEntity> other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && Equals(Xml, other.Xml);
+        }
+
+        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((ImportEventArgs<TEntity>) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (base.GetHashCode() * 397) ^ (Xml != null ? Xml.GetHashCode() : 0);
+            }
+        }
+
+        public static bool operator ==(ImportEventArgs<TEntity> left, ImportEventArgs<TEntity> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(ImportEventArgs<TEntity> left, ImportEventArgs<TEntity> right)
+        {
+            return !Equals(left, right);
+        }
    }
 }
@@ -1,9 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Packaging.Models;

 namespace Umbraco.Core.Events
 {
-    internal class ImportPackageEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
+    internal class ImportPackageEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>, IEquatable<ImportPackageEventArgs<TEntity>>
    {
        private readonly MetaData _packageMetaData;

@@ -21,6 +22,44 @@ namespace Umbraco.Core.Events
        public MetaData PackageMetaData
        {
            get { return _packageMetaData; }
+        }
+		
+		public IEnumerable<TEntity> InstallationSummary
+        {
+            get { return EventObject; }
+        }
+
+        public bool Equals(ImportPackageEventArgs<TEntity> other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && _packageMetaData.Equals(other._packageMetaData);
+        }
+
+        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((ImportPackageEventArgs<TEntity>) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (base.GetHashCode() * 397) ^ _packageMetaData.GetHashCode();
+            }
+        }
+
+        public static bool operator ==(ImportPackageEventArgs<TEntity> left, ImportPackageEventArgs<TEntity> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(ImportPackageEventArgs<TEntity> left, ImportPackageEventArgs<TEntity> right)
+        {
+            return !Equals(left, right);
        }
    }
 }
@@ -7,7 +7,7 @@ using Umbraco.Core.Persistence.Migrations;

 namespace Umbraco.Core.Events
 {
-    public class MigrationEventArgs : CancellableObjectEventArgs<IList<IMigration>>
+    public class MigrationEventArgs : CancellableObjectEventArgs<IList<IMigration>>, IEquatable<MigrationEventArgs>
    {
        /// <summary>
        /// Constructor accepting multiple migrations that are used in the migration runner
@@ -141,5 +141,43 @@ namespace Umbraco.Core.Events
        public string ProductName { get; private set; }

        internal MigrationContext MigrationContext { get; private set; }
+
+        public bool Equals(MigrationEventArgs other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && ConfiguredSemVersion.Equals(other.ConfiguredSemVersion) && MigrationContext.Equals(other.MigrationContext) && string.Equals(ProductName, other.ProductName) && TargetSemVersion.Equals(other.TargetSemVersion);
+        }
+
+        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((MigrationEventArgs) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = base.GetHashCode();
+                hashCode = (hashCode * 397) ^ ConfiguredSemVersion.GetHashCode();
+                hashCode = (hashCode * 397) ^ MigrationContext.GetHashCode();
+                hashCode = (hashCode * 397) ^ ProductName.GetHashCode();
+                hashCode = (hashCode * 397) ^ TargetSemVersion.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(MigrationEventArgs left, MigrationEventArgs right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(MigrationEventArgs left, MigrationEventArgs right)
+        {
+            return !Equals(left, right);
+        }
    }
 }
@@ -4,7 +4,7 @@ using System.Linq;

 namespace Umbraco.Core.Events
 {
-    public class MoveEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
+    public class MoveEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>, IEquatable<MoveEventArgs<TEntity>>
    {
        /// <summary>
        /// Constructor accepting a collection of MoveEventInfo objects
@@ -123,5 +123,38 @@ namespace Umbraco.Core.Events
        /// </summary>
        [Obsolete("Retrieve the ParentId from the MoveInfoCollection property instead")]
        public int ParentId { get; private set; }
+
+        public bool Equals(MoveEventArgs<TEntity> other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && MoveInfoCollection.Equals(other.MoveInfoCollection);
+        }
+
+        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((MoveEventArgs<TEntity>) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (base.GetHashCode() * 397) ^ MoveInfoCollection.GetHashCode();
+            }
+        }
+
+        public static bool operator ==(MoveEventArgs<TEntity> left, MoveEventArgs<TEntity> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(MoveEventArgs<TEntity> left, MoveEventArgs<TEntity> right)
+        {
+            return !Equals(left, right);
+        }
    }
 }
@@ -1,6 +1,9 @@
+using System;
+using System.Collections.Generic;
+
 namespace Umbraco.Core.Events
 {
-    public class MoveEventInfo<TEntity>
+    public class MoveEventInfo<TEntity> : IEquatable<MoveEventInfo<TEntity>>
    {
        public MoveEventInfo(TEntity entity, string originalPath, int newParentId)
        {
@@ -12,5 +15,41 @@ namespace Umbraco.Core.Events
        public TEntity Entity { get; set; }
        public string OriginalPath { get; set; }
        public int NewParentId { get; set; }
+
+        public bool Equals(MoveEventInfo<TEntity> other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return EqualityComparer<TEntity>.Default.Equals(Entity, other.Entity) && NewParentId == other.NewParentId && string.Equals(OriginalPath, other.OriginalPath);
+        }
+
+        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((MoveEventInfo<TEntity>) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = EqualityComparer<TEntity>.Default.GetHashCode(Entity);
+                hashCode = (hashCode * 397) ^ NewParentId;
+                hashCode = (hashCode * 397) ^ OriginalPath.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(MoveEventInfo<TEntity> left, MoveEventInfo<TEntity> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(MoveEventInfo<TEntity> left, MoveEventInfo<TEntity> right)
+        {
+            return !Equals(left, right);
+        }
    }
 }
@@ -1,8 +1,10 @@
+using System;
+using System.Collections.Generic;
 using Umbraco.Core.Models;

 namespace Umbraco.Core.Events
 {
-	public class NewEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
+	public class NewEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>, IEquatable<NewEventArgs<TEntity>>
 	{


@@ -84,5 +86,42 @@ namespace Umbraco.Core.Events
        /// Gets or Sets the parent IContent object.
        /// </summary>
        public TEntity Parent { get; private set; }
+
+	    public bool Equals(NewEventArgs<TEntity> other)
+	    {
+	        if (ReferenceEquals(null, other)) return false;
+	        if (ReferenceEquals(this, other)) return true;
+	        return base.Equals(other) && string.Equals(Alias, other.Alias) && EqualityComparer<TEntity>.Default.Equals(Parent, other.Parent) && ParentId == other.ParentId;
+	    }
+
+	    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((NewEventArgs<TEntity>) obj);
+	    }
+
+	    public override int GetHashCode()
+	    {
+	        unchecked
+	        {
+	            int hashCode = base.GetHashCode();
+	            hashCode = (hashCode * 397) ^ Alias.GetHashCode();
+	            hashCode = (hashCode * 397) ^ EqualityComparer<TEntity>.Default.GetHashCode(Parent);
+	            hashCode = (hashCode * 397) ^ ParentId;
+	            return hashCode;
+	        }
+	    }
+
+	    public static bool operator ==(NewEventArgs<TEntity> left, NewEventArgs<TEntity> right)
+	    {
+	        return Equals(left, right);
+	    }
+
+	    public static bool operator !=(NewEventArgs<TEntity> left, NewEventArgs<TEntity> right)
+	    {
+	        return !Equals(left, right);
+	    }
 	}
 }
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// This event manager supports event cancellation and will raise the events as soon as they are tracked, it does not store tracked events
+    /// </summary>
+    internal class PassThroughEventDispatcher : IEventDispatcher
+    {
+        public bool DispatchCancelable(EventHandler eventHandler, object sender, CancellableEventArgs args, string eventName = null)
+        {
+            if (eventHandler == null) return args.Cancel;
+            eventHandler(sender, args);
+            return args.Cancel;
+        }
+
+        public bool DispatchCancelable<TArgs>(EventHandler<TArgs> eventHandler, object sender, TArgs args, string eventName = null)
+            where TArgs : CancellableEventArgs
+        {
+            if (eventHandler == null) return args.Cancel;
+            eventHandler(sender, args);
+            return args.Cancel;
+        }
+
+        public bool DispatchCancelable<TSender, TArgs>(TypedEventHandler<TSender, TArgs> eventHandler, TSender sender, TArgs args, string eventName = null)
+            where TArgs : CancellableEventArgs
+        {
+            if (eventHandler == null) return args.Cancel;
+            eventHandler(sender, args);
+            return args.Cancel;
+        }
+
+        public void Dispatch(EventHandler eventHandler, object sender, EventArgs args, string eventName = null)
+        {
+            if (eventHandler == null) return;
+            eventHandler(sender, args);
+        }
+
+        public void Dispatch<TArgs>(EventHandler<TArgs> eventHandler, object sender, TArgs args, string eventName = null)
+        {
+            if (eventHandler == null) return;
+            eventHandler(sender, args);
+        }
+
+        public void Dispatch<TSender, TArgs>(TypedEventHandler<TSender, TArgs> eventHandler, TSender sender, TArgs args, string eventName = null)
+        {
+            if (eventHandler == null) return;
+            eventHandler(sender, args);
+        }
+
+        public IEnumerable<IEventDefinition> GetEvents(EventDefinitionFilter filter)
+        {
+            return Enumerable.Empty<IEventDefinition>();
+        }
+
+        public void ScopeExit(bool completed)
+        { }
+    }
+}
@@ -1,8 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;

 namespace Umbraco.Core.Events
 {
-    public class PublishEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
+    public class PublishEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>, IEquatable<PublishEventArgs<TEntity>>
    {
        /// <summary>
        /// Constructor accepting multiple entities that are used in the publish operation
@@ -101,5 +102,38 @@ namespace Umbraco.Core.Events
 		}

        public bool IsAllRepublished { get; private set; }
+
+        public bool Equals(PublishEventArgs<TEntity> other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && IsAllRepublished == other.IsAllRepublished;
+        }
+
+        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((PublishEventArgs<TEntity>) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (base.GetHashCode() * 397) ^ IsAllRepublished.GetHashCode();
+            }
+        }
+
+        public static bool operator ==(PublishEventArgs<TEntity> left, PublishEventArgs<TEntity> right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(PublishEventArgs<TEntity> left, PublishEventArgs<TEntity> right)
+        {
+            return !Equals(left, right);
+        }
    }
 }
@@ -5,7 +5,7 @@ using Umbraco.Core.Models;

 namespace Umbraco.Core.Events
 {
-    public class RecycleBinEventArgs : CancellableEventArgs
+    public class RecycleBinEventArgs : CancellableEventArgs, IEquatable<RecycleBinEventArgs>, IDeletingMediaFilesEventArgs
    {
        public RecycleBinEventArgs(Guid nodeObjectType, Dictionary<int, IEnumerable<Property>> allPropertyData, bool emptiedSuccessfully)
            : base(false)
@@ -97,6 +97,8 @@ namespace Umbraco.Core.Events
        /// </remarks>
        public List<string> Files { get; private set; }

+        public List<string> MediaFilesToDelete { get { return Files; } }
+
        /// <summary>
        /// Gets the list of all property data associated with a content id
        /// </summary>
@@ -122,5 +124,44 @@ namespace Umbraco.Core.Events
        {
            get { return NodeObjectType == new Guid(Constants.ObjectTypes.Media); }
        }
+
+        public bool Equals(RecycleBinEventArgs other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return base.Equals(other) && AllPropertyData.Equals(other.AllPropertyData) && Files.Equals(other.Files) && Ids.Equals(other.Ids) && NodeObjectType.Equals(other.NodeObjectType) && RecycleBinEmptiedSuccessfully == other.RecycleBinEmptiedSuccessfully;
+        }
+
+        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((RecycleBinEventArgs) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = base.GetHashCode();
+                hashCode = (hashCode * 397) ^ AllPropertyData.GetHashCode();
+                hashCode = (hashCode * 397) ^ Files.GetHashCode();
+                hashCode = (hashCode * 397) ^ Ids.GetHashCode();
+                hashCode = (hashCode * 397) ^ NodeObjectType.GetHashCode();
+                hashCode = (hashCode * 397) ^ RecycleBinEmptiedSuccessfully.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(RecycleBinEventArgs left, RecycleBinEventArgs right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(RecycleBinEventArgs left, RecycleBinEventArgs right)
+        {
+            return !Equals(left, right);
+        }
    }
 }
@@ -17,5 +17,7 @@ namespace Umbraco.Core.Events
 		{
 			get { return EventObject; }
 		}
+
+
 	}
 }
@@ -116,5 +116,7 @@ namespace Umbraco.Core.Events
 		{
 			get { return EventObject; }
 		}
+
+
 	}
 }
@@ -0,0 +1,46 @@
+using Umbraco.Core.IO;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// This event manager is created for each scope and is aware of if it is nested in an outer scope
+    /// </summary>
+    /// <remarks>
+    /// The outer scope is the only scope that can raise events, the inner scope's will defer to the outer scope
+    /// </remarks>
+    internal class ScopeEventDispatcher : ScopeEventDispatcherBase
+    {
+        public ScopeEventDispatcher()
+            : base(true)
+        { }
+
+        protected override void ScopeExitCompleted()
+        {
+            // processing only the last instance of each event...
+            // this is probably far from perfect, because if eg a content is saved in a list
+            // and then as a single content, the two events will probably not be de-duplicated,
+            // but it's better than nothing
+
+            foreach (var e in GetEvents(EventDefinitionFilter.LastIn))
+            {
+                e.RaiseEvent();
+
+                // separating concerns means that this should probably not be here,
+                // but then where should it be (without making things too complicated)?
+                var delete = e.Args as IDeletingMediaFilesEventArgs;
+                if (delete != null && delete.MediaFilesToDelete.Count > 0)
+                    MediaFileSystem.DeleteMediaFiles(delete.MediaFilesToDelete);
+            }
+        }
+
+        private MediaFileSystem _mediaFileSystem;
+
+        private MediaFileSystem MediaFileSystem
+        {
+            get
+            {
+                return _mediaFileSystem ?? (_mediaFileSystem = FileSystemProviderManager.Current.MediaFileSystem);
+            }
+        }
+    }
+}
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Events
+{
+    public abstract class ScopeEventDispatcherBase : IEventDispatcher
+    {
+        private List<IEventDefinition> _events;
+        private readonly bool _raiseCancelable;
+
+        protected ScopeEventDispatcherBase(bool raiseCancelable)
+        {
+            _raiseCancelable = raiseCancelable;
+        }
+
+        private List<IEventDefinition> Events { get { return _events ?? (_events = new List<IEventDefinition>()); } }
+
+        public bool DispatchCancelable(EventHandler eventHandler, object sender, CancellableEventArgs args, string eventName = null)
+        {
+            if (eventHandler == null) return args.Cancel;
+            if (_raiseCancelable == false) return args.Cancel;
+            eventHandler(sender, args);
+            return args.Cancel;
+        }
+
+        public bool DispatchCancelable<TArgs>(EventHandler<TArgs> eventHandler, object sender, TArgs args, string eventName = null)
+            where TArgs : CancellableEventArgs
+        {
+            if (eventHandler == null) return args.Cancel;
+            if (_raiseCancelable == false) return args.Cancel;
+            eventHandler(sender, args);
+            return args.Cancel;
+        }
+
+        public bool DispatchCancelable<TSender, TArgs>(TypedEventHandler<TSender, TArgs> eventHandler, TSender sender, TArgs args, string eventName = null)
+            where TArgs : CancellableEventArgs
+        {
+            if (eventHandler == null) return args.Cancel;
+            if (_raiseCancelable == false) return args.Cancel;
+            eventHandler(sender, args);
+            return args.Cancel;
+        }
+
+        public void Dispatch(EventHandler eventHandler, object sender, EventArgs args, string eventName = null)
+        {
+            if (eventHandler == null) return;
+            Events.Add(new EventDefinition(eventHandler, sender, args, eventName));
+        }
+
+        public void Dispatch<TArgs>(EventHandler<TArgs> eventHandler, object sender, TArgs args, string eventName = null)
+        {
+            if (eventHandler == null) return;
+            Events.Add(new EventDefinition<TArgs>(eventHandler, sender, args, eventName));
+        }
+
+        public void Dispatch<TSender, TArgs>(TypedEventHandler<TSender, TArgs> eventHandler, TSender sender, TArgs args, string eventName = null)
+        {
+            if (eventHandler == null) return;
+            Events.Add(new EventDefinition<TSender, TArgs>(eventHandler, sender, args, eventName));
+        }
+
+        public IEnumerable<IEventDefinition> GetEvents(EventDefinitionFilter filter)
+        {
+            if (_events == null)
+                return Enumerable.Empty<IEventDefinition>();
+
+            switch (filter)
+            {
+                case EventDefinitionFilter.All:
+                    return _events;
+                case EventDefinitionFilter.FirstIn:
+                    var l1 = new OrderedHashSet<IEventDefinition>();
+                    foreach (var e in _events)
+                    {
+                        l1.Add(e);
+                    }
+                    return l1;
+                case EventDefinitionFilter.LastIn:
+                    var l2 = new OrderedHashSet<IEventDefinition>(keepOldest: false);
+                    foreach (var e in _events)
+                    {
+                        l2.Add(e);
+                    }
+                    return l2;
+                default:
+                    throw new ArgumentOutOfRangeException("filter", filter, null);
+            }
+        }
+
+        public void ScopeExit(bool completed)
+        {
+            if (_events == null) return;
+            if (completed)
+                ScopeExitCompleted();
+            _events.Clear();
+        }
+
+        protected abstract void ScopeExitCompleted();
+    }
+}
@@ -0,0 +1,58 @@
+using System;
+using Umbraco.Core.Scoping;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Stores the instance of EventMessages in the current scope.
+    /// </summary>
+    internal class ScopeLifespanMessagesFactory : IEventMessagesFactory
+    {
+        public const string ContextKey = "Umbraco.Core.Events.ScopeLifespanMessagesFactory";
+
+        private readonly IHttpContextAccessor _contextAccessor;
+        private readonly IScopeProviderInternal _scopeProvider;
+
+        public static ScopeLifespanMessagesFactory Current { get; private set; }
+
+        public ScopeLifespanMessagesFactory(IHttpContextAccessor contextAccesor, IScopeProvider scopeProvider)
+        {
+            if (contextAccesor == null) throw new ArgumentNullException("contextAccesor");
+            if (scopeProvider == null) throw new ArgumentNullException("scopeProvider");
+            if (scopeProvider is IScopeProviderInternal == false) throw new ArgumentException("Not IScopeProviderInternal.", "scopeProvider");
+            _contextAccessor = contextAccesor;
+            _scopeProvider = (IScopeProviderInternal) scopeProvider;
+            Current = this;
+        }
+
+        public EventMessages Get()
+        {
+            var messages = GetFromHttpContext();
+            if (messages != null) return messages;
+
+            var scope = _scopeProvider.GetAmbientOrNoScope();
+            return scope.Messages;
+        }
+
+        public EventMessages GetFromHttpContext()
+        {
+            if (_contextAccessor == null || _contextAccessor.Value == null) return null;
+            return (EventMessages)_contextAccessor.Value.Items[ContextKey];
+        }
+
+        public EventMessages TryGet()
+        {
+            var messages = GetFromHttpContext();
+            if (messages != null) return messages;
+
+            var scope = _scopeProvider.AmbientScope;
+            return scope == null ? null : scope.MessagesOrNull;
+        }
+
+        public void Set(EventMessages messages)
+        {
+            if (_contextAccessor.Value == null) return;
+            _contextAccessor.Value.Items[ContextKey] = messages;
+        }
+    }
+}
@@ -2,6 +2,6 @@ using System;

 namespace Umbraco.Core.Events
 {
-	[Serializable]
+    [Serializable]
 	public delegate void TypedEventHandler<in TSender, in TEventArgs>(TSender sender, TEventArgs e);
 }
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using Umbraco.Core.Packaging.Models;
+
+namespace Umbraco.Core.Events
+{
+    internal class UninstallPackageEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
+    {
+        private readonly MetaData _packageMetaData;
+
+        public UninstallPackageEventArgs(TEntity eventObject, bool canCancel)
+            : base(new[] { eventObject }, canCancel)
+        {
+        }
+
+        public UninstallPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
+            : base(new[] { eventObject })
+        {
+            _packageMetaData = packageMetaData;
+        }
+
+        public MetaData PackageMetaData
+        {
+            get { return _packageMetaData; }
+        }
+
+        public IEnumerable<TEntity> UninstallationSummary
+        {
+            get { return EventObject; }
+        }
+    }
+}
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.0
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -1,10 +1,12 @@
 using System;
+using System.ComponentModel;

 namespace Umbraco.Core
 {
    /// <summary>
    /// Represents a guid-based entity identifier.
    /// </summary>
+    [TypeConverter(typeof(UdiTypeConverter))]
    public class GuidUdi : Udi
    {
        /// <summary>
@@ -0,0 +1,9 @@
+using System.Web;
+
+namespace Umbraco.Core
+{
+    public interface IHttpContextAccessor
+    {
+        HttpContextBase Value { get; }
+    }
+}
@@ -5,31 +5,25 @@ using System.Configuration;
 using System.Linq;
 using System.Reflection;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Scoping;

 namespace Umbraco.Core.IO
-{	
+{
    public class FileSystemProviderManager
    {
        private readonly FileSystemProvidersSection _config;
-        private readonly WeakSet<ShadowWrapper> _wrappers = new WeakSet<ShadowWrapper>();
+        private readonly ConcurrentSet<ShadowWrapper> _wrappers = new ConcurrentSet<ShadowWrapper>();

-        // actual well-known filesystems returned by properties
-        private readonly IFileSystem2 _macroPartialFileSystem;
-        private readonly IFileSystem2 _partialViewsFileSystem;
-        private readonly IFileSystem2 _stylesheetsFileSystem;
-        private readonly IFileSystem2 _scriptsFileSystem;
-        private readonly IFileSystem2 _xsltFileSystem;
-        private readonly IFileSystem2 _masterPagesFileSystem;
-        private readonly IFileSystem2 _mvcViewsFileSystem;
+        private readonly ConcurrentDictionary<string, ProviderConstructionInfo> _providerLookup = new ConcurrentDictionary<string, ProviderConstructionInfo>();
+        private readonly ConcurrentDictionary<string, IFileSystem2> _filesystems = new ConcurrentDictionary<string, IFileSystem2>();

-        // when shadowing is enabled, above filesystems, as wrappers
-        private readonly ShadowWrapper _macroPartialFileSystemWrapper;
-        private readonly ShadowWrapper _partialViewsFileSystemWrapper;
-        private readonly ShadowWrapper _stylesheetsFileSystemWrapper;
-        private readonly ShadowWrapper _scriptsFileSystemWrapper;
-        private readonly ShadowWrapper _xsltFileSystemWrapper;
-        private readonly ShadowWrapper _masterPagesFileSystemWrapper;
-        private readonly ShadowWrapper _mvcViewsFileSystemWrapper;
+        private ShadowWrapper _macroPartialFileSystem;
+        private ShadowWrapper _partialViewsFileSystem;
+        private ShadowWrapper _stylesheetsFileSystem;
+        private ShadowWrapper _scriptsFileSystem;
+        private ShadowWrapper _xsltFileSystem;
+        private ShadowWrapper _masterPagesFileSystem;
+        private ShadowWrapper _mvcViewsFileSystem;

        #region Singleton & Constructor

@@ -40,25 +34,46 @@ namespace Umbraco.Core.IO
            get { return Instance; }
        }

+        // for tests only, totally unsafe
+        internal void Reset()
+        {
+            _wrappers.Clear();
+            _providerLookup.Clear();
+            _filesystems.Clear();
+            CreateWellKnownFileSystems();
+        }
+
+        private IScopeProviderInternal ScopeProvider
+        {
+            // this is bad, but enough for now, and we'll refactor
+            // in v8 when we'll get rid of this class' singleton
+            // beware: means that we capture the "current" scope provider - take care in tests!
+            get { return ApplicationContext.Current == null ? null : ApplicationContext.Current.ScopeProvider as IScopeProviderInternal; }
+        }
+
        internal FileSystemProviderManager()
        {
            _config = (FileSystemProvidersSection) ConfigurationManager.GetSection("umbracoConfiguration/FileSystemProviders");
+            CreateWellKnownFileSystems();
+        }

-            _macroPartialFileSystem = new PhysicalFileSystem(SystemDirectories.MacroPartials);
-            _partialViewsFileSystem = new PhysicalFileSystem(SystemDirectories.PartialViews);
-            _stylesheetsFileSystem = new PhysicalFileSystem(SystemDirectories.Css);
-            _scriptsFileSystem = new PhysicalFileSystem(SystemDirectories.Scripts);
-            _xsltFileSystem = new PhysicalFileSystem(SystemDirectories.Xslt);
-            _masterPagesFileSystem = new PhysicalFileSystem(SystemDirectories.Masterpages);
-            _mvcViewsFileSystem = new PhysicalFileSystem(SystemDirectories.MvcViews);
+        private void CreateWellKnownFileSystems()
+        {
+            var macroPartialFileSystem = new PhysicalFileSystem(SystemDirectories.MacroPartials);
+            var partialViewsFileSystem = new PhysicalFileSystem(SystemDirectories.PartialViews);
+            var stylesheetsFileSystem = new PhysicalFileSystem(SystemDirectories.Css);
+            var scriptsFileSystem = new PhysicalFileSystem(SystemDirectories.Scripts);
+            var xsltFileSystem = new PhysicalFileSystem(SystemDirectories.Xslt);
+            var masterPagesFileSystem = new PhysicalFileSystem(SystemDirectories.Masterpages);
+            var mvcViewsFileSystem = new PhysicalFileSystem(SystemDirectories.MvcViews);

-            _macroPartialFileSystem = _macroPartialFileSystemWrapper = new ShadowWrapper(_macroPartialFileSystem, "Views/MacroPartials");
-            _partialViewsFileSystem = _partialViewsFileSystemWrapper = new ShadowWrapper(_partialViewsFileSystem, "Views/Partials");
-            _stylesheetsFileSystem = _stylesheetsFileSystemWrapper = new ShadowWrapper(_stylesheetsFileSystem, "css");
-            _scriptsFileSystem = _scriptsFileSystemWrapper = new ShadowWrapper(_scriptsFileSystem, "scripts");
-            _xsltFileSystem = _xsltFileSystemWrapper = new ShadowWrapper(_xsltFileSystem, "xslt");
-            _masterPagesFileSystem = _masterPagesFileSystemWrapper = new ShadowWrapper(_masterPagesFileSystem, "masterpages");
-            _mvcViewsFileSystem = _mvcViewsFileSystemWrapper = new ShadowWrapper(_mvcViewsFileSystem, "Views");
+            _macroPartialFileSystem = new ShadowWrapper(macroPartialFileSystem, "Views/MacroPartials", ScopeProvider);
+            _partialViewsFileSystem = new ShadowWrapper(partialViewsFileSystem, "Views/Partials", ScopeProvider);
+            _stylesheetsFileSystem = new ShadowWrapper(stylesheetsFileSystem, "css", ScopeProvider);
+            _scriptsFileSystem = new ShadowWrapper(scriptsFileSystem, "scripts", ScopeProvider);
+            _xsltFileSystem = new ShadowWrapper(xsltFileSystem, "xslt", ScopeProvider);
+            _masterPagesFileSystem = new ShadowWrapper(masterPagesFileSystem, "masterpages", ScopeProvider);
+            _mvcViewsFileSystem = new ShadowWrapper(mvcViewsFileSystem, "Views", ScopeProvider);

            // filesystems obtained from GetFileSystemProvider are already wrapped and do not need to be wrapped again
            MediaFileSystem = GetFileSystemProvider<MediaFileSystem>();
@@ -73,7 +88,7 @@ namespace Umbraco.Core.IO
        public IFileSystem2 StylesheetsFileSystem { get { return _stylesheetsFileSystem; } }
        public IFileSystem2 ScriptsFileSystem { get { return _scriptsFileSystem; } }
        public IFileSystem2 XsltFileSystem { get { return _xsltFileSystem; } }
-        public IFileSystem2 MasterPagesFileSystem { get { return _masterPagesFileSystem; } }
+        public IFileSystem2 MasterPagesFileSystem { get { return _mvcViewsFileSystem; } }
        public IFileSystem2 MvcViewsFileSystem { get { return _mvcViewsFileSystem; } }
        public MediaFileSystem MediaFileSystem { get; private set; }

@@ -91,56 +106,74 @@ namespace Umbraco.Core.IO
 			//public string ProviderAlias { get; set; }
 		}

-		private readonly ConcurrentDictionary<string, ProviderConstructionInfo> _providerLookup = new ConcurrentDictionary<string, ProviderConstructionInfo>();
-		private readonly ConcurrentDictionary<Type, string> _aliases = new ConcurrentDictionary<Type, string>(); 
-
        /// <summary>
        /// Gets an underlying (non-typed) filesystem supporting a strongly-typed filesystem.
        /// </summary>
        /// <param name="alias">The alias of the strongly-typed filesystem.</param>
        /// <returns>The non-typed filesystem supporting the strongly-typed filesystem with the specified alias.</returns>
-        /// <remarks>This method should not be used directly, used <see cref="GetFileSystemProvider{TFileSystem}"/> instead.</remarks>
+        /// <remarks>This method should not be used directly, used <see cref="GetFileSystemProvider{TFileSystem}()"/> instead.</remarks>
        public IFileSystem GetUnderlyingFileSystemProvider(string alias)
+        {
+            return GetUnderlyingFileSystemProvider(alias, null);
+        }
+
+        /// <summary>
+        /// Gets an underlying (non-typed) filesystem supporting a strongly-typed filesystem.
+        /// </summary>
+        /// <param name="alias">The alias of the strongly-typed filesystem.</param>
+        /// /// <param name="fallback">A fallback creator for the filesystem.</param>
+        /// <returns>The non-typed filesystem supporting the strongly-typed filesystem with the specified alias.</returns>
+        /// <remarks>This method should not be used directly, used <see cref="GetFileSystemProvider{TFileSystem}()"/> instead.</remarks>
+        private IFileSystem GetUnderlyingFileSystemProvider(string alias, Func<IFileSystem> fallback)
        {
 			// either get the constructor info from cache or create it and add to cache
-	        var ctorInfo = _providerLookup.GetOrAdd(alias, s =>
-		        {
-                    // get config
-			        var providerConfig = _config.Providers[s];
-			        if (providerConfig == null)
-				        throw new ArgumentException(string.Format("No provider found with alias {0}.", s));
+            var ctorInfo = _providerLookup.GetOrAdd(alias, _ => GetUnderlyingFileSystemCtor(alias, fallback));
+            return ctorInfo == null ? fallback() : (IFileSystem) ctorInfo.Constructor.Invoke(ctorInfo.Parameters);
+        }

-                    // get the filesystem type
-			        var providerType = Type.GetType(providerConfig.Type);
-			        if (providerType == null)
-				        throw new InvalidOperationException(string.Format("Could not find type {0}.", providerConfig.Type));
+        private IFileSystem GetUnderlyingFileSystemNoCache(string alias, Func<IFileSystem> fallback)
+        {
+            var ctorInfo = GetUnderlyingFileSystemCtor(alias, fallback);
+            return ctorInfo == null ? fallback() : (IFileSystem) ctorInfo.Constructor.Invoke(ctorInfo.Parameters);
+        }

-                    // ensure it implements IFileSystem
-			        if (providerType.IsAssignableFrom(typeof (IFileSystem)))
-				        throw new InvalidOperationException(string.Format("Type {0} does not implement IFileSystem.", providerType.FullName));
+        private ProviderConstructionInfo GetUnderlyingFileSystemCtor(string alias, Func<IFileSystem> fallback)
+        {
+            // get config
+            var providerConfig = _config.Providers[alias];
+            if (providerConfig == null)
+            {
+                if (fallback != null) return null;
+                throw new ArgumentException(string.Format("No provider found with alias {0}.", alias));
+            }

-                    // find a ctor matching the config parameters
-			        var paramCount = providerConfig.Parameters != null ? providerConfig.Parameters.Count : 0;
-			        var constructor = providerType.GetConstructors().SingleOrDefault(x 
-                        => x.GetParameters().Length == paramCount && x.GetParameters().All(y => providerConfig.Parameters.AllKeys.Contains(y.Name)));
-			        if (constructor == null)
-				        throw new InvalidOperationException(string.Format("Type {0} has no ctor matching the {1} configuration parameter(s).", providerType.FullName, paramCount));
+            // get the filesystem type
+            var providerType = Type.GetType(providerConfig.Type);
+            if (providerType == null)
+                throw new InvalidOperationException(string.Format("Could not find type {0}.", providerConfig.Type));

-			        var parameters = new object[paramCount];
-                    if (providerConfig.Parameters != null) // keeps ReSharper happy
-			            for (var i = 0; i < paramCount; i++)
-				            parameters[i] = providerConfig.Parameters[providerConfig.Parameters.AllKeys[i]].Value;			
+            // ensure it implements IFileSystem
+            if (providerType.IsAssignableFrom(typeof(IFileSystem)))
+                throw new InvalidOperationException(string.Format("Type {0} does not implement IFileSystem.", providerType.FullName));

-			        return new ProviderConstructionInfo
-				        {
-					        Constructor = constructor,
-					        Parameters = parameters,
-					        //ProviderAlias = s
-				        };
-		        });
+            // find a ctor matching the config parameters
+            var paramCount = providerConfig.Parameters != null ? providerConfig.Parameters.Count : 0;
+            var constructor = providerType.GetConstructors().SingleOrDefault(x
+                => x.GetParameters().Length == paramCount && x.GetParameters().All(y => providerConfig.Parameters.AllKeys.Contains(y.Name)));
+            if (constructor == null)
+                throw new InvalidOperationException(string.Format("Type {0} has no ctor matching the {1} configuration parameter(s).", providerType.FullName, paramCount));

-            // create the fs and return
-			return (IFileSystem) ctorInfo.Constructor.Invoke(ctorInfo.Parameters);
+            var parameters = new object[paramCount];
+            if (providerConfig.Parameters != null) // keeps ReSharper happy
+                for (var i = 0; i < paramCount; i++)
+                    parameters[i] = providerConfig.Parameters[providerConfig.Parameters.AllKeys[i]].Value;
+
+            return new ProviderConstructionInfo
+            {
+                Constructor = constructor,
+                Parameters = parameters,
+                //ProviderAlias = s
+            };
        }

        /// <summary>
@@ -148,92 +181,111 @@ namespace Umbraco.Core.IO
        /// </summary>
        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
        /// <returns>A strongly-typed filesystem of the specified type.</returns>
+        /// <remarks>
+        /// <para>Ideally, this should cache the instances, but that would break backward compatibility, so we
+        /// only do it for our own MediaFileSystem - for everything else, it's the responsibility of the caller
+        /// to ensure that they maintain singletons. This is important for singletons, as each filesystem maintains
+        /// its own shadow and having multiple instances would lead to inconsistencies.</para>
+        /// <para>Note that any filesystem created by this method *after* shadowing begins, will *not* be
+        /// shadowing (and an exception will be thrown by the ShadowWrapper).</para>
+        /// </remarks>
        public TFileSystem GetFileSystemProvider<TFileSystem>()
-			where TFileSystem : FileSystemWrapper
+            where TFileSystem : FileSystemWrapper
        {
-            // deal with known types - avoid infinite loops!
-            if (typeof(TFileSystem) == typeof(MediaFileSystem) && MediaFileSystem != null)
-                return MediaFileSystem as TFileSystem; // else create and return
+            return GetFileSystemProvider<TFileSystem>(null);
+        }

-			// get/cache the alias for the filesystem type
-	        var alias = _aliases.GetOrAdd(typeof (TFileSystem), fsType =>
-		        {
-					// validate the ctor
-					var constructor = fsType.GetConstructors().SingleOrDefault(x 
-                        => x.GetParameters().Length == 1 && TypeHelper.IsTypeAssignableFrom<IFileSystem>(x.GetParameters().Single().ParameterType));
-					if (constructor == null)
-						throw new InvalidOperationException("Type " + fsType.FullName + " must inherit from FileSystemWrapper and have a constructor that accepts one parameter of type " + typeof(IFileSystem).FullName + ".");
+        /// <summary>
+        /// Gets a strongly-typed filesystem.
+        /// </summary>
+        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
+        /// <param name="fallback">A fallback creator for the inner filesystem.</param>
+        /// <returns>A strongly-typed filesystem of the specified type.</returns>
+        /// <remarks>
+        /// <para>The fallback creator is used only if nothing is configured.</para>
+        /// <para>Ideally, this should cache the instances, but that would break backward compatibility, so we
+        /// only do it for our own MediaFileSystem - for everything else, it's the responsibility of the caller
+        /// to ensure that they maintain singletons. This is important for singletons, as each filesystem maintains
+        /// its own shadow and having multiple instances would lead to inconsistencies.</para>
+        /// <para>Note that any filesystem created by this method *after* shadowing begins, will *not* be
+        /// shadowing (and an exception will be thrown by the ShadowWrapper).</para>
+        /// </remarks>
+        public TFileSystem GetFileSystemProvider<TFileSystem>(Func<IFileSystem> fallback)
+            where TFileSystem : FileSystemWrapper
+        {
+            var alias = GetFileSystemAlias<TFileSystem>();
+            return (TFileSystem) _filesystems.GetOrAdd(alias, _ =>
+            {
+                // gets the inner fs, create the strongly-typed fs wrapping the inner fs, register & return
+                // so we are double-wrapping here
+                // could be optimized by having FileSystemWrapper inherit from ShadowWrapper, maybe
+                var innerFs = GetUnderlyingFileSystemNoCache(alias, fallback);
+                var shadowWrapper = new ShadowWrapper(innerFs, "typed/" + alias, ScopeProvider);
+                var fs = (IFileSystem2) Activator.CreateInstance(typeof (TFileSystem), shadowWrapper);
+                _wrappers.Add(shadowWrapper); // keeping a reference to the wrapper
+                return fs;
+            });
+        }

-                    // find the attribute and get the alias
-					var attr = (FileSystemProviderAttribute) fsType.GetCustomAttributes(typeof(FileSystemProviderAttribute), false).SingleOrDefault();
-					if (attr == null)
-						throw new InvalidOperationException("Type " + fsType.FullName + "is missing the required FileSystemProviderAttribute.");
+        private string GetFileSystemAlias<TFileSystem>()
+        {
+            var fsType = typeof(TFileSystem);

-			        return attr.Alias;
-		        });
+            // validate the ctor
+            var constructor = fsType.GetConstructors().SingleOrDefault(x
+                => x.GetParameters().Length == 1 && TypeHelper.IsTypeAssignableFrom<IFileSystem>(x.GetParameters().Single().ParameterType));
+            if (constructor == null)
+                throw new InvalidOperationException("Type " + fsType.FullName + " must inherit from FileSystemWrapper and have a constructor that accepts one parameter of type " + typeof(IFileSystem).FullName + ".");

-            // gets the inner fs, create the strongly-typed fs wrapping the inner fs, register & return
-            // so we are double-wrapping here
-            // could be optimized by having FileSystemWrapper inherit from ShadowWrapper, maybe
-            var innerFs = GetUnderlyingFileSystemProvider(alias);
-            var shadowWrapper = new ShadowWrapper(innerFs, "typed/" + alias);
-	        var fs = (TFileSystem) Activator.CreateInstance(typeof (TFileSystem), innerFs);
-            _wrappers.Add(shadowWrapper); // keeping a weak reference to the wrapper
-	        return fs;
+            // find the attribute and get the alias
+            var attr = (FileSystemProviderAttribute)fsType.GetCustomAttributes(typeof(FileSystemProviderAttribute), false).SingleOrDefault();
+            if (attr == null)
+                throw new InvalidOperationException("Type " + fsType.FullName + "is missing the required FileSystemProviderAttribute.");
+
+            return attr.Alias;
        }

        #endregion

        #region Shadow

-        // note
-        // shadowing is thread-safe, but entering and exiting shadow mode is not, and there is only one
-        // global shadow for the entire application, so great care should be taken to ensure that the
-        // application is *not* doing anything else when using a shadow.
-        // shadow applies to well-known filesystems *only* - at the moment, any other filesystem that would
-        // be created directly (via ctor) or via GetFileSystemProvider<T> is *not* shadowed.
-
-        // shadow must be enabled in an app event handler before anything else ie before any filesystem
-        // is actually created and used - after, it is too late - enabling shadow has a neglictible perfs
-        // impact.
-        // NO! by the time an app event handler is instanciated it is already too late, see note in ctor.
-        //internal void EnableShadow()
-        //{
-        //    if (_mvcViewsFileSystem != null) // test one of the fs...
-        //        throw new InvalidOperationException("Cannot enable shadow once filesystems have been created.");
-        //    _shadowEnabled = true;
-        //}
-
-        public ICompletable Shadow(Guid id)
+        internal ICompletable Shadow(Guid id)
        {
            var typed = _wrappers.ToArray();
            var wrappers = new ShadowWrapper[typed.Length + 7];
            var i = 0;
            while (i < typed.Length) wrappers[i] = typed[i++];
-            wrappers[i++] = _macroPartialFileSystemWrapper;
-            wrappers[i++] = _partialViewsFileSystemWrapper;
-            wrappers[i++] = _stylesheetsFileSystemWrapper;
-            wrappers[i++] = _scriptsFileSystemWrapper;
-            wrappers[i++] = _xsltFileSystemWrapper;
-            wrappers[i++] = _masterPagesFileSystemWrapper;
-            wrappers[i] = _mvcViewsFileSystemWrapper;
+            wrappers[i++] = _macroPartialFileSystem;
+            wrappers[i++] = _partialViewsFileSystem;
+            wrappers[i++] = _stylesheetsFileSystem;
+            wrappers[i++] = _scriptsFileSystem;
+            wrappers[i++] = _xsltFileSystem;
+            wrappers[i++] = _masterPagesFileSystem;
+            wrappers[i] = _mvcViewsFileSystem;

-            return ShadowFileSystemsScope.CreateScope(id, wrappers);
+            return new ShadowFileSystems(id, wrappers);
        }

        #endregion

-        private class WeakSet<T>
+        private class ConcurrentSet<T>
            where T : class
        {
-            private readonly HashSet<WeakReference<T>> _set = new HashSet<WeakReference<T>>();
+            private readonly HashSet<T> _set = new HashSet<T>();

            public void Add(T item)
            {
                lock (_set)
                {
-                    _set.Add(new WeakReference<T>(item));
-                    CollectLocked();
+                    _set.Add(item);
+                }
+            }
+
+            public void Clear()
+            {
+                lock (_set)
+                {
+                    _set.Clear();
                }
            }

@@ -241,23 +293,9 @@ namespace Umbraco.Core.IO
            {
                lock (_set)
                {
-                    CollectLocked();
-                    return _set.Select(x =>
-                    {
-                        T target;
-                        return x.TryGetTarget(out target) ? target : null;
-                    }).WhereNotNull().ToArray();
+                    return _set.ToArray();
                }
            }
-
-            private void CollectLocked()
-            {
-                _set.RemoveWhere(x =>
-                {
-                    T target;
-                    return x.TryGetTarget(out target) == false;
-                });
-            }
        }
    }
 }
@@ -109,5 +109,24 @@ namespace Umbraco.Core.IO
 	        var wrapped2 = Wrapped as IFileSystem2;
 	        return wrapped2 == null ? Wrapped.GetSize(path) : wrapped2.GetSize(path);
 	    }
+
+        // explicitely implementing - not breaking
+        bool IFileSystem2.CanAddPhysical
+	    {
+	        get
+	        {
+                var wrapped2 = Wrapped as IFileSystem2;
+	            return wrapped2 != null && wrapped2.CanAddPhysical;
+	        }
+        }
+
+        // explicitely implementing - not breaking
+	    void IFileSystem2.AddFile(string path, string physicalPath, bool overrideIfExists, bool copy)
+	    {
+            var wrapped2 = Wrapped as IFileSystem2;
+            if (wrapped2 == null)
+                throw new NotSupportedException();
+	        wrapped2.AddFile(path, physicalPath, overrideIfExists, copy);
+	    }
    }
 }
@@ -4,38 +4,144 @@ using System.IO;

 namespace Umbraco.Core.IO
 {
-	public interface IFileSystem
+    /// <summary>
+    /// Provides methods allowing the manipulation of files within an Umbraco application.
+    /// </summary>
+    public interface IFileSystem
    {
+        /// <summary>
+        /// Gets all directories matching the given path.
+        /// </summary>
+        /// <param name="path">The path to the directories.</param>
+        /// <returns>
+        /// The <see cref="IEnumerable{String}"/> representing the matched directories.
+        /// </returns>
        IEnumerable<string> GetDirectories(string path);

+        /// <summary>
+        /// Deletes the specified directory.
+        /// </summary>
+        /// <param name="path">The name of the directory to remove.</param>
        void DeleteDirectory(string path);

+        /// <summary>
+        /// Deletes the specified directory and, if indicated, any subdirectories and files in the directory.
+        /// </summary>
+        /// <remarks>Azure blob storage has no real concept of directories so deletion is always recursive.</remarks>
+        /// <param name="path">The name of the directory to remove.</param>
+        /// <param name="recursive">Whether to remove directories, subdirectories, and files in path.</param>
        void DeleteDirectory(string path, bool recursive);

+        /// <summary>
+        /// Determines whether the specified directory exists.
+        /// </summary>
+        /// <param name="path">The directory to check.</param>
+        /// <returns>
+        /// <c>True</c> if the directory exists and the user has permission to view it; otherwise <c>false</c>.
+        /// </returns>
        bool DirectoryExists(string path);

+        /// <summary>
+        /// Adds a file to the file system.
+        /// </summary>
+        /// <param name="path">The path to the given file.</param>
+        /// <param name="stream">The <see cref="Stream"/> containing the file contents.</param>
        void AddFile(string path, Stream stream);

+        /// <summary>
+        /// Adds a file to the file system.
+        /// </summary>
+        /// <param name="path">The path to the given file.</param>
+        /// <param name="stream">The <see cref="Stream"/> containing the file contents.</param>
+        /// <param name="overrideIfExists">Whether to override the file if it already exists.</param>
        void AddFile(string path, Stream stream, bool overrideIfExists);

+        /// <summary>
+        /// Gets all files matching the given path.
+        /// </summary>
+        /// <param name="path">The path to the files.</param>
+        /// <returns>
+        /// The <see cref="IEnumerable{String}"/> representing the matched files.
+        /// </returns>
        IEnumerable<string> GetFiles(string path);

+        /// <summary>
+        /// Gets all files matching the given path and filter.
+        /// </summary>
+        /// <param name="path">The path to the files.</param>
+        /// <param name="filter">A filter that allows the querying of file extension. <example>*.jpg</example></param>
+        /// <returns>
+        /// The <see cref="IEnumerable{String}"/> representing the matched files.
+        /// </returns>
        IEnumerable<string> GetFiles(string path, string filter);

+        /// <summary>
+        /// Gets a <see cref="Stream"/> representing the file at the gieven path.
+        /// </summary>
+        /// <param name="path">The path to the file.</param>
+        /// <returns>
+        /// <see cref="Stream"/>.
+        /// </returns>
        Stream OpenFile(string path);

+        /// <summary>
+        /// Deletes the specified file.
+        /// </summary>
+        /// <param name="path">The name of the file to remove.</param>
        void DeleteFile(string path);

+        /// <summary>
+        /// Determines whether the specified file exists.
+        /// </summary>
+        /// <param name="path">The file to check.</param>
+        /// <returns>
+        /// <c>True</c> if the file exists and the user has permission to view it; otherwise <c>false</c>.
+        /// </returns>
        bool FileExists(string path);

+        /// <summary>
+        /// Returns the application relative path to the file.
+        /// </summary>
+        /// <param name="fullPathOrUrl">The full path or url.</param>
+        /// <returns>
+        /// The <see cref="string"/> representing the relative path.
+        /// </returns>
        string GetRelativePath(string fullPathOrUrl);

+        /// <summary>
+        /// Gets the full qualified path to the file.
+        /// </summary>
+        /// <param name="path">The file to return the full path for.</param>
+        /// <returns>
+        /// The <see cref="string"/> representing the full path.
+        /// </returns>
        string GetFullPath(string path);

+        /// <summary>
+        /// Returns the application relative url to the file.
+        /// </summary>
+        /// <param name="path">The path to return the url for.</param>
+        /// <returns>
+        /// <see cref="string"/> representing the relative url.
+        /// </returns>
        string GetUrl(string path);

+        /// <summary>
+        /// Gets the last modified date/time of the file, expressed as a UTC value.
+        /// </summary>
+        /// <param name="path">The path to the file.</param>
+        /// <returns>
+        /// <see cref="DateTimeOffset"/>.
+        /// </returns>
        DateTimeOffset GetLastModified(string path);

+        /// <summary>
+        /// Gets the created date/time of the file, expressed as a UTC value.
+        /// </summary>
+        /// <param name="path">The path to the file.</param>
+        /// <returns>
+        /// <see cref="DateTimeOffset"/>.
+        /// </returns>
        DateTimeOffset GetCreated(string path);
    }

@@ -44,6 +150,10 @@ namespace Umbraco.Core.IO
    {
        long GetSize(string path);

+        bool CanAddPhysical { get; }
+
+        void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false);
+
        // TODO: implement these
        //
        //void CreateDirectory(string path);
@@ -4,11 +4,11 @@ using System.Globalization;
 using System.Reflection;
 using System.IO;
 using System.Configuration;
+using System.Linq;
 using System.Web;
 using System.Text.RegularExpressions;
 using System.Web.Hosting;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;

 namespace Umbraco.Core.IO
 {
@@ -351,7 +351,54 @@ namespace Umbraco.Core.IO
                    writer.Write(contents);
                }
 	        }
-	            
-	    }
+
+        }
+
+        /// <summary>
+        /// Checks if a given path is a full path including drive letter
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        // From: http://stackoverflow.com/a/35046453/5018
+        internal static bool IsFullPath(this string path)
+        {
+            return string.IsNullOrWhiteSpace(path) == false
+                && path.IndexOfAny(Path.GetInvalidPathChars().ToArray()) == -1
+                && Path.IsPathRooted(path)
+                && Path.GetPathRoot(path).Equals(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal) == false;
+        }
+
+        /// <summary>
+        /// Get properly formatted relative path from an existing absolute or relative path
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        internal static string GetRelativePath(this string path)
+        {
+            if (path.IsFullPath())
+            {
+                var rootDirectory = GetRootDirectorySafe();
+                var relativePath = path.ToLowerInvariant().Replace(rootDirectory.ToLowerInvariant(), string.Empty);
+                path = relativePath;
+            }
+
+            return path.EnsurePathIsApplicationRootPrefixed();
+        }
+
+        /// <summary>
+        /// Ensures that a path has `~/` as prefix
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        internal static string EnsurePathIsApplicationRootPrefixed(this string path)
+        {
+            if (path.StartsWith("~/"))
+                return path;
+            if (path.StartsWith("/") == false && path.StartsWith("\\") == false)
+                path = string.Format("/{0}", path);
+            if (path.StartsWith("~") == false)
+                path = string.Format("~{0}", path);
+            return path;
+        }
    }
 }
@@ -7,6 +7,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
@@ -24,11 +25,13 @@ namespace Umbraco.Core.IO
 	{
 	    private readonly IContentSection _contentConfig;
        private readonly UploadAutoFillProperties _uploadAutoFillProperties;
+	    private readonly ILogger _logger;

        private readonly object _folderCounterLock = new object();
        private long _folderCounter;
        private bool _folderCounterInitialized;

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        private static readonly Dictionary<int, string> DefaultSizes = new Dictionary<int, string>
        {
            { 100, "thumb" },
@@ -42,6 +45,7 @@ namespace Umbraco.Core.IO
        public MediaFileSystem(IFileSystem wrapped, IContentSection contentConfig, ILogger logger)
            : base(wrapped)
        {
+            _logger = logger;
            _contentConfig = contentConfig;
            _uploadAutoFillProperties = new UploadAutoFillProperties(this, logger, contentConfig);
        }
@@ -99,7 +103,7 @@ namespace Umbraco.Core.IO
            }
            else
            {
-                // new scheme: path is "<cuid>-<puid>/<filename>" OR "<cuid>-<puid>-<filename>"
+                // new scheme: path is "<xuid>/<filename>" where xuid is a combination of cuid and puid
                // default media filesystem maps to "~/media/<filepath>"
                // assumes that cuid and puid keys can be trusted - and that a single property type
                // for a single content cannot store two different files with the same name
@@ -260,7 +264,7 @@ namespace Umbraco.Core.IO
            var filename = Path.GetFileName(sourcepath);
            var filepath = GetMediaPath(filename, content.Key, propertyType.Key);
            this.CopyFile(sourcepath, filepath);
-            CopyThumbnails(sourcepath, filepath);
+            
            return filepath;
        }

@@ -299,7 +303,7 @@ namespace Umbraco.Core.IO
        {
            var property = GetProperty(content, propertyTypeAlias);
            var svalue = property.Value as string;
-            var oldpath = svalue == null ? null : GetRelativePath(svalue); // FIXME DELETE?
+            var oldpath = svalue == null ? null : GetRelativePath(svalue);
            if (string.IsNullOrWhiteSpace(oldpath) == false && oldpath != filepath)
                DeleteFile(oldpath, true);
            property.Value = GetUrl(filepath);
@@ -309,29 +313,17 @@ namespace Umbraco.Core.IO
            }
        }

-        // sets a file for the FileUpload property editor
-        // ie generates thumbnails and populates autofill properties
+        /// <summary>
+        /// Sets a file for the FileUpload property editor and populates autofill properties
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="property"></param>
+        /// <param name="filepath"></param>
+        /// <param name="filestream"></param>
        private void SetUploadFile(IContentBase content, Property property, string filepath, Stream filestream)
-        {
-            // check if file is an image (and supports resizing and thumbnails etc)
-            var extension = Path.GetExtension(filepath);
-            var isImage = IsImageFile(extension);
-
-            // specific stuff for images (thumbnails etc)
-            if (isImage)
-            {
-                using (var image = Image.FromStream(filestream))
-                {
-                    // use one image for all
-                    GenerateThumbnails(image, filepath, property.PropertyType);
-                    _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream, image);
-                }
-            }
-            else
-            {
-                // will use filepath for extension, and filestream for length
-                _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream);
-            }
+        {            
+            // will use filepath for extension, and filestream for length
+            _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream);
        }

        #endregion
@@ -398,6 +390,7 @@ namespace Umbraco.Core.IO

        // note: this does not find 'custom' thumbnails?
        // will find _thumb and _big-thumb but NOT _custom?
+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public IEnumerable<string> GetThumbnails(string path)
        {
            var parentDirectory = Path.GetDirectoryName(path);
@@ -418,12 +411,14 @@ namespace Umbraco.Core.IO
            DeleteThumbnails(path);
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public void DeleteThumbnails(string path)
        {
            GetThumbnails(path)
                .ForEach(x => base.DeleteFile(x));
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public void CopyThumbnails(string sourcePath, string targetPath)
        {
            var targetPathBase = Path.GetDirectoryName(targetPath) ?? "";
@@ -435,10 +430,48 @@ namespace Umbraco.Core.IO
            }
        }

+	    public void DeleteMediaFiles(IEnumerable<string> files)
+	    {
+            files = files.Distinct();
+
+            Parallel.ForEach(files, file =>
+            {
+                try
+                {
+                    if (file.IsNullOrWhiteSpace()) return;
+
+                    if (FileExists(file) == false) return;
+                    DeleteFile(file, true);
+
+                    if (UseTheNewMediaPathScheme == false)
+                    {
+                        // old scheme: filepath is "<int>/<filename>" OR "<int>-<filename>"
+                        // remove the directory if any
+                        var dir = Path.GetDirectoryName(file);
+                        if (string.IsNullOrWhiteSpace(dir) == false)
+                            DeleteDirectory(dir, true);
+                    }
+                    else
+                    {
+                        // new scheme: path is "<xuid>/<filename>" where xuid is a combination of cuid and puid
+                        // remove the directory
+                        var dir = Path.GetDirectoryName(file);
+                        DeleteDirectory(dir, true);
+                    }
+                }
+                catch (Exception e)
+                {
+                    _logger.Error<MediaFileSystem>("Failed to delete attached file \"" + file + "\".", e);
+                }
+            });
+        }
+
+
        #endregion

        #region GenerateThumbnails

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public IEnumerable<ResizedImage> GenerateThumbnails(
            Image image,
            string filepath,
@@ -460,6 +493,7 @@ namespace Umbraco.Core.IO
            return GenerateThumbnails(image, filepath, additionalSizes);
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public IEnumerable<ResizedImage> GenerateThumbnails(
            Image image,
            string filepath,
@@ -482,19 +516,21 @@ namespace Umbraco.Core.IO
                .ToList(); // now
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public IEnumerable<ResizedImage> GenerateThumbnails(
            Stream filestream,
            string filepath,
            PropertyType propertyType)
        {
            // get the original image from the original stream
-            if (filestream.CanSeek) filestream.Seek(0, 0); // fixme - what if we cannot seek?
+            if (filestream.CanSeek) filestream.Seek(0, 0);
            using (var image = Image.FromStream(filestream))
            {
                return GenerateThumbnails(image, filepath, propertyType);
            }
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public IEnumerable<ResizedImage> GenerateThumbnails(
            Image image,
            string filepath,
@@ -516,16 +552,19 @@ namespace Umbraco.Core.IO

        #region GenerateResized - Generate at resized filepath derived from origin filepath

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int maxWidthHeight)
        {
            return GenerateResized(originImage, originFilepath, sizeName, maxWidthHeight, -1, -1);
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int fixedWidth, int fixedHeight)
        {
            return GenerateResized(originImage, originFilepath, sizeName, -1, fixedWidth, fixedHeight);
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int maxWidthHeight, int fixedWidth, int fixedHeight)
        {
            if (string.IsNullOrWhiteSpace(sizeName))
@@ -541,16 +580,19 @@ namespace Umbraco.Core.IO

        #region GenerateResizedAt - Generate at specified resized filepath

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public ResizedImage GenerateResizedAt(Image originImage, string resizedFilepath, int maxWidthHeight)
        {
            return GenerateResizedAt(originImage, resizedFilepath, maxWidthHeight, -1, -1);
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public ResizedImage GenerateResizedAt(Image originImage, int fixedWidth, int fixedHeight, string resizedFilepath)
        {
            return GenerateResizedAt(originImage, resizedFilepath, -1, fixedWidth, fixedHeight);
        }

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public ResizedImage GenerateResizedAt(Image originImage, string resizedFilepath, int maxWidthHeight, int fixedWidth, int fixedHeight)
        {
            // target dimensions
@@ -597,9 +639,6 @@ namespace Umbraco.Core.IO
                var rect = new Rectangle(0, 0, width, height);
                graphics.DrawImage(originImage, rect, 0, 0, originImage.Width, originImage.Height, GraphicsUnit.Pixel);

-                // copy metadata
-                // fixme - er... no?
-
                // get an encoder - based upon the file type
                var extension = (Path.GetExtension(resizedFilepath) ?? "").TrimStart('.').ToLowerInvariant();
                var encoders = ImageCodecInfo.GetImageEncoders();
@@ -662,6 +701,7 @@ namespace Umbraco.Core.IO

        #region Inner classes

+        [Obsolete("This should no longer be used, image manipulation should be done via ImageProcessor, Umbraco no longer generates '_thumb' files for media")]
        public class ResizedImage
        {
            public ResizedImage()
@@ -155,8 +155,10 @@ namespace Umbraco.Core.IO
            if (directory == null) throw new InvalidOperationException("Could not get directory.");
            Directory.CreateDirectory(directory); // ensure it exists

-            if (stream.CanSeek) // fixme - what else?
-                stream.Seek(0, 0);
+            // if can seek, be safe and go back to start, else...
+            // hope that the stream hasn't been read already
+            if (stream.CanSeek)
+                stream.Seek(0, SeekOrigin.Begin);

            using (var destination = (Stream) File.Create(fullPath))
                stream.CopyTo(destination);
@@ -286,7 +288,9 @@ namespace Umbraco.Core.IO
            var opath = path;
            path = EnsureDirectorySeparatorChar(path);

-            // fixme - this part should go!
+            // TODO in v8 this should be cleaned up
+            // the first part should probably removed
+
            // not sure what we are doing here - so if input starts with a (back) slash,
            // we assume it's not a FS relative path and we try to convert it... but it
            // really makes little sense?
@@ -364,6 +368,29 @@ namespace Umbraco.Core.IO
            return file.Exists ? file.Length : -1;
        }

+        public bool CanAddPhysical { get { return true; } }
+
+        public void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false)
+        {
+            var fullPath = GetFullPath(path);
+
+            if (File.Exists(fullPath))
+            {
+                if (overrideIfExists == false)
+                    throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
+                File.Delete(fullPath);
+            }
+
+            var directory = Path.GetDirectoryName(fullPath);
+            if (directory == null) throw new InvalidOperationException("Could not get directory.");
+            Directory.CreateDirectory(directory); // ensure it exists
+
+            if (copy)
+                File.Copy(physicalPath, fullPath);
+            else
+                File.Move(physicalPath, fullPath);
+        }
+
        #region Helper Methods

        protected virtual void EnsureDirectory(string path)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;

 namespace Umbraco.Core.IO
 {
@@ -33,8 +34,16 @@ namespace Umbraco.Core.IO
                    {
                        try
                        {
-                            using (var stream = _sfs.OpenFile(kvp.Key))
-                                _fs.AddFile(kvp.Key, stream, true);
+                            var fs2 = _fs as IFileSystem2;
+                            if (fs2 != null && fs2.CanAddPhysical)
+                            {
+                                fs2.AddFile(kvp.Key, _sfs.GetFullPath(kvp.Key)); // overwrite, move
+                            }
+                            else
+                            {
+                                using (var stream = _sfs.OpenFile(kvp.Key))
+                                    _fs.AddFile(kvp.Key, stream, true);
+                            }
                        }
                        catch (Exception e)
                        {
@@ -201,19 +210,20 @@ namespace Umbraco.Core.IO

        public IEnumerable<string> GetFiles(string path)
        {
-            var normPath = NormPath(path);
-            var shadows = Nodes.Where(kvp => IsChild(normPath, kvp.Key)).ToArray();
-            var files = _fs.GetFiles(path);
-            return files
-                .Except(shadows.Where(kvp => (kvp.Value.IsFile && kvp.Value.IsDelete) || kvp.Value.IsDir)
-                    .Select(kvp => kvp.Key))
-                .Union(shadows.Where(kvp => kvp.Value.IsFile && kvp.Value.IsExist).Select(kvp => kvp.Key))
-                .Distinct();
+            return GetFiles(path, null);
        }

        public IEnumerable<string> GetFiles(string path, string filter)
        {
-            return _fs.GetFiles(path, filter);
+            var normPath = NormPath(path);
+            var shadows = Nodes.Where(kvp => IsChild(normPath, kvp.Key)).ToArray();
+            var files = filter != null ? _fs.GetFiles(path, filter) : _fs.GetFiles(path);
+            var wildcard = filter == null ? null : new WildcardExpression(filter);
+            return files
+                .Except(shadows.Where(kvp => (kvp.Value.IsFile && kvp.Value.IsDelete) || kvp.Value.IsDir)
+                    .Select(kvp => kvp.Key))
+                .Union(shadows.Where(kvp => kvp.Value.IsFile && kvp.Value.IsExist && (wildcard == null || wildcard.IsMatch(kvp.Key))).Select(kvp => kvp.Key))
+                .Distinct();
        }

        public Stream OpenFile(string path)
@@ -245,6 +255,9 @@ namespace Umbraco.Core.IO

        public string GetFullPath(string path)
        {
+            ShadowNode sf;
+            if (Nodes.TryGetValue(NormPath(path), out sf))
+                return sf.IsDir || sf.IsDelete ? null : _sfs.GetFullPath(path);
            return _fs.GetFullPath(path);
        }

@@ -282,5 +295,96 @@ namespace Umbraco.Core.IO
            if (sf.IsDelete || sf.IsDir) throw new InvalidOperationException("Invalid path.");
            return _sfs.GetSize(path);
        }
+
+        public bool CanAddPhysical { get { return true; } }
+
+        public void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false)
+        {
+            ShadowNode sf;
+            var normPath = NormPath(path);
+            if (Nodes.TryGetValue(normPath, out sf) && sf.IsExist && (sf.IsDir || overrideIfExists == false))
+                throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
+
+            var parts = normPath.Split('/');
+            for (var i = 0; i < parts.Length - 1; i++)
+            {
+                var dirPath = string.Join("/", parts.Take(i + 1));
+                ShadowNode sd;
+                if (Nodes.TryGetValue(dirPath, out sd))
+                {
+                    if (sd.IsFile) throw new InvalidOperationException("Invalid path.");
+                    if (sd.IsDelete) Nodes[dirPath] = new ShadowNode(false, true);
+                }
+                else
+                {
+                    if (_fs.DirectoryExists(dirPath)) continue;
+                    if (_fs.FileExists(dirPath)) throw new InvalidOperationException("Invalid path.");
+                    Nodes[dirPath] = new ShadowNode(false, true);
+                }
+            }
+
+            _sfs.AddFile(path, physicalPath, overrideIfExists, copy);
+            Nodes[normPath] = new ShadowNode(false, false);
+        }
+
+        // copied from System.Web.Util.Wildcard internal
+        internal class WildcardExpression
+        {
+            private readonly string _pattern;
+            private readonly bool _caseInsensitive;
+            private Regex _regex;
+
+            private static Regex metaRegex = new Regex("[\\+\\{\\\\\\[\\|\\(\\)\\.\\^\\$]");
+            private static Regex questRegex = new Regex("\\?");
+            private static Regex starRegex = new Regex("\\*");
+            private static Regex commaRegex = new Regex(",");
+            private static Regex slashRegex = new Regex("(?=/)");
+            private static Regex backslashRegex = new Regex("(?=[\\\\:])");
+
+            public WildcardExpression(string pattern, bool caseInsensitive = true)
+            {
+                _pattern = pattern;
+                _caseInsensitive = caseInsensitive;
+            }
+
+            private void EnsureRegex(string pattern)
+            {
+                if (_regex != null) return;
+
+                var options = RegexOptions.None;
+
+                // match right-to-left (for speed) if the pattern starts with a *
+
+                if (pattern.Length > 0 && pattern[0] == '*')
+                    options = RegexOptions.RightToLeft | RegexOptions.Singleline;
+                else
+                    options = RegexOptions.Singleline;
+
+                // case insensitivity
+
+                if (_caseInsensitive)
+                    options |= RegexOptions.IgnoreCase | RegexOptions.CultureInvariant;
+
+                // Remove regex metacharacters
+
+                pattern = metaRegex.Replace(pattern, "\\$0");
+
+                // Replace wildcard metacharacters with regex codes
+
+                pattern = questRegex.Replace(pattern, ".");
+                pattern = starRegex.Replace(pattern, ".*");
+                pattern = commaRegex.Replace(pattern, "\\z|\\A");
+
+                // anchor the pattern at beginning and end, and return the regex
+
+                _regex = new Regex("\\A" + pattern + "\\z", options);
+            }
+
+            public bool IsMatch(string input)
+            {
+                EnsureRegex(_pattern);
+                return _regex.IsMatch(input);
+            }
+        }
    }
 }
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.IO
+{
+    internal class ShadowFileSystems : ICompletable
+    {
+        // note: taking a reference to the _manager instead of using manager.Current
+        // to avoid using Current everywhere but really, we support only 1 scope at
+        // a time, not multiple scopes in case of multiple managers (not supported)
+
+        private static readonly object Locker = new object();
+        private static Guid _currentId = Guid.Empty;
+        private readonly Guid _id;
+        private readonly ShadowWrapper[] _wrappers;
+        private bool _completed;
+
+        public ShadowFileSystems(Guid id, ShadowWrapper[] wrappers)
+        {
+            lock (Locker)
+            {
+                if (_currentId != Guid.Empty)
+                    throw new InvalidOperationException("Already shadowing.");
+                _currentId = id;
+
+                LogHelper.Debug<ShadowFileSystems>("Shadow " + id + ".");
+                _id = id;
+                _wrappers = wrappers;
+                foreach (var wrapper in _wrappers)
+                    wrapper.Shadow(id);
+            }
+        }
+
+        public void Complete()
+        {
+            _completed = true;
+        }
+
+        public void Dispose()
+        {
+            lock (Locker)
+            {
+                LogHelper.Debug<ShadowFileSystems>("UnShadow " + _id + " (" + (_completed ? "complete" : "abort") + ").");
+
+                var exceptions = new List<Exception>();
+                foreach (var wrapper in _wrappers)
+                {
+                    try
+                    {
+                        // this may throw an AggregateException if some of the changes could not be applied
+                        wrapper.UnShadow(_completed);
+                    }
+                    catch (AggregateException ae)
+                    {
+                        exceptions.Add(ae);
+                    }
+                }
+
+                _currentId = Guid.Empty;
+
+                if (exceptions.Count > 0)
+                    throw new AggregateException(_completed ? "Failed to apply all changes (see exceptions)." : "Failed to abort (see exceptions).", exceptions);
+            }
+        }
+
+        // for tests
+        internal static void ResetId()
+        {
+            _currentId = Guid.Empty;
+        }
+    }
+}
@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Remoting.Messaging;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.IO
-{
-    internal class ShadowFileSystemsScope : ICompletable
-    {
-        // note: taking a reference to the _manager instead of using manager.Current
-        // to avoid using Current everywhere but really, we support only 1 scope at
-        // a time, not multiple scopes in case of multiple managers (not supported)
-
-        private const string ItemKey = "Umbraco.Core.IO.ShadowFileSystemsScope";
-        private static readonly object Locker = new object();
-        private readonly Guid _id;
-        private readonly ShadowWrapper[] _wrappers;
-
-        static ShadowFileSystemsScope()
-        {
-            SafeCallContext.Register(
-                () =>
-                {
-                    var scope = CallContext.LogicalGetData(ItemKey);
-                    CallContext.FreeNamedDataSlot(ItemKey);
-                    return scope;
-                },
-                o =>
-                {
-                    if (CallContext.LogicalGetData(ItemKey) != null) throw new InvalidOperationException();
-                    if (o != null) CallContext.LogicalSetData(ItemKey, o);
-                });
-        }
-
-        private ShadowFileSystemsScope(Guid id, ShadowWrapper[] wrappers)
-        {
-            LogHelper.Debug<ShadowFileSystemsScope>("Shadow " + id + ".");
-            _id = id;
-            _wrappers = wrappers;
-            foreach (var wrapper in _wrappers)
-                wrapper.Shadow(id);
-        }
-
-        // internal for tests + FileSystemProviderManager
-        // do NOT use otherwise
-        internal static ShadowFileSystemsScope CreateScope(Guid id, ShadowWrapper[] wrappers)
-        {
-            lock (Locker)
-            {
-                if (CallContext.LogicalGetData(ItemKey) != null) throw new InvalidOperationException("Already shadowing.");
-                CallContext.LogicalSetData(ItemKey, ItemKey); // value does not matter
-            }
-            return new ShadowFileSystemsScope(id, wrappers);
-        }
-
-        internal static bool InScope
-        {
-            get { return NoScope == false; }
-        }
-
-        internal static bool NoScope
-        {
-            get { return CallContext.LogicalGetData(ItemKey) == null; }
-        }
-
-        public void Complete()
-        {
-            lock (Locker)
-            {
-                LogHelper.Debug<ShadowFileSystemsScope>("UnShadow " + _id + " (complete).");
-
-                var exceptions = new List<Exception>();
-                foreach (var wrapper in _wrappers)
-                {
-                    try
-                    {
-                        // this may throw an AggregateException if some of the changes could not be applied
-                        wrapper.UnShadow(true);
-                    }
-                    catch (AggregateException ae)
-                    {
-                        exceptions.Add(ae);
-                    }
-                }
-
-                if (exceptions.Count > 0)
-                    throw new AggregateException("Failed to apply all changes (see exceptions).", exceptions);
-
-                // last, & *only* if successful (otherwise we'll unshadow & cleanup as best as we can)
-                CallContext.FreeNamedDataSlot(ItemKey);
-            }
-        }
-
-        public void Dispose()
-        {
-            lock (Locker)
-            {
-                if (CallContext.LogicalGetData(ItemKey) == null) return;
-
-                try
-                {
-                    LogHelper.Debug<ShadowFileSystemsScope>("UnShadow " + _id + " (abort)");
-                    foreach (var wrapper in _wrappers)
-                        wrapper.UnShadow(false); // should not throw
-                }
-                finally
-                {
-                    // last, & always
-                    CallContext.FreeNamedDataSlot(ItemKey);
-                }
-            }
-        }
-    }
-}
@@ -2,20 +2,23 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Umbraco.Core.Scoping;

 namespace Umbraco.Core.IO
 {
    internal class ShadowWrapper : IFileSystem2
    {
+        private readonly IScopeProviderInternal _scopeProvider;
        private readonly IFileSystem _innerFileSystem;
        private readonly string _shadowPath;
        private ShadowFileSystem _shadowFileSystem;
        private string _shadowDir;

-        public ShadowWrapper(IFileSystem innerFileSystem, string shadowPath)
+        public ShadowWrapper(IFileSystem innerFileSystem, string shadowPath, IScopeProviderInternal scopeProvider)
        {
            _innerFileSystem = innerFileSystem;
            _shadowPath = shadowPath;
+            _scopeProvider = scopeProvider;
        }

        internal void Shadow(Guid id)
@@ -24,7 +27,7 @@ namespace Umbraco.Core.IO
            // on ShadowFileSystemsScope.None - and if None is false then we should be running
            // in a single thread anyways

-            var virt = "~/App_Data/Shadow/" + id + "/" + _shadowPath;
+            var virt = "~/App_Data/TEMP/ShadowFs/" + id + "/" + _shadowPath;
            _shadowDir = IOHelper.MapPath(virt);
            Directory.CreateDirectory(_shadowDir);
            var tempfs = new PhysicalFileSystem(virt);
@@ -62,7 +65,19 @@ namespace Umbraco.Core.IO

        private IFileSystem FileSystem
        {
-            get { return ShadowFileSystemsScope.NoScope ? _innerFileSystem : _shadowFileSystem; }
+            get
+            {
+                var isScoped = _scopeProvider != null && _scopeProvider.AmbientScope != null && _scopeProvider.AmbientScope.ScopedFileSystems;
+
+                // if the filesystem is created *after* shadowing starts, it won't be shadowing
+                // better not ignore that situation and raised a meaningful (?) exception
+                if (isScoped && _shadowFileSystem == null)
+                    throw new Exception("The filesystems are shadowing, but this filesystem is not.");
+
+                return isScoped
+                    ? _shadowFileSystem
+                    : _innerFileSystem;
+            }
        }

        public IEnumerable<string> GetDirectories(string path)
@@ -154,5 +169,22 @@ namespace Umbraco.Core.IO
            var filesystem2 = filesystem as IFileSystem2;
            return filesystem2 == null ? filesystem.GetSize(path) : filesystem2.GetSize(path);
        }
+
+        public bool CanAddPhysical
+        {
+            get
+            {
+                var fileSystem2 = FileSystem as IFileSystem2;
+                return fileSystem2 != null && fileSystem2.CanAddPhysical;
+            }
+        }
+
+        public void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false)
+        {
+            var fileSystem2 = FileSystem as IFileSystem2;
+            if (fileSystem2 == null)
+                throw new NotSupportedException();
+            fileSystem2.AddFile(path, physicalPath, overrideIfExists, copy);
+        }
    }
 }
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Configuration;
 using System.IO;
 using System.Linq;
@@ -72,15 +73,28 @@ namespace Umbraco.Core.IO
        {
            get
            {
-                if (GlobalSettings.ContentCacheXmlStoredInCodeGen && SystemUtilities.GetCurrentTrustLevel() == AspNetHostingPermissionLevel.Unrestricted)
-                {
-                    return Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco.config");
+                switch (GlobalSettings.ContentCacheXmlStorageLocation)
+                {                    
+                    case ContentXmlStorage.AspNetTemp:
+                        return Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco.config");
+                    case ContentXmlStorage.EnvironmentTemp:
+                        var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
+                        var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoXml",
+                            //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                            // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                            // utilizing an old path
+                            appDomainHash);
+                        return Path.Combine(cachePath, "umbraco.config");
+                    case ContentXmlStorage.Default:
+                        return IOHelper.ReturnPath("umbracoContentXML", "~/App_Data/umbraco.config");
+                    default:
+                        throw new ArgumentOutOfRangeException();
                }
-                return IOHelper.ReturnPath("umbracoContentXML", "~/App_Data/umbraco.config");
            }
        }

        [Obsolete("Use GlobalSettings.ContentCacheXmlStoredInCodeGen instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        internal static bool ContentCacheXmlStoredInCodeGen
        {
            get { return GlobalSettings.ContentCacheXmlStoredInCodeGen; }
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Logging
    /// This is an old/deprecated logger and has been superceded by ParallelForwardingAppender which is included in Umbraco and 
    /// also by AsyncForwardingAppender in the Log4Net.Async library.
 	/// </summary>
-	[Obsolete("This is superceded by the ParallelForwardingAppender, this will be removed in v8")]
+	[Obsolete("This is superceded by the ParallelForwardingAppender, this will be removed in v8, do not use this")]
    [EditorBrowsable(EditorBrowsableState.Never)]
 	public class AsynchronousRollingFileAppender : RollingFileAppender
 	{
@@ -2,10 +2,13 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Web;
 using log4net;
 using log4net.Config;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Diagnostics;

 namespace Umbraco.Core.Logging
 {
@@ -56,18 +59,72 @@ namespace Umbraco.Core.Logging
 		internal ILog LoggerFor(object getTypeFromInstance)
 		{
 			if (getTypeFromInstance == null) throw new ArgumentNullException("getTypeFromInstance");
-			
+
 			return LogManager.GetLogger(getTypeFromInstance.GetType());
 		}
-        
+
 		public void Error(Type callingType, string message, Exception exception)
 		{
-			var logger = LogManager.GetLogger(callingType);
-			if (logger != null)
-				logger.Error((message), exception);
+            var logger = LogManager.GetLogger(callingType);
+		    if (logger == null) return;
+
+		    var dump = false;
+
+		    if (IsTimeoutThreadAbortException(exception))
+		    {
+		        message += "\r\nThe thread has been aborted, because the request has timed out.";
+
+                // dump if configured, or if stacktrace contains Monitor.ReliableEnter
+		        dump = UmbracoConfig.For.CoreDebug().DumpOnTimeoutThreadAbort || IsMonitorEnterThreadAbortException(exception);
+
+                // dump if it is ok to dump (might have a cap on number of dump...)
+		        dump &= MiniDump.OkToDump();
+		    }
+
+            if (dump)
+		    {
+                try
+                {
+                    var dumped = MiniDump.Dump(withException: true);
+                    message += dumped
+                        ? "\r\nA minidump was created in App_Data/MiniDump"
+                        : "\r\nFailed to create a minidump";
+                }
+                catch (Exception e)
+                {
+                    message += string.Format("\r\nFailed to create a minidump ({0}: {1})", e.GetType().FullName, e.Message);
+                }
+            }
+
+            logger.Error(message, exception);
 		}

-		public void Warn(Type callingType, string message, params Func<object>[] formatItems)
+        private static bool IsMonitorEnterThreadAbortException(Exception exception)
+        {
+            var abort = exception as ThreadAbortException;
+            if (abort == null) return false;
+
+            var stacktrace = abort.StackTrace;
+            return stacktrace.Contains("System.Threading.Monitor.ReliableEnter");
+        }
+
+        private static bool IsTimeoutThreadAbortException(Exception exception)
+        {
+            var abort = exception as ThreadAbortException;
+            if (abort == null) return false;
+
+            if (abort.ExceptionState == null) return false;
+
+            var stateType = abort.ExceptionState.GetType();
+            if (stateType.FullName != "System.Web.HttpApplication+CancelModuleException") return false;
+
+            var timeoutField = stateType.GetField("_timeout", BindingFlags.Instance | BindingFlags.NonPublic);
+            if (timeoutField == null) return false;
+
+            return (bool) timeoutField.GetValue(abort.ExceptionState);
+        }
+
+        public void Warn(Type callingType, string message, params Func<object>[] formatItems)
 		{
 			var logger = LogManager.GetLogger(callingType);
 			if (logger == null || logger.IsWarnEnabled == false) return;
@@ -82,7 +139,7 @@ namespace Umbraco.Core.Logging
 			if (showHttpTrace && HttpContext.Current != null)
 			{
 				HttpContext.Current.Trace.Warn(callingType.Name, string.Format(message, formatItems.Select(x => x.Invoke()).ToArray()));
-			}	
+			}

 			var logger = LogManager.GetLogger(callingType);
 			if (logger == null || logger.IsWarnEnabled == false) return;
@@ -99,7 +156,7 @@ namespace Umbraco.Core.Logging
            var logger = LogManager.GetLogger(callingType);
            if (logger == null || logger.IsWarnEnabled == false) return;
            var executedParams = formatItems.Select(x => x.Invoke()).ToArray();
-            logger.WarnFormat((message) + ". Exception: " + e, executedParams);		
+            logger.WarnFormat((message) + ". Exception: " + e, executedParams);
 		}

 		/// <summary>
--- a/Show More
+++ b/Show More