#3539 - use culture to find the url in the actual redirect

.editorconfig

@@ -34,7 +34,4 @@ dotnet_naming_style.prefix_underscore.required_prefix = _
 csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
 csharp_style_var_elsewhere = true:suggestion
-csharp_prefer_braces = false : none
-
-[*.{js,less}]
-trim_trailing_whitespace = false
+csharp_prefer_braces = false : none

.github/CONTRIBUTING_DETAILED.md

@@ -104,6 +104,7 @@ There's two big areas that you should know about:
   You may need to run the following commands to set up gulp properly:
   ```
   npm cache clean
+  npm install -g bower
   npm install -g gulp
   npm install -g gulp-cli
   npm install

.github/README.md

@@ -1,5 +1,4 @@
 _You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
-[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
 
 _Looking for Umbraco version 7? [Click here](https://github.com/umbraco/Umbraco-CMS) to go to the v7 branch._
 
@@ -7,7 +6,7 @@ _Ready to try out Version 8? [See the quick start guide](V8_GETTING_STARTED.md).
 
 When is Umbraco 8 coming?
 =========================
-When it's ready. We're done with the major parts of the architecture work and are focusing on three separate tracks to prepare Umbraco 8 for release:
+When it's ready. We're done with the major parts of the architecture work and are focusing on three seperate tracks to prepare Umbraco 8 for release:
 1) Editor Track (_currently in progress_). Without editors, there's no market for Umbraco. So we want to make sure that Umbraco 8 is full of love for editors.
 2) Partner Track. Without anyone implementing Umbraco, there's nothing for editors to update. So we want to make sure that Umbraco 8 is a joy to implement
 3) Contributor Track. Without our fabulous ecosystem of both individual Umbracians and 3rd party ISVs, Umbraco wouldn't be as rich a platform as it is today. We want to make sure that it's easy, straight forward and as backwards-compatible as possible to create packages for Umbraco

.github/V8_GETTING_STARTED.md

@@ -11,7 +11,7 @@
 
 * Open the `/src/umbraco.sln` Visual Studio solution
 * Start the solution (easiest way is to use `ctrl + F5`)
-* When the solution is first built this may take some time since it will restore all nuget and npm packages, build the .net solution and also build the angular solution
+* When the solution is first built this may take some time since it will restore all nuget, npm and bower packages, build the .net solution and also build the angular solution
 * When the website starts you'll see the Umbraco installer and just follow the prompts
 * You're all set!
 

.gitignore

@@ -1,163 +1,159 @@
-#
-# Umbraco Cms Git Ignore
-#
-
-# common files
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*.orig
-*.suo
-*.vs10x
-*.ndproj
-*.ignorer.*
-
-# common directories
-.DS_Store
-._.DS_Store
-.vs/
-/local/
-
-# build directories
-[Bb]in/
-[Db]ebug*/
-[Rr]elease*/
-obj/
-
-# tools
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-tools/NDepend/
-
-
-
-
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-[sS]ource
-[sS]andbox
-umbraco.config
-App_Data/TEMP/*
-[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
-[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
-[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
-[Uu]mbraco/[Pp]resentation/[Ff]onts/*
-[Uu]mbraco/[Pp]resentation/[Cc]ss/*
-
-src/Umbraco.Web.UI/[Cc]ss/*
-src/Umbraco.Web.UI/App_Code/*
-src/Umbraco.Web.UI/App_Data/*
-src/Umbraco.Tests/App_Data/*
-src/Umbraco.Web.UI/[Mm]edia/*
-src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
-src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
-!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
-src/Umbraco.Web.UI/[Xx]slt/*
-src/Umbraco.Web.UI/[Ii]mages/*
-src/Umbraco.Web.UI/[Ss]cripts/*
-src/Umbraco.Web.UI/Web.*.config.transformed
-
-umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
-umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
-
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config
-src/Umbraco.Web.UI/[Cc]onfig/serilog.config
-src/Umbraco.Web.UI/[Cc]onfig/serilog.user.config
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/[Vv]iews/*.cshtml
-src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
-src/Umbraco.Web.UI/[Vv]iews/*
-src/packages/
-src/packages/repositories.config
-
-src/Umbraco.Web.UI/[Ww]eb.config
-*.transformed
-
-node_modules
-lib-bower
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/*.loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
-
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-src/Umbraco.Web.UI.Client/vwd.webinfo
-
-src/Umbraco.Web.UI/App_Plugins/*
-src/*.psess
-src/*.vspx
-
-NDependOut/*
-QueryResult.htm
-
-src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
-src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
-src/Umbraco.Web.UI/[Uu]mbraco/plugins/*
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/Umbraco.Web.UI.Client/bower_components/*
-/src/Umbraco.Web.UI/[Uu]mbraco/preview
-/src/Umbraco.Web.UI/[Uu]mbraco/preview.old
-
-# ignore rule for clearing out Belle (avoid rebuilding all the time)
-preserve.belle
-
-#Ignore Rule for output of generated documentation files from Grunt docserve
-src/Umbraco.Web.UI.Client/docs/api
-src/*.boltdata/
-src/umbraco.sln.ide/*
-src/.vs/
-
-src/Umbraco.Web.UI/[Jj]s/*
-src/Umbraco.Tests/[Mm]edia
-tools/docfx/*
-apidocs/_site/*
-src/*/project.lock.json
-src/.idea/*
-
-apidocs/api/*
-build/docs.zip
-build/ui-docs.zip
-build/csharp-docs.zip
-src/packages/
-src/PrecompiledWeb/*
-
-# build
-build.out/
-build.tmp/
-build/hooks/
-build/temp/
-
-
-
-# eof
-/src/Umbraco.Web.UI.Client/TESTS-*.xml
+#
+# Umbraco Cms Git Ignore
+#
+
+# common files
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*.orig
+*.suo
+*.vs10x
+*.ndproj
+
+# common directories
+.DS_Store
+._.DS_Store
+.vs/
+/local/
+
+# build directories
+[Bb]in/
+[Db]ebug*/
+[Rr]elease*/
+obj/
+
+# tools
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+tools/NDepend/
+
+
+
+
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+[sS]ource
+[sS]andbox
+umbraco.config
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+src/Umbraco.Web.UI/[Cc]ss/*
+src/Umbraco.Web.UI/App_Code/*
+src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Tests/App_Data/*
+src/Umbraco.Web.UI/[Mm]edia/*
+src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
+src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
+!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
+src/Umbraco.Web.UI/[Xx]slt/*
+src/Umbraco.Web.UI/[Ii]mages/*
+src/Umbraco.Web.UI/[Ss]cripts/*
+src/Umbraco.Web.UI/Web.*.config.transformed
+
+umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
+umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+
+src/Umbraco.Tests/config/applications.config
+src/Umbraco.Tests/config/trees.config
+src/Umbraco.Web.UI/web.config
+src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+
+node_modules
+lib-bower
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/*.loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+
+src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+src/Umbraco.Web.UI.Client/vwd.webinfo
+
+src/Umbraco.Web.UI/App_Plugins/*
+src/*.psess
+src/*.vspx
+
+NDependOut/*
+QueryResult.htm
+
+src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
+src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
+src/Umbraco.Web.UI/[Uu]mbraco/plugins/*
+build/ApiDocs/*
+build/ApiDocs/Output/*
+src/Umbraco.Web.UI.Client/bower_components/*
+/src/Umbraco.Web.UI/[Uu]mbraco/preview
+/src/Umbraco.Web.UI/[Uu]mbraco/preview.old
+
+# ignore rule for clearing out Belle (avoid rebuilding all the time)
+preserve.belle
+
+#Ignore Rule for output of generated documentation files from Grunt docserve
+src/Umbraco.Web.UI.Client/docs/api
+src/*.boltdata/
+src/umbraco.sln.ide/*
+src/.vs/
+
+src/Umbraco.Web.UI/[Jj]s/*
+src/Umbraco.Tests/[Mm]edia
+tools/docfx/*
+apidocs/_site/*
+src/*/project.lock.json
+src/.idea/*
+
+apidocs/api/*
+build/docs.zip
+build/ui-docs.zip
+build/csharp-docs.zip
+src/packages/
+src/PrecompiledWeb/*
+
+# build
+build.out/
+build.tmp/
+build/hooks/
+build/temp/
+
+
+
+# eof

build/Azure/azuregalleryrelease.ps1

@@ -3,57 +3,57 @@
  [string]$Directory
 )
 $workingDirectory = $Directory
-CD "$($workingDirectory)"
+CD $workingDirectory
 
 # Clone repo
-$fullGitUrl = "https://$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
-git clone $($fullGitUrl) $($env:GIT_REPOSITORYNAME) 2>&1 | % { $_.ToString() } 
+$fullGitUrl = "https://$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
+git clone $fullGitUrl 2>&1 | % { $_.ToString() } 
 
 # Remove everything so that unzipping the release later will update everything
 # Don't remove the readme file nor the git directory
 Write-Host "Cleaning up git directory before adding new version"
-Remove-Item -Recurse "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)\*" -Exclude README.md,.git
+Remove-Item -Recurse $workingDirectory\$env:GIT_REPOSITORYNAME\* -Exclude README.md,.git
 
 # Find release zip
-$zipsDir = "$($workingDirectory)\$($env:BUILD_DEFINITIONNAME)\zips"
+$zipsDir = "$workingDirectory\$env:BUILD_DEFINITIONNAME\zips"
 $pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip"
-Write-Host "Searching for Umbraco release files in $($zipsDir) for a file with pattern $($pattern)"
-$file = (Get-ChildItem "$($zipsDir)" | Where-Object { $_.Name -match "$($pattern)" })
+Write-Host "Searching for Umbraco release files in $workingDirectory\$zipsDir for a file with pattern $pattern"
+$file = (Get-ChildItem $zipsDir | Where-Object { $_.Name -match "$pattern" })
 
 if($file)
 {
     # Get release name
-    $version = [regex]::Match($($file.Name), $($pattern)).captures.groups[1].value
-    $releaseName = "Umbraco $($version)"
-    Write-Host "Found $($releaseName)"
+    $version = [regex]::Match($file.Name, $pattern).captures.groups[1].value
+    $releaseName = "Umbraco $version"
+    Write-Host "Found $releaseName"
     
     # Unzip into repository to update release
     Add-Type -AssemblyName System.IO.Compression.FileSystem
-    Write-Host "Unzipping $($file.FullName) to $($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
-    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)")
+    Write-Host "Unzipping $($file.FullName) to $workingDirectory\$env:GIT_REPOSITORYNAME"
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$workingDirectory\$env:GIT_REPOSITORYNAME")
     
     # Telling git who we are
     git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() }
     git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() }
     
     # Commit
-    CD "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
-    Write-Host "Committing Umbraco $($version) Release from Build Output"
+    CD $env:GIT_REPOSITORYNAME
+    Write-Host "Committing Umbraco $version Release from Build Output"
 
     git add . 2>&1 | % { $_.ToString() } 
-    git commit -m " Release $($releaseName) from Build Output" 2>&1 | % { $_.ToString() } 
+    git commit -m " Release $releaseName from Build Output" 2>&1 | % { $_.ToString() } 
 
     # Tag the release
-    git tag -a "v$($version)" -m "v$($version)"
+    git tag -a "v$version" -m "v$version"
 
     # Push release to master
-    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$($GitHubPersonalAccessToken)@$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
-    git push $($fullGitAuthUrl) 2>&1 | % { $_.ToString() } 
+    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$GitHubPersonalAccessToken@$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
+    git push $fullGitAuthUrl 2>&1 | % { $_.ToString() } 
 
     #Push tag to master
-    git push $($fullGitAuthUrl) --tags 2>&1 | % { $_.ToString() }
+    git push $fullGitAuthUrl --tags 2>&1 | % { $_.ToString() }
 }
 else
 {
-    Write-Error "Umbraco release file not found, searched in $($workingDirectory)\$($zipsDir) for a file with pattern $($pattern) - canceling"
+    Write-Error "Umbraco release file not found, searched in $workingDirectory\$zipsDir for a file with pattern $pattern - cancelling"
 }

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="3.4.4">
         <id>UmbracoCms.Core</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
@@ -8,42 +8,38 @@
         <owners>Umbraco HQ</owners>
         <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
         <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-
-            <group targetFramework="net472">
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="AutoMapper" version="[8.0.0,8.999999)" />
-                <dependency id="LightInject" version="[5.4.0,5.999999)" />
-                <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
-                <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
-                <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
-                <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
-                <dependency id="Semver" version="[2.0.4,2.999999)" />
-                <dependency id="Serilog" version="[2.8.0,2.999999)" />
-                <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
-                <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
-                <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
-                <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
-                <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
-                <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
-                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
-                <dependency id="NPoco" version="[3.9.4,3.999999)" />
-            </group>
-            
+            <!--
+              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
+              the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
+              not want this to happen as the alpha of the next major is, really, the next major already.
+            -->
+            <dependency id="AutoMapper" version="[7.0.1,7.999999)" />
+            <dependency id="LightInject" version="[5.1.2,5.999999)" />
+            <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
+            <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
+            <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
+            <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.6,5.999999)" />
+            <dependency id="Microsoft.Owin" version="[4.0.0,4.999999)" />
+            <dependency id="MiniProfiler" version="[3.2.0.157,3.999999)" />
+            <dependency id="MySql.Data" version="[6.10.7,6.999999)" />
+            <dependency id="Newtonsoft.Json" version="[11.0.2,11.999999)" />
+            <dependency id="Semver" version="[2.0.4,2.999999)" />
+            <dependency id="Serilog" version="[2.7.1,2.999999)" />
+            <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
+            <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
+            <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
+            <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
+            <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
+            <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
+            <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
+            <dependency id="NPoco" version="[3.9.4,3.999999)" />
         </dependencies>
     </metadata>
     <files>

build/NuSpecs/UmbracoCms.Web.nuspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="3.4.4">
         <id>UmbracoCms.Web</id>
         <version>8.0.0</version>
         <title>Umbraco Cms Core Binaries</title>
@@ -8,42 +8,37 @@
         <owners>Umbraco HQ</owners>
         <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
         <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
         <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
-        <dependencies>
-
-            <group targetFramework="net472">
-
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="UmbracoCms.Core" version="[$version$]" />
-                <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
-                <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
-                <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.0,1.999999)" />
-                <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
-                <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
-                <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
-                <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
-                <dependency id="Markdown" version="[2.2.1,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
-                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
-
-            </group>
-            
+        <dependencies> 
+            <!--
+              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
+              the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
+              not want this to happen as the alpha of the next major is, really, the next major already.
+            -->
+            <dependency id="UmbracoCms.Core" version="[$version$]" />
+            <dependency id="AutoMapper" version="[7.0.1,7.999999)" />
+            <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
+            <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
+            <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
+            <dependency id="Examine" version="[1.0.0-beta067,1.999999)" />
+            <dependency id="HtmlAgilityPack" version="[1.8.9,1.999999)" />
+            <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
+            <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
+            <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
+            <dependency id="Markdown" version="[2.2.1,2.999999)" />
+            <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
+            <dependency id="Microsoft.AspNet.Mvc" version="[5.2.6,5.999999)" />
+            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3,2.999999)" />
+            <dependency id="Microsoft.AspNet.WebApi" version="[5.2.6,5.999999)" />
+            <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0,4.999999)" />
+            <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0,4.999999)" />
+            <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0,4.999999)" />
+            <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.999999)" />
         </dependencies>
     </metadata>
     <files>

build/NuSpecs/UmbracoCms.nuspec

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
+    <metadata minClientVersion="3.4.4">
         <id>UmbracoCms</id>
         <version>8.0.0</version>
         <title>Umbraco Cms</title>
@@ -8,38 +8,32 @@
         <owners>Umbraco HQ</owners>
         <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
         <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
         <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-
-            <group targetFramework="net472">
-
-                <dependency id="UmbracoCms.Web" version="[$version$]" />
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.4]" />
-                <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
-                <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
-                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
-                <dependency id="Microsoft.Net.Compilers" version="[2.10.0,2.999999)" />
-
-            </group>
-
-
+            <dependency id="UmbracoCms.Web" version="[$version$]" />
+            <!--
+              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
+              the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
+              not want this to happen as the alpha of the next major is, really, the next major already.
+            -->
+            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
+            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.29]" />
+            <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
+            <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
+            <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
+            <dependency id="Microsoft.Net.Compilers" version="[2.10.0,2.999999)" />
         </dependencies>
     </metadata>
     <files>
         <!-- files -->
         <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
         <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
+        <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
         <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
         <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
         <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
@@ -58,9 +52,12 @@
         <!-- config transforms -->
         <!-- beware! config transforms not supported by PackageReference -->
         <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
+        <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
         <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
+        <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
+        <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
         <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" /> <!-- FIXME: Content\ !! and then... transform?! -->
+        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME Content\ !! and then... transform?! -->
 
         <!-- UmbracoCms props and targets -->
         <file src="build\**" target="build" />

build/NuSpecs/tools/Dashboard.config.install.xdt

@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+    <tab caption="Welcome"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
+      <control panelCaption="" xdt:Transform="InsertIfMissing">
+        views/dashboard/settings/settingsdashboardintro.html
+      </control>
+    </tab>
+  </section>
+
+  <section alias="StartupFormsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas>
+      <area>forms</area>
+    </areas>
+    <tab caption="Install Umbraco Forms">
+      <control panelCaption="">
+        views/dashboard/forms/formsdashboardintro.html
+      </control>
+    </tab>
+  </section>
+
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas xdt:Transform="InsertIfMissing">
+      <area xdt:Transform="InsertIfMissing">developer</area>
+    </areas>  
+  </section>
+  
+  <section alias="StartupDeveloperDashboardSection">
+    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
+      <control panelCaption="">
+        views/dashboard/developer/developerdashboardvideos.html
+      </control>
+    </tab>
+    <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+  </section>
+  
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+	<tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
+      <control>
+        views/dashboard/developer/examinemanagement.html
+      </control>
+    </tab>
+  </section>
+  
+  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
+    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="Replace">
+      <control panelCaption="">
+        views/dashboard/media/mediafolderbrowser.html
+      </control>
+    </tab>
+  </section>
+  
+  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+    <tab caption="Get Started" xdt:Transform="Insert">
+      <control panelCaption="">
+        views/dashboard/members/membersdashboardvideos.html
+      </control>
+    </tab>
+  </section>
+  
+  <section alias="uGoLiveDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
+  
+  <section alias="ExamineManagement" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
+    
+  <section alias="StartupDashboardSection">
+	<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>

build/NuSpecs/tools/Web.config.install.xdt

@@ -2,11 +2,17 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
   <configSections xdt:Transform="InsertIfMissing" />
   <configSections>
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+    <section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
+
+    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
+      <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+    </sectionGroup>
     <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
       <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
       <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
     </sectionGroup>
   </configSections>
@@ -16,18 +22,26 @@
     <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
 	<add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
 	<add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+	<add key="umbracoDefaultUILanguage" value="en-US" xdt:Locator="Match(key)" xdt:Transform="SetAttributes(value)" />
   </appSettings>
 
   <umbracoConfiguration xdt:Transform="InsertIfMissing">
     <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
+    <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
     <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
   </umbracoConfiguration>
 
+  <FileSystemProviders xdt:Transform="Remove" />
+
   <system.data xdt:Transform="InsertIfMissing">
     <DbProviderFactories xdt:Transform="InsertIfMissing">
       <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
       <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
+      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+      <add invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="Remove" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+      <add invariant="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(type)" />
     </DbProviderFactories>
   </system.data>
   <clientDependency xdt:Transform="RemoveAttributes(version)" />
@@ -35,9 +49,14 @@
   <system.web xdt:Transform="InsertIfMissing" />
   <system.web>
     <siteMap xdt:Transform="Remove" />
+    <siteMap xdt:Transform="InsertIfMissing">
+      <providers xdt:Transform="InsertIfMissing">
+        <remove name="MySqlSiteMapProvider"  xdt:Transform="InsertIfMissing" />
+      </providers>
+    </siteMap>
     <httpRuntime xdt:Transform="InsertIfMissing" />
     <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    <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"/>
@@ -126,55 +145,45 @@
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
     </assemblyBinding>
   </runtime>
 
- <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-            </dependentAssembly>
-            <dependentAssembly xdt:Transform="Insert">
-                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+        <dependentAssembly xdt:Transform="Insert">
+            <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        </dependentAssembly>
+        <dependentAssembly xdt:Transform="Insert">
+            <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        </dependentAssembly>
+        <dependentAssembly xdt:Transform="Insert">
+            <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        </dependentAssembly>
+        <dependentAssembly xdt:Transform="Insert">
+            <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        </dependentAssembly>
+        <dependentAssembly xdt:Transform="Insert">
+            <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        </dependentAssembly>
+        <dependentAssembly xdt:Transform="Insert">
+            <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+        </dependentAssembly>
+        <dependentAssembly xdt:Transform="Insert">
+            <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+        </dependentAssembly>
+        <dependentAssembly xdt:Transform="Insert">
+            <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
+        </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 
   <system.web.webPages.razor xdt:Transform="Remove" />
 

build/NuSpecs/tools/install.core.ps1

@@ -0,0 +1,94 @@
+param($installPath, $toolsPath, $package, $project)
+
+Write-Host "installPath:" "${installPath}"
+Write-Host "toolsPath:" "${toolsPath}"
+
+Write-Host " "
+
+if ($project) {
+	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
+
+	# Create paths and list them
+	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
+	Write-Host "projectPath:" "${projectPath}"		
+	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
+	Write-Host "backupPath:" "${backupPath}"		
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	Write-Host "copyLogsPath:" "${copyLogsPath}"			
+	$umbracoBinFolder = Join-Path $projectPath "bin"
+	Write-Host "umbracoBinFolder:" "${umbracoBinFolder}"		
+
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
+	# After backing up, remove all umbraco dlls from bin folder in case dll files are included in the VS project
+	# See: http://issues.umbraco.org/issue/U4-4930
+	
+	if(Test-Path $umbracoBinFolder) {
+		$umbracoBinBackupPath = Join-Path $backupPath "bin"
+		
+		New-Item -ItemType Directory -Force -Path $umbracoBinBackupPath
+		
+		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
+		
+		# Delete files Umbraco ships with
+		if(Test-Path $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll) { Remove-Item $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Web.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Core.dll) { Remove-Item $umbracoBinFolder\Umbraco.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.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\Umbraco.Examine.dll) { Remove-Item $umbracoBinFolder\Umbraco.Examine.dll -Force -Confirm:$false }
+		
+		# Delete files Umbraco depends upon
+		$amd64Folder = Join-Path $umbracoBinFolder "amd64"
+		if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false }
+		$x86Folder = Join-Path $umbracoBinFolder "x86"
+		if(Test-Path $x86Folder) { Remove-Item $x86Folder -Force -Recurse -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\AutoMapper.dll) { Remove-Item $umbracoBinFolder\AutoMapper.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\AutoMapper.Net4.dll) { Remove-Item $umbracoBinFolder\AutoMapper.Net4.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ClientDependency.Core.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ClientDependency.Core.Mvc.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.Mvc.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\CookComputing.XmlRpcV2.dll) { Remove-Item $umbracoBinFolder\CookComputing.XmlRpcV2.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Examine.dll) { Remove-Item $umbracoBinFolder\Examine.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\HtmlAgilityPack.dll) { Remove-Item $umbracoBinFolder\HtmlAgilityPack.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ICSharpCode.SharpZipLib.dll) { Remove-Item $umbracoBinFolder\ICSharpCode.SharpZipLib.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll) { Remove-Item $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\MySql.Data.dll) { Remove-Item $umbracoBinFolder\MySql.Data.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Owin.dll) { Remove-Item $umbracoBinFolder\Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Semver.dll) { Remove-Item $umbracoBinFolder\Semver.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Collections.Immutable.dll) { Remove-Item $umbracoBinFolder\System.Collections.Immutable.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Reflection.Metadata.dll) { Remove-Item $umbracoBinFolder\System.Reflection.Metadata.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Extensions.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Extensions.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Primitives.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Primitives.dll -Force -Confirm:$false }	
+		if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.Razor.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Deployment.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Deployment.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Razor.dll -Force -Confirm:$false }		
+	}
+}

build/NuSpecs/tools/install.ps1

@@ -11,15 +11,37 @@ if ($project) {
 	# Create paths and list them
 	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
 	Write-Host "projectPath:" "${projectPath}"
+	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
+	Write-Host "backupPath:" "${backupPath}"
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	Write-Host "copyLogsPath:" "${copyLogsPath}"	
 	$webConfigSource = Join-Path $projectPath "Web.config"
 	Write-Host "webConfigSource:" "${webConfigSource}"
 	$configFolder = Join-Path $projectPath "Config"
 	Write-Host "configFolder:" "${configFolder}"
 
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
+	# Create a backup of original web.config
+	Copy-Item $webConfigSource $backupPath -Force
+	
+	# Backup config files folder	
+	if(Test-Path $configFolder) {
+		$umbracoBackupPath = Join-Path $backupPath "Config"
+		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
+		
+		robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
+	}
+	
 	# Copy umbraco and umbraco_files from package to project folder
 	$umbracoFolder = Join-Path $projectPath "Umbraco"
 	New-Item -ItemType Directory -Force -Path $umbracoFolder
 	$umbracoFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco"		
+	$umbracoBackupPath = Join-Path $backupPath "Umbraco"
+	New-Item -ItemType Directory -Force -Path $umbracoBackupPath		
+	robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
 	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
 
 	$copyWebconfig = $true
@@ -32,7 +54,7 @@ if ($project) {
 			[xml]$config = Get-Content $destinationWebConfig
 			
 			$config.configuration.appSettings.ChildNodes | ForEach-Object { 
-				if($_.key -eq "Umbraco.Core.ConfigurationStatus") 
+				if($_.key -eq "umbracoConfigurationStatus") 
 				{
 					# The web.config has an umbraco-specific appSetting in it
 					# don't overwrite it and let config transforms do their thing
@@ -55,6 +77,10 @@ if ($project) {
 		$splashesDestination = Join-Path $projectPath "Config\splashes\"
 		New-Item $splashesDestination -Type directory
 		Copy-Item $splashesSource $splashesDestination -Force
+        
+		$umbracoUIXMLSource = Join-Path $installPath "UmbracoFiles\Umbraco\Config\Create\UI.xml"
+		$umbracoUIXMLDestination = Join-Path $projectPath "Umbraco\Config\Create\UI.xml"
+		Copy-Item $umbracoUIXMLSource $umbracoUIXMLDestination -Force
 	} else {
 		# This part only runs for upgrades
 	
@@ -76,6 +102,36 @@ if ($project) {
 		{
 			# Not a big problem if this fails, let it go
 		}
+		
+		Try 
+		{
+			$uiXmlConfigPath = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+			$uiXmlFile = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+
+			$uiXml = New-Object System.Xml.XmlDocument
+			$uiXml.PreserveWhitespace = $true
+
+			$uiXml.Load($uiXmlFile)
+			$createExists = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks/create")
+
+			if($createExists.Count -eq 0) 
+			{    
+				$macrosTasksNode = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks")
+
+				#Creating: <create assembly="umbraco" type="macroTasks" />
+				$createNode = $uiXml.CreateElement("create")
+				$createNode.SetAttribute("assembly", "umbraco")
+				$createNode.SetAttribute("type", "macroTasks")
+				$macrosTasksNode.AppendChild($createNode)
+				$uiXml.Save($uiXmlFile)
+			}
+		} 
+		Catch { }
+	}
+	
+	$installFolder = Join-Path $projectPath "Install"
+	if(Test-Path $installFolder) {
+		Remove-Item $installFolder -Force -Recurse -Confirm:$false
 	}
 	
 	# Open appropriate readme

build/NuSpecs/tools/log4net.config.install.xdt

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<log4net xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <appender name="AsynchronousLog4NetAppender" xdt:Transform="Remove" xdt:Locator="Match(name)" /> 
+  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core" xdt:Transform="Insert" >
+    <appender-ref ref="rollingFile" />
+  </appender>
+  
+  <appender name="rollingFile" type="log4net.Appender.RollingFileAppender" xdt:Transform="InsertIfMissing">
+    <file value="App_Data\Logs\UmbracoTraceLog.txt" />
+    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    <appendToFile value="true" />
+    <rollingStyle value="Date" />
+    <maximumFileSize value="5MB" />
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    </layout>
+    <encoding value="utf-8" />
+  </appender>
+</log4net>
+

build/NuSpecs/tools/trees.config.install.xdt

@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<trees xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--Content-->
+  <add alias="content" application="content"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="RemoveAttributes(silent)" />
+  <add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, Umbraco.Web" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, Umbraco.Web" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  
+  <!--Media-->
+  <add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, Umbraco.Web" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, Umbraco.Web" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  
+  <!--Settings-->
+  <add application="settings" alias="nodeTypes"  
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, Umbraco.Web"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="InsertIfMissing" />
+  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, Umbraco.Web" iconClosed="" iconOpen="" initialize="false" sortOrder="0" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add application="settings" alias="templates" title="Templates" type="Umbraco.Web.Trees.TemplatesTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="1" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" /> 
+  
+  <add application="settings" alias="partialViews" type="Umbraco.Web.Trees.PartialViewsTree, Umbraco.Web"
+       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.Web" sortOrder="2"
+       xdt:Locator="Match(application,alias)"
+       xdt:Transform="InsertIfMissing"  />
+  
+  <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="8" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add alias="dictionary" application="settings"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="RemoveAttributes(action)" />
+  <add application="settings" alias="languages" title="Languages" type="Umbraco.Web.Trees.LanguageTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="5" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add application="settings" initialize="true" alias="mediaTypes" title="Media Types" type="Umbraco.Web.Trees.MediaTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="7" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+
+  <!--Developer-->
+  <add alias="packager" application="developer"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <add alias="packagerPackages" application="developer"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <add initialize="true" sortOrder="0" alias="packager" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, Umbraco.Web" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="InsertIfMissing"  />
+  
+  <!-- Before 7.4 this tree had the alias 'dataType', without the 's' on the end, this is here to rename it  -->
+  <add sortOrder="1" alias="dataTypes" application="developer" type="Umbraco.Web.Trees.DataTypeTreeController, Umbraco.Web"
+       xdt:Locator="Match(application,type)" 
+       xdt:Transform="SetAttributes(alias,sortOrder)" />
+	   
+  <!-- Yes, set the sortOrder again, like above because.. sometimes apparently we already have a dataTypes node and we can't remove more than one.. if they're equal though (same alias,application and sortOrder) it doesn't throw an error -->   
+  <add sortOrder="1" alias="dataTypes" application="developer"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes(sortOrder)" />
+
+  <add initialize="true" sortOrder="2" alias="macros" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MacroTreeController, Umbraco.Web"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, Umbraco.Web"
+       xdt:Locator="Match(application,alias,type)" 
+       xdt:Transform="Remove()" />
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, Umbraco.Web" 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" />
+
+  <!--Users-->
+ <add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, Umbraco.Web" 
+      xdt:Locator="Match(application,alias)"
+      xdt:Transform="SetAttributes()" />
+
+  <add application="users" alias="userTypes"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <add application="users" alias="userPermissions" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+
+  <!--Members-->
+  <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, Umbraco.Web" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add application="member" alias="memberGroup"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="InsertIfMissing" />
+  <add application="member" alias="memberType"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <add application="member" sortOrder="1" alias="memberTypes" initialize="true" title="Member Types" type="Umbraco.Web.Trees.MemberTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="InsertIfMissing" />
+
+  <!--Translation-->
+  <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, Umbraco.Web" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add alias="openTasks" application="translation"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="RemoveAttributes(action)" />
+  <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, Umbraco.Web" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add alias="yourTasks" application="translation"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="RemoveAttributes(action)" />
+</trees>

build/build.ps1

@@ -120,7 +120,7 @@
     } finally {
         Pop-Location
 
-        # FIXME: should we filter the log to find errors?
+        # fixme - should we filter the log to find errors?
         #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
 
         # restore
@@ -177,7 +177,7 @@
   {
     Write-Host "Prepare Tests"
 
-    # FIXME: - idea is to avoid rebuilding everything for tests
+    # fixme - idea is to avoid rebuilding everything for tests
     # but because of our weird assembly versioning (with .* stuff)
     # everything gets rebuilt all the time...
     #Copy-Files "$tmp\bin" "." "$tmp\tests"
@@ -330,6 +330,9 @@
 
   $ubuild.DefineMethod("PrepareBuild",
   {
+    Write-Host "Clear folders and files"
+    $this.RemoveDirectory("$($this.SolutionRoot)\src\Umbraco.Web.UI.Client\bower_components")
+
     $this.TempStoreFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config")
     Write-Host "Create clean web.config"
     $this.CopyFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.Template.config", "$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config")

src/SolutionInfo.cs

@@ -2,7 +2,7 @@
 using System.Resources;
 
 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2019")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.0.2")]
-[assembly: AssemblyInformationalVersion("8.0.2")]
+[assembly: AssemblyFileVersion("8.0.0")]
+[assembly: AssemblyInformationalVersion("8.0.0-alpha.58")]

src/Umbraco.Core/Attempt.cs

@@ -8,7 +8,7 @@ namespace Umbraco.Core
     public static class Attempt
     {
         // note:
-        // cannot rely on overloads only to differentiate between with/without status
+        // cannot rely on overloads only to differenciate between with/without status
         // in some cases it will always be ambiguous, so be explicit w/ 'WithStatus' methods
 
         /// <summary>

src/Umbraco.Core/AttemptOfTResult.cs

@@ -121,7 +121,7 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// Implicitly operator to check if the attempt was successful without having to access the 'success' property
+        /// Implicity operator to check if the attempt was successful without having to access the 'success' property
         /// </summary>
         /// <param name="a"></param>
         /// <returns></returns>

src/Umbraco.Core/AttemptOfTResultTStatus.cs

@@ -130,7 +130,7 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// Implicitly operator to check if the attempt was successful without having to access the 'success' property
+        /// Implicity operator to check if the attempt was successful without having to access the 'success' property
         /// </summary>
         /// <param name="a"></param>
         /// <returns></returns>

src/Umbraco.Core/Cache/AppCaches.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Web;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Represents the application caches.
-    /// </summary>
-    public class AppCaches
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppCaches"/> for use in a web application.
-        /// </summary>
-        public AppCaches()
-            : this(HttpRuntime.Cache)
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppCaches"/> for use in a web application.
-        /// </summary>
-        public AppCaches(System.Web.Caching.Cache cache)
-            : this(
-                new WebCachingAppCache(cache),
-                new HttpRequestAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache()))
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppCaches"/> with cache providers.
-        /// </summary>
-        public AppCaches(
-            IAppPolicyCache runtimeCache,
-            IAppCache requestCache,
-            IsolatedCaches isolatedCaches)
-        {
-            RuntimeCache = runtimeCache ?? throw new ArgumentNullException(nameof(runtimeCache));
-            RequestCache = requestCache ?? throw new ArgumentNullException(nameof(requestCache));
-            IsolatedCaches = isolatedCaches ?? throw new ArgumentNullException(nameof(isolatedCaches));
-        }
-
-        /// <summary>
-        /// Gets the special disabled instance.
-        /// </summary>
-        /// <remarks>
-        /// <para>When used by repositories, all cache policies apply, but the underlying caches do not cache anything.</para>
-        /// <para>Used by tests.</para>
-        /// </remarks>
-        public static AppCaches Disabled { get; } = new AppCaches(NoAppCache.Instance, NoAppCache.Instance, new IsolatedCaches(_ => NoAppCache.Instance));
-
-        /// <summary>
-        /// Gets the special no-cache instance.
-        /// </summary>
-        /// <remarks>
-        /// <para>When used by repositories, all cache policies are bypassed.</para>
-        /// <para>Used by repositories that do no cache.</para>
-        /// </remarks>
-        public static AppCaches NoCache { get; } = new AppCaches(NoAppCache.Instance, NoAppCache.Instance, new IsolatedCaches(_ => NoAppCache.Instance));
-
-        /// <summary>
-        /// Gets the per-request cache.
-        /// </summary>
-        /// <remarks>
-        /// <para>The per-request caches works on top of the current HttpContext items.</para>
-        /// <para>Outside a web environment, the behavior of that cache is unspecified.</para>
-        /// </remarks>
-        public IAppCache RequestCache { get; }
-
-        /// <summary>
-        /// Gets the runtime cache.
-        /// </summary>
-        /// <remarks>
-        /// <para>The runtime cache is the main application cache.</para>
-        /// </remarks>
-        public IAppPolicyCache RuntimeCache { get; }
-
-        /// <summary>
-        /// Gets the isolated caches.
-        /// </summary>
-        /// <remarks>
-        /// <para>Isolated caches are used by e.g. repositories, to ensure that each cached entity
-        /// type has its own cache, so that lookups are fast and the repository does not need to
-        /// search through all keys on a global scale.</para>
-        /// </remarks>
-        public IsolatedCaches IsolatedCaches { get; }
-    }
-}

src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Provides a base class for implementing a dictionary of <see cref="IAppPolicyCache"/>.
-    /// </summary>
-    /// <typeparam name="TKey">The type of the dictionary key.</typeparam>
-    public abstract class AppPolicedCacheDictionary<TKey>
-    {
-        private readonly ConcurrentDictionary<TKey, IAppPolicyCache> _caches = new ConcurrentDictionary<TKey, IAppPolicyCache>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppPolicedCacheDictionary{TKey}"/> class.
-        /// </summary>
-        /// <param name="cacheFactory"></param>
-        protected AppPolicedCacheDictionary(Func<TKey, IAppPolicyCache> cacheFactory)
-        {
-            CacheFactory = cacheFactory;
-        }
-
-        /// <summary>
-        /// Gets the internal cache factory, for tests only!
-        /// </summary>
-        internal readonly Func<TKey, IAppPolicyCache> CacheFactory;
-
-        /// <summary>
-        /// Gets or creates a cache.
-        /// </summary>
-        public IAppPolicyCache GetOrCreate(TKey key)
-            => _caches.GetOrAdd(key, k => CacheFactory(k));
-
-        /// <summary>
-        /// Tries to get a cache.
-        /// </summary>
-        public Attempt<IAppPolicyCache> Get(TKey key)
-            => _caches.TryGetValue(key, out var cache) ? Attempt.Succeed(cache) : Attempt.Fail<IAppPolicyCache>();
-
-        /// <summary>
-        /// Removes a cache.
-        /// </summary>
-        public void Remove(TKey key)
-        {
-            _caches.TryRemove(key, out _);
-        }
-
-        /// <summary>
-        /// Removes all caches.
-        /// </summary>
-        public void RemoveAll()
-        {
-            _caches.Clear();
-        }
-
-        /// <summary>
-        /// Clears a cache.
-        /// </summary>
-        public void ClearCache(TKey key)
-        {
-            if (_caches.TryGetValue(key, out var cache))
-                cache.Clear();
-        }
-
-        /// <summary>
-        /// Clears all caches.
-        /// </summary>
-        public void ClearAllCaches()
-        {
-            foreach (var cache in _caches.Values)
-                cache.Clear();
-        }
-    }
-}

src/Umbraco.Core/Cache/CacheHelper.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Web;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Represents the application-wide caches.
+    /// </summary>
+    public class CacheHelper
+    {
+        /// <summary>
+        /// Initializes a new instance for use in the web
+        /// </summary>
+        public CacheHelper()
+            : this(
+                new HttpRuntimeCacheProvider(HttpRuntime.Cache),
+                new StaticCacheProvider(),
+                new HttpRequestCacheProvider(),
+                new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance for use in the web
+        /// </summary>
+        public CacheHelper(System.Web.Caching.Cache cache)
+            : this(
+                new HttpRuntimeCacheProvider(cache),
+                new StaticCacheProvider(),
+                new HttpRequestCacheProvider(),
+                new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance based on the provided providers
+        /// </summary>
+        public CacheHelper(
+            IRuntimeCacheProvider httpCacheProvider,
+            ICacheProvider staticCacheProvider,
+            ICacheProvider requestCacheProvider,
+            IsolatedRuntimeCache isolatedCacheManager)
+        {
+            RuntimeCache = httpCacheProvider ?? throw new ArgumentNullException(nameof(httpCacheProvider));
+            StaticCache = staticCacheProvider ?? throw new ArgumentNullException(nameof(staticCacheProvider));
+            RequestCache = requestCacheProvider ?? throw new ArgumentNullException(nameof(requestCacheProvider));
+            IsolatedRuntimeCache = isolatedCacheManager ?? throw new ArgumentNullException(nameof(isolatedCacheManager));
+        }
+
+        /// <summary>
+        /// Gets the special disabled instance.
+        /// </summary>
+        /// <remarks>
+        /// <para>When used by repositories, all cache policies apply, but the underlying caches do not cache anything.</para>
+        /// <para>Used by tests.</para>
+        /// </remarks>
+        public static CacheHelper Disabled { get; } = new CacheHelper(NullCacheProvider.Instance, NullCacheProvider.Instance, NullCacheProvider.Instance, new IsolatedRuntimeCache(_ => NullCacheProvider.Instance));
+
+        /// <summary>
+        /// Gets the special no-cache instance.
+        /// </summary>
+        /// <remarks>
+        /// <para>When used by repositories, all cache policies are bypassed.</para>
+        /// <para>Used by repositories that do no cache.</para>
+        /// </remarks>
+        public static CacheHelper NoCache { get; } = new CacheHelper(NullCacheProvider.Instance, NullCacheProvider.Instance, NullCacheProvider.Instance, new IsolatedRuntimeCache(_ => NullCacheProvider.Instance));
+
+        /// <summary>
+        /// Returns the current Request cache
+        /// </summary>
+        public ICacheProvider RequestCache { get; internal set; }
+
+        /// <summary>
+        /// Returns the current Runtime cache
+        /// </summary>
+        public ICacheProvider StaticCache { get; internal set; }
+
+        /// <summary>
+        /// Returns the current Runtime cache
+        /// </summary>
+        public IRuntimeCacheProvider RuntimeCache { get; internal set; }
+
+        /// <summary>
+        /// Returns the current Isolated Runtime cache manager
+        /// </summary>
+        public IsolatedRuntimeCache IsolatedRuntimeCache { get; internal set; }
+
+    }
+
+}

src/Umbraco.Core/Cache/CacheKeys.cs

@@ -5,10 +5,10 @@
     /// </summary>
     public static class CacheKeys
     {
+        public const string ApplicationTreeCacheKey = "ApplicationTreeCache"; // used by ApplicationTreeService
         public const string ApplicationsCacheKey = "ApplicationCache"; // used by SectionService
 
-        // TODO: this one can probably be removed
-        public const string TemplateFrontEndCacheKey = "template";
+        public const string TemplateFrontEndCacheKey = "template"; // fixme usage?
 
         public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
     }

src/Umbraco.Core/Cache/CacheProviderExtensions.cs

@@ -8,9 +8,9 @@ namespace Umbraco.Core.Cache
     /// <summary>
     /// Extensions for strongly typed access
     /// </summary>
-    public static class AppCacheExtensions
+    public static class CacheProviderExtensions
     {
-        public static T GetCacheItem<T>(this IAppPolicyCache provider,
+        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
             string cacheKey,
             Func<T> getCacheItem,
             TimeSpan? timeout,
@@ -19,11 +19,11 @@ namespace Umbraco.Core.Cache
             CacheItemRemovedCallback removedCallback = null,
             string[] dependentFiles = null)
         {
-            var result = provider.Get(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
             return result == null ? default(T) : result.TryConvertTo<T>().Result;
         }
 
-        public static void InsertCacheItem<T>(this IAppPolicyCache provider,
+        public static void InsertCacheItem<T>(this IRuntimeCacheProvider provider,
             string cacheKey,
             Func<T> getCacheItem,
             TimeSpan? timeout = null,
@@ -32,24 +32,24 @@ namespace Umbraco.Core.Cache
             CacheItemRemovedCallback removedCallback = null,
             string[] dependentFiles = null)
         {
-            provider.Insert(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            provider.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
         }
 
-        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this IAppCache provider, string keyStartsWith)
+        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this ICacheProvider provider, string keyStartsWith)
         {
-            var result = provider.SearchByKey(keyStartsWith);
+            var result = provider.GetCacheItemsByKeySearch(keyStartsWith);
             return result.Select(x => x.TryConvertTo<T>().Result);
         }
 
-        public static IEnumerable<T> GetCacheItemsByKeyExpression<T>(this IAppCache provider, string regexString)
+        public static IEnumerable<T> GetCacheItemsByKeyExpression<T>(this ICacheProvider provider, string regexString)
         {
-            var result = provider.SearchByRegex(regexString);
+            var result = provider.GetCacheItemsByKeyExpression(regexString);
             return result.Select(x => x.TryConvertTo<T>().Result);
         }
 
-        public static T GetCacheItem<T>(this IAppCache provider, string cacheKey)
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
         {
-            var result = provider.Get(cacheKey);
+            var result = provider.GetCacheItem(cacheKey);
             if (result == null)
             {
                 return default(T);
@@ -57,9 +57,9 @@ namespace Umbraco.Core.Cache
             return result.TryConvertTo<T>().Result;
         }
 
-        public static T GetCacheItem<T>(this IAppCache provider, string cacheKey, Func<T> getCacheItem)
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey, Func<T> getCacheItem)
         {
-            var result = provider.Get(cacheKey, () => getCacheItem());
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem());
             if (result == null)
             {
                 return default(T);

src/Umbraco.Core/Cache/CacheRefresherBase.cs

@@ -16,10 +16,10 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Initializes a new instance of the <see cref="CacheRefresherBase{TInstanceType}"/>.
         /// </summary>
-        /// <param name="appCaches">A cache helper.</param>
-        protected CacheRefresherBase(AppCaches appCaches)
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected CacheRefresherBase(CacheHelper cacheHelper)
         {
-            AppCaches = appCaches;
+            CacheHelper = cacheHelper;
         }
 
         /// <summary>
@@ -93,7 +93,7 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Gets the cache helper.
         /// </summary>
-        protected AppCaches AppCaches { get; }
+        protected CacheHelper CacheHelper { get; }
 
         /// <summary>
         /// Clears the cache for all repository entities of a specified type.
@@ -102,7 +102,7 @@ namespace Umbraco.Core.Cache
         protected void ClearAllIsolatedCacheByEntityType<TEntity>()
             where TEntity : class, IEntity
         {
-            AppCaches.IsolatedCaches.ClearCache<TEntity>();
+            CacheHelper.IsolatedRuntimeCache.ClearCache<TEntity>();
         }
 
         /// <summary>

src/Umbraco.Core/Cache/DeepCloneAppCache.cs

@@ -1,157 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Caching;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Entities;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Implements <see cref="IAppPolicyCache"/> by wrapping an inner other <see cref="IAppPolicyCache"/>
-    /// instance, and ensuring that all inserts and returns are deep cloned copies of the cache item,
-    /// when the item is deep-cloneable.
-    /// </summary>
-    internal class DeepCloneAppCache : IAppPolicyCache
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeepCloneAppCache"/> class.
-        /// </summary>
-        public DeepCloneAppCache(IAppPolicyCache innerCache)
-        {
-            var type = typeof (DeepCloneAppCache);
-
-            if (innerCache.GetType() == type)
-                throw new InvalidOperationException($"A {type} cannot wrap another instance of itself.");
-
-            InnerCache = innerCache;
-        }
-
-        /// <summary>
-        /// Gets the inner cache.
-        /// </summary>
-        public IAppPolicyCache InnerCache { get; }
-
-        /// <inheritdoc />
-        public object Get(string key)
-        {
-            var item = InnerCache.Get(key);
-            return CheckCloneableAndTracksChanges(item);
-        }
-
-        /// <inheritdoc />
-        public object Get(string key, Func<object> factory)
-        {
-            var cached = InnerCache.Get(key, () =>
-            {
-                var result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
-                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
-                // do not store null values (backward compat), clone / reset to go into the cache
-                return value == null ? null : CheckCloneableAndTracksChanges(value);
-            });
-            return CheckCloneableAndTracksChanges(cached);
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<object> SearchByKey(string keyStartsWith)
-        {
-            return InnerCache.SearchByKey(keyStartsWith)
-                .Select(CheckCloneableAndTracksChanges);
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<object> SearchByRegex(string regex)
-        {
-            return InnerCache.SearchByRegex(regex)
-                .Select(CheckCloneableAndTracksChanges);
-        }
-
-        /// <inheritdoc />
-        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            var cached = InnerCache.Get(key, () =>
-            {
-                var result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
-                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
-                // do not store null values (backward compat), clone / reset to go into the cache
-                return value == null ? null : CheckCloneableAndTracksChanges(value); 
-
-                // clone / reset to go into the cache
-            }, timeout, isSliding, priority, removedCallback, dependentFiles);
-
-            // clone / reset to go into the cache
-            return CheckCloneableAndTracksChanges(cached);
-        }
-
-        /// <inheritdoc />
-        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            InnerCache.Insert(key, () =>
-            {
-                var result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
-                var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
-                // do not store null values (backward compat), clone / reset to go into the cache
-                return value == null ? null : CheckCloneableAndTracksChanges(value);
-            }, timeout, isSliding, priority, removedCallback, dependentFiles);
-        }
-
-        /// <inheritdoc />
-        public void Clear()
-        {
-            InnerCache.Clear();
-        }
-
-        /// <inheritdoc />
-        public void Clear(string key)
-        {
-            InnerCache.Clear(key);
-        }
-
-        /// <inheritdoc />
-        public void ClearOfType(string typeName)
-        {
-            InnerCache.ClearOfType(typeName);
-        }
-
-        /// <inheritdoc />
-        public void ClearOfType<T>()
-        {
-            InnerCache.ClearOfType<T>();
-        }
-
-        /// <inheritdoc />
-        public void ClearOfType<T>(Func<string, T, bool> predicate)
-        {
-            InnerCache.ClearOfType<T>(predicate);
-        }
-
-        /// <inheritdoc />
-        public void ClearByKey(string keyStartsWith)
-        {
-            InnerCache.ClearByKey(keyStartsWith);
-        }
-
-        /// <inheritdoc />
-        public void ClearByRegex(string regex)
-        {
-            InnerCache.ClearByRegex(regex);
-        }
-
-        private static object CheckCloneableAndTracksChanges(object input)
-        {
-            if (input is IDeepCloneable cloneable)
-            {
-                input = cloneable.DeepClone();
-            }
-
-            // reset dirty initial properties
-            if (input is IRememberBeingDirty tracksChanges)
-            {
-                tracksChanges.ResetDirtyProperties(false);
-                input = tracksChanges;
-            }
-
-            return input;
-        }
-    }
-}

src/Umbraco.Core/Cache/DeepCloneRuntimeCacheProvider.cs

@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Caching;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Interface describing this cache provider as a wrapper for another
+    /// </summary>
+    internal interface IRuntimeCacheProviderWrapper
+    {
+        IRuntimeCacheProvider InnerProvider { get; }
+    }
+
+    /// <summary>
+    /// A wrapper for any IRuntimeCacheProvider that ensures that all inserts and returns
+    /// are a deep cloned copy of the item when the item is IDeepCloneable and that tracks changes are
+    /// reset if the object is TracksChangesEntityBase
+    /// </summary>
+    internal class DeepCloneRuntimeCacheProvider : IRuntimeCacheProvider, IRuntimeCacheProviderWrapper
+    {
+        public IRuntimeCacheProvider InnerProvider { get; }
+
+        public DeepCloneRuntimeCacheProvider(IRuntimeCacheProvider innerProvider)
+        {
+            var type = typeof (DeepCloneRuntimeCacheProvider);
+
+            if (innerProvider.GetType() == type)
+                throw new InvalidOperationException($"A {type} cannot wrap another instance of {type}.");
+
+            InnerProvider = innerProvider;
+        }
+
+        #region Clear - doesn't require any changes
+
+        public void ClearAllCache()
+        {
+            InnerProvider.ClearAllCache();
+        }
+
+        public void ClearCacheItem(string key)
+        {
+            InnerProvider.ClearCacheItem(key);
+        }
+
+        public void ClearCacheObjectTypes(string typeName)
+        {
+            InnerProvider.ClearCacheObjectTypes(typeName);
+        }
+
+        public void ClearCacheObjectTypes<T>()
+        {
+            InnerProvider.ClearCacheObjectTypes<T>();
+        }
+
+        public void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            InnerProvider.ClearCacheObjectTypes<T>(predicate);
+        }
+
+        public void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            InnerProvider.ClearCacheByKeySearch(keyStartsWith);
+        }
+
+        public void ClearCacheByKeyExpression(string regexString)
+        {
+            InnerProvider.ClearCacheByKeyExpression(regexString);
+        }
+
+        #endregion
+
+        public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return InnerProvider.GetCacheItemsByKeySearch(keyStartsWith)
+                .Select(CheckCloneableAndTracksChanges);
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return InnerProvider.GetCacheItemsByKeyExpression(regexString)
+                .Select(CheckCloneableAndTracksChanges);
+        }
+
+        public object GetCacheItem(string cacheKey)
+        {
+            var item = InnerProvider.GetCacheItem(cacheKey);
+            return CheckCloneableAndTracksChanges(item);
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            var cached = InnerProvider.GetCacheItem(cacheKey, () =>
+            {
+                var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
+                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)
+
+                return CheckCloneableAndTracksChanges(value);
+            });
+            return CheckCloneableAndTracksChanges(cached);
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            var cached = InnerProvider.GetCacheItem(cacheKey, () =>
+            {
+                var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
+                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 into the cache
+            return CheckCloneableAndTracksChanges(cached);
+        }
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            InnerProvider.InsertCacheItem(cacheKey, () =>
+            {
+                var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
+                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);
+        }
+
+        private static object CheckCloneableAndTracksChanges(object input)
+        {
+            var cloneable = input as IDeepCloneable;
+            if (cloneable != null)
+            {
+                input = cloneable.DeepClone();
+            }
+
+            // reset dirty initial properties (U4-1946)
+            var tracksChanges = input as IRememberBeingDirty;
+            if (tracksChanges != null)
+            {
+                tracksChanges.ResetDirtyProperties(false);
+                input =  tracksChanges;
+            }
+
+            return input;
+        }
+    }
+}

src/Umbraco.Core/Cache/DefaultRepositoryCachePolicy.cs

@@ -23,7 +23,7 @@ namespace Umbraco.Core.Cache
         private static readonly TEntity[] EmptyEntities = new TEntity[0]; // const
         private readonly RepositoryCachePolicyOptions _options;
 
-        public DefaultRepositoryCachePolicy(IAppPolicyCache cache, IScopeAccessor scopeAccessor, RepositoryCachePolicyOptions options)
+        public DefaultRepositoryCachePolicy(IRuntimeCacheProvider cache, IScopeAccessor scopeAccessor, RepositoryCachePolicyOptions options)
             : base(cache, scopeAccessor)
         {
             _options = options ?? throw new ArgumentNullException(nameof(options));
@@ -42,7 +42,7 @@ namespace Umbraco.Core.Cache
 
         protected virtual void InsertEntity(string cacheKey, TEntity entity)
         {
-            Cache.Insert(cacheKey, () => entity, TimeSpan.FromMinutes(5), true);
+            Cache.InsertCacheItem(cacheKey, () => entity, TimeSpan.FromMinutes(5), true);
         }
 
         protected virtual void InsertEntities(TId[] ids, TEntity[] entities)
@@ -52,7 +52,7 @@ namespace Umbraco.Core.Cache
                 // 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.Insert(GetEntityTypeCacheKey(), () => EmptyEntities);
+                Cache.InsertCacheItem(GetEntityTypeCacheKey(), () => EmptyEntities);
             }
             else
             {
@@ -60,7 +60,7 @@ namespace Umbraco.Core.Cache
                 foreach (var entity in entities)
                 {
                     var capture = entity;
-                    Cache.Insert(GetEntityCacheKey(entity.Id), () => capture, TimeSpan.FromMinutes(5), true);
+                    Cache.InsertCacheItem(GetEntityCacheKey(entity.Id), () => capture, TimeSpan.FromMinutes(5), true);
                 }
             }
         }
@@ -77,21 +77,21 @@ namespace Umbraco.Core.Cache
                 // just to be safe, we cannot cache an item without an identity
                 if (entity.HasIdentity)
                 {
-                    Cache.Insert(GetEntityCacheKey(entity.Id), () => entity, TimeSpan.FromMinutes(5), true);
+                    Cache.InsertCacheItem(GetEntityCacheKey(entity.Id), () => entity, TimeSpan.FromMinutes(5), true);
                 }
 
                 // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                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.Clear(GetEntityCacheKey(entity.Id));
+                Cache.ClearCacheItem(GetEntityCacheKey(entity.Id));
 
                 // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                Cache.ClearCacheItem(GetEntityTypeCacheKey());
 
                 throw;
             }
@@ -109,21 +109,21 @@ namespace Umbraco.Core.Cache
                 // just to be safe, we cannot cache an item without an identity
                 if (entity.HasIdentity)
                 {
-                    Cache.Insert(GetEntityCacheKey(entity.Id), () => entity, TimeSpan.FromMinutes(5), true);
+                    Cache.InsertCacheItem(GetEntityCacheKey(entity.Id), () => entity, TimeSpan.FromMinutes(5), true);
                 }
 
                 // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                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.Clear(GetEntityCacheKey(entity.Id));
+                Cache.ClearCacheItem(GetEntityCacheKey(entity.Id));
 
                 // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                Cache.ClearCacheItem(GetEntityTypeCacheKey());
 
                 throw;
             }
@@ -142,9 +142,9 @@ namespace Umbraco.Core.Cache
             {
                 // whatever happens, clear the cache
                 var cacheKey = GetEntityCacheKey(entity.Id);
-                Cache.Clear(cacheKey);
+                Cache.ClearCacheItem(cacheKey);
                 // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                Cache.ClearCacheItem(GetEntityTypeCacheKey());
             }
         }
 
@@ -238,7 +238,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public override void ClearAll()
         {
-            Cache.ClearByKey(GetEntityTypeCacheKey());
+            Cache.ClearCacheByKeySearch(GetEntityTypeCacheKey());
         }
     }
 }

src/Umbraco.Core/Cache/DictionaryAppCache.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Implements <see cref="IAppCache"/> on top of a concurrent dictionary.
-    /// </summary>
-    public class DictionaryAppCache : IAppCache
-    {
-        /// <summary>
-        /// Gets the internal items dictionary, for tests only!
-        /// </summary>
-        internal readonly ConcurrentDictionary<string, object> Items = new ConcurrentDictionary<string, object>();
-
-        /// <inheritdoc />
-        public virtual object Get(string key)
-        {
-            return Items.TryGetValue(key, out var value) ? value : null;
-        }
-
-        /// <inheritdoc />
-        public virtual object Get(string key, Func<object> factory)
-        {
-            return Items.GetOrAdd(key, _ => factory());
-        }
-
-        /// <inheritdoc />
-        public virtual IEnumerable<object> SearchByKey(string keyStartsWith)
-        {
-            var items = new List<object>();
-            foreach (var (key, value) in Items)
-                if (key.InvariantStartsWith(keyStartsWith))
-                    items.Add(value);
-            return items;
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<object> SearchByRegex(string regex)
-        {
-            var compiled = new Regex(regex, RegexOptions.Compiled);
-            var items = new List<object>();
-            foreach (var (key, value) in Items)
-                if (compiled.IsMatch(key))
-                    items.Add(value);
-            return items;
-        }
-
-        /// <inheritdoc />
-        public virtual void Clear()
-        {
-            Items.Clear();
-        }
-
-        /// <inheritdoc />
-        public virtual void Clear(string key)
-        {
-            Items.TryRemove(key, out _);
-        }
-
-        /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
-        {
-            Items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
-        }
-
-        /// <inheritdoc />
-        public virtual void ClearOfType<T>()
-        {
-            var typeOfT = typeof(T);
-            Items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
-        }
-
-        /// <inheritdoc />
-        public virtual void ClearOfType<T>(Func<string, T, bool> predicate)
-        {
-            var typeOfT = typeof(T);
-            Items.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
-        }
-
-        /// <inheritdoc />
-        public virtual void ClearByKey(string keyStartsWith)
-        {
-            Items.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
-        }
-
-        /// <inheritdoc />
-        public virtual void ClearByRegex(string regex)
-        {
-            var compiled = new Regex(regex, RegexOptions.Compiled);
-            Items.RemoveAll(kvp => compiled.IsMatch(kvp.Key));
-        }
-    }
-}

src/Umbraco.Core/Cache/DictionaryCacheProvider.cs

@@ -7,130 +7,79 @@ using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Cache
 {
-    /// <summary>
-    /// Implements a fast <see cref="IAppCache"/> on top of a concurrent dictionary.
-    /// </summary>
-    internal class FastDictionaryAppCache : IAppCache
+    internal class DictionaryCacheProvider : ICacheProvider
     {
-        /// <summary>
-        /// Gets the internal items dictionary, for tests only!
-        /// </summary>
-        internal readonly ConcurrentDictionary<string, Lazy<object>> Items = new ConcurrentDictionary<string, Lazy<object>>();
+        private readonly ConcurrentDictionary<string, Lazy<object>> _items
+            = new ConcurrentDictionary<string, Lazy<object>>();
 
-        /// <inheritdoc />
-        public object Get(string cacheKey)
+        // for tests
+        internal ConcurrentDictionary<string, Lazy<object>> Items => _items;
+
+        public void ClearAllCache()
         {
-            Items.TryGetValue(cacheKey, out var result); // else null
-            return result == null ? null : FastDictionaryAppCacheBase.GetSafeLazyValue(result); // return exceptions as null
+            _items.Clear();
         }
 
-        /// <inheritdoc />
-        public object Get(string cacheKey, Func<object> getCacheItem)
+        public void ClearCacheItem(string key)
         {
-            var result = Items.GetOrAdd(cacheKey, k => FastDictionaryAppCacheBase.GetSafeLazy(getCacheItem));
-
-            var value = result.Value; // will not throw (safe lazy)
-            if (!(value is FastDictionaryAppCacheBase.ExceptionHolder eh))
-                return value;
-
-            // and... it's in the cache anyway - so contrary to other cache providers,
-            // which would trick with GetSafeLazyValue, we need to remove by ourselves,
-            // in order NOT to cache exceptions
-
-            Items.TryRemove(cacheKey, out result);
-            eh.Exception.Throw(); // throw once!
-            return null; // never reached
+            _items.TryRemove(key, out _);
         }
 
-        /// <inheritdoc />
-        public IEnumerable<object> SearchByKey(string keyStartsWith)
-        {
-            return Items
-                .Where(kvp => kvp.Key.InvariantStartsWith(keyStartsWith))
-                .Select(kvp => FastDictionaryAppCacheBase.GetSafeLazyValue(kvp.Value))
-                .Where(x => x != null);
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<object> SearchByRegex(string regex)
-        {
-            var compiled = new Regex(regex, RegexOptions.Compiled);
-            return Items
-                .Where(kvp => compiled.IsMatch(kvp.Key))
-                .Select(kvp => FastDictionaryAppCacheBase.GetSafeLazyValue(kvp.Value))
-                .Where(x => x != null);
-        }
-
-        /// <inheritdoc />
-        public void Clear()
-        {
-            Items.Clear();
-        }
-
-        /// <inheritdoc />
-        public void Clear(string key)
-        {
-            Items.TryRemove(key, out _);
-        }
-
-        /// <inheritdoc />
-        public void ClearOfType(string typeName)
+        public void ClearCacheObjectTypes(string typeName)
         {
             var type = TypeFinder.GetTypeByName(typeName);
             if (type == null) return;
             var isInterface = type.IsInterface;
 
-            foreach (var kvp in Items
+            foreach (var kvp in _items
                 .Where(x =>
                 {
                     // entry.Value is Lazy<object> and not null, its value may be null
                     // remove null values as well, does not hurt
                     // get non-created as NonCreatedValue & exceptions as null
-                    var value = FastDictionaryAppCacheBase.GetSafeLazyValue(x.Value, true);
+                    var value = DictionaryCacheProviderBase.GetSafeLazyValue(x.Value, true);
 
                     // if T is an interface remove anything that implements that interface
                     // otherwise remove exact types (not inherited types)
                     return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
                 }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
         }
 
-        /// <inheritdoc />
-        public void ClearOfType<T>()
+        public void ClearCacheObjectTypes<T>()
         {
             var typeOfT = typeof(T);
             var isInterface = typeOfT.IsInterface;
 
-            foreach (var kvp in Items
+            foreach (var kvp in _items
                 .Where(x =>
                 {
                     // entry.Value is Lazy<object> and not null, its value may be null
                     // remove null values as well, does not hurt
                     // compare on exact type, don't use "is"
                     // get non-created as NonCreatedValue & exceptions as null
-                    var value = FastDictionaryAppCacheBase.GetSafeLazyValue(x.Value, true);
+                    var value = DictionaryCacheProviderBase.GetSafeLazyValue(x.Value, true);
 
                     // if T is an interface remove anything that implements that interface
                     // otherwise remove exact types (not inherited types)
                     return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
                 }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
         }
 
-        /// <inheritdoc />
-        public void ClearOfType<T>(Func<string, T, bool> predicate)
+        public void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
         {
             var typeOfT = typeof(T);
             var isInterface = typeOfT.IsInterface;
 
-            foreach (var kvp in Items
+            foreach (var kvp in _items
                 .Where(x =>
                 {
                     // entry.Value is Lazy<object> and not null, its value may be null
                     // remove null values as well, does not hurt
                     // compare on exact type, don't use "is"
                     // get non-created as NonCreatedValue & exceptions as null
-                    var value = FastDictionaryAppCacheBase.GetSafeLazyValue(x.Value, true);
+                    var value = DictionaryCacheProviderBase.GetSafeLazyValue(x.Value, true);
                     if (value == null) return true;
 
                     // if T is an interface remove anything that implements that interface
@@ -139,24 +88,60 @@ namespace Umbraco.Core.Cache
                             // run predicate on the 'public key' part only, ie without prefix
                             && predicate(x.Key, (T)value);
                 }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
         }
 
-        /// <inheritdoc />
-        public void ClearByKey(string keyStartsWith)
+        public void ClearCacheByKeySearch(string keyStartsWith)
         {
-            foreach (var ikvp in Items
+            foreach (var ikvp in _items
                 .Where(kvp => kvp.Key.InvariantStartsWith(keyStartsWith)))
-                Items.TryRemove(ikvp.Key, out _);
+                _items.TryRemove(ikvp.Key, out _);
         }
 
-        /// <inheritdoc />
-        public void ClearByRegex(string regex)
+        public void ClearCacheByKeyExpression(string regexString)
         {
-            var compiled = new Regex(regex, RegexOptions.Compiled);
-            foreach (var ikvp in Items
-                .Where(kvp => compiled.IsMatch(kvp.Key)))
-                Items.TryRemove(ikvp.Key, out _);
+            foreach (var ikvp in _items
+                .Where(kvp => Regex.IsMatch(kvp.Key, regexString)))
+                _items.TryRemove(ikvp.Key, out _);
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return _items
+                .Where(kvp => kvp.Key.InvariantStartsWith(keyStartsWith))
+                .Select(kvp => DictionaryCacheProviderBase.GetSafeLazyValue(kvp.Value))
+                .Where(x => x != null);
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return _items
+                .Where(kvp => Regex.IsMatch(kvp.Key, regexString))
+                .Select(kvp => DictionaryCacheProviderBase.GetSafeLazyValue(kvp.Value))
+                .Where(x => x != null);
+        }
+
+        public object GetCacheItem(string cacheKey)
+        {
+            _items.TryGetValue(cacheKey, out var result); // else null
+            return result == null ? null : DictionaryCacheProviderBase.GetSafeLazyValue(result); // return exceptions as null
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            var result = _items.GetOrAdd(cacheKey, k => DictionaryCacheProviderBase.GetSafeLazy(getCacheItem));
+
+            var value = result.Value; // will not throw (safe lazy)
+            if (!(value is DictionaryCacheProviderBase.ExceptionHolder eh))
+                return value;
+
+            // and... it's in the cache anyway - so contrary to other cache providers,
+            // which would trick with GetSafeLazyValue, we need to remove by ourselves,
+            // in order NOT to cache exceptions
+
+            _items.TryRemove(cacheKey, out result);
+            eh.Exception.Throw(); // throw once!
+            return null; // never reached
         }
     }
 }

src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs

@@ -8,10 +8,7 @@ using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Cache
 {
-    /// <summary>
-    /// Provides a base class to fast, dictionary-based <see cref="IAppCache"/> implementations.
-    /// </summary>
-    internal abstract class FastDictionaryAppCacheBase : IAppCache
+    internal abstract class DictionaryCacheProviderBase : ICacheProvider
     {
         // prefix cache keys so we know which one are ours
         protected const string CacheItemPrefix = "umbrtmche";
@@ -19,75 +16,82 @@ namespace Umbraco.Core.Cache
         // an object that represent a value that has not been created yet
         protected internal static readonly object ValueNotCreated = new object();
 
-        #region IAppCache
+        // manupulate the underlying cache entries
+        // these *must* be called from within the appropriate locks
+        // and use the full prefixed cache keys
+        protected abstract IEnumerable<DictionaryEntry> GetDictionaryEntries();
+        protected abstract void RemoveEntry(string key);
+        protected abstract object GetEntry(string key);
 
-        /// <inheritdoc />
-        public virtual object Get(string key)
+        // read-write lock the underlying cache
+        //protected abstract IDisposable ReadLock { get; }
+        //protected abstract IDisposable WriteLock { get; }
+
+        protected abstract void EnterReadLock();
+        protected abstract void ExitReadLock();
+        protected abstract void EnterWriteLock();
+        protected abstract void ExitWriteLock();
+
+        protected string GetCacheKey(string key)
         {
-            key = GetCacheKey(key);
-            Lazy<object> result;
-            try
-            {
-                EnterReadLock();
-                result = GetEntry(key) as Lazy<object>; // null if key not found
-            }
-            finally
-            {
-                ExitReadLock();
-            }
-            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+            return string.Format("{0}-{1}", CacheItemPrefix, key);
         }
 
-        /// <inheritdoc />
-        public abstract object Get(string key, Func<object> factory);
-
-        /// <inheritdoc />
-        public virtual IEnumerable<object> SearchByKey(string keyStartsWith)
+        protected internal static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
         {
-            var plen = CacheItemPrefix.Length + 1;
-            IEnumerable<DictionaryEntry> entries;
-            try
+            // try to generate the value and if it fails,
+            // wrap in an ExceptionHolder - would be much simpler
+            // to just use lazy.IsValueFaulted alas that field is
+            // internal
+            return new Lazy<object>(() =>
             {
-                EnterReadLock();
-                entries = GetDictionaryEntries()
-                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
-                    .ToArray(); // evaluate while locked
-            }
-            finally
-            {
-                ExitReadLock();
-            }
-
-            return entries
-                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                .Where(x => x != null); // backward compat, don't store null values in the cache
+                try
+                {
+                    return getCacheItem();
+                }
+                catch (Exception e)
+                {
+                    return new ExceptionHolder(ExceptionDispatchInfo.Capture(e));
+                }
+            });
         }
 
-        /// <inheritdoc />
-        public virtual IEnumerable<object> SearchByRegex(string regex)
+        protected internal static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
         {
-            const string prefix = CacheItemPrefix + "-";
-            var compiled = new Regex(regex, RegexOptions.Compiled);
-            var plen = prefix.Length;
-            IEnumerable<DictionaryEntry> entries;
+            // if onlyIfValueIsCreated, do not trigger value creation
+            // must return something, though, to differenciate from null values
+            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
+
+            // if execution has thrown then lazy.IsValueCreated is false
+            // and lazy.IsValueFaulted is true (but internal) so we use our
+            // own exception holder (see Lazy<T> source code) to return null
+            if (lazy.Value is ExceptionHolder) return null;
+
+            // we have a value and execution has not thrown so returning
+            // here does not throw - unless we're re-entering, take care of it
             try
             {
-                EnterReadLock();
-                entries = GetDictionaryEntries()
-                    .Where(x => compiled.IsMatch(((string)x.Key).Substring(plen)))
-                    .ToArray(); // evaluate while locked
+                return lazy.Value;
             }
-            finally
+            catch (InvalidOperationException e)
             {
-                ExitReadLock();
+                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
             }
-            return entries
-                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                .Where(x => x != null); // backward compatible, don't store null values in the cache
         }
 
-        /// <inheritdoc />
-        public virtual void Clear()
+        internal class ExceptionHolder
+        {
+            public ExceptionHolder(ExceptionDispatchInfo e)
+            {
+                Exception = e;
+            }
+
+            public ExceptionDispatchInfo Exception { get; }
+        }
+
+        #region Clear
+
+        public virtual void ClearAllCache()
         {
             try
             {
@@ -102,8 +106,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void Clear(string key)
+        public virtual void ClearCacheItem(string key)
         {
             var cacheKey = GetCacheKey(key);
             try
@@ -117,8 +120,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearCacheObjectTypes(string typeName)
         {
             var type = TypeFinder.GetTypeByName(typeName);
             if (type == null) return;
@@ -147,8 +149,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearOfType<T>()
+        public virtual void ClearCacheObjectTypes<T>()
         {
             var typeOfT = typeof(T);
             var isInterface = typeOfT.IsInterface;
@@ -177,8 +178,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearOfType<T>(Func<string, T, bool> predicate)
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
         {
             var typeOfT = typeof(T);
             var isInterface = typeOfT.IsInterface;
@@ -210,8 +210,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearByKey(string keyStartsWith)
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
         {
             var plen = CacheItemPrefix.Length + 1;
             try
@@ -228,16 +227,14 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearByRegex(string regex)
+        public virtual void ClearCacheByKeyExpression(string regexString)
         {
-            var compiled = new Regex(regex, RegexOptions.Compiled);
             var plen = CacheItemPrefix.Length + 1;
             try
             {
                 EnterWriteLock();
                 foreach (var entry in GetDictionaryEntries()
-                    .Where(x => compiled.IsMatch(((string)x.Key).Substring(plen)))
+                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
                     .ToArray())
                     RemoveEntry((string) entry.Key);
             }
@@ -249,81 +246,68 @@ namespace Umbraco.Core.Cache
 
         #endregion
 
-        #region Dictionary
+        #region Get
 
-        // manipulate the underlying cache entries
-        // these *must* be called from within the appropriate locks
-        // and use the full prefixed cache keys
-        protected abstract IEnumerable<DictionaryEntry> GetDictionaryEntries();
-        protected abstract void RemoveEntry(string key);
-        protected abstract object GetEntry(string key);
-
-        // read-write lock the underlying cache
-        //protected abstract IDisposable ReadLock { get; }
-        //protected abstract IDisposable WriteLock { get; }
-
-        protected abstract void EnterReadLock();
-        protected abstract void ExitReadLock();
-        protected abstract void EnterWriteLock();
-        protected abstract void ExitWriteLock();
-
-        protected string GetCacheKey(string key)
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
         {
-            return $"{CacheItemPrefix}-{key}";
-        }
-
-        protected internal static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
-        {
-            // try to generate the value and if it fails,
-            // wrap in an ExceptionHolder - would be much simpler
-            // to just use lazy.IsValueFaulted alas that field is
-            // internal
-            return new Lazy<object>(() =>
-            {
-                try
-                {
-                    return getCacheItem();
-                }
-                catch (Exception e)
-                {
-                    return new ExceptionHolder(ExceptionDispatchInfo.Capture(e));
-                }
-            });
-        }
-
-        protected internal static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
-        {
-            // if onlyIfValueIsCreated, do not trigger value creation
-            // must return something, though, to differentiate from null values
-            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
-
-            // if execution has thrown then lazy.IsValueCreated is false
-            // and lazy.IsValueFaulted is true (but internal) so we use our
-            // own exception holder (see Lazy<T> source code) to return null
-            if (lazy.Value is ExceptionHolder) return null;
-
-            // we have a value and execution has not thrown so returning
-            // here does not throw - unless we're re-entering, take care of it
+            var plen = CacheItemPrefix.Length + 1;
+            IEnumerable<DictionaryEntry> entries;
             try
             {
-                return lazy.Value;
+                EnterReadLock();
+                entries = GetDictionaryEntries()
+                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
+                    .ToArray(); // evaluate while locked
             }
-            catch (InvalidOperationException e)
+            finally
             {
-                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
+                ExitReadLock();
             }
+
+            return entries
+                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                    .Where(x => x != null); // backward compat, don't store null values in the cache
         }
 
-        internal class ExceptionHolder
+        public virtual IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
         {
-            public ExceptionHolder(ExceptionDispatchInfo e)
+            const string prefix = CacheItemPrefix + "-";
+            var plen = prefix.Length;
+            IEnumerable<DictionaryEntry> entries;
+            try
             {
-                Exception = e;
+                EnterReadLock();
+                entries = GetDictionaryEntries()
+                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
+                    .ToArray(); // evaluate while locked
             }
-
-            public ExceptionDispatchInfo Exception { get; }
+            finally
+            {
+                ExitReadLock();
+            }
+            return entries
+                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                    .Where(x => x != null); // backward compat, don't store null values in the cache
         }
 
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            cacheKey = GetCacheKey(cacheKey);
+            Lazy<object> result;
+            try
+            {
+                EnterReadLock();
+                result = GetEntry(cacheKey) as Lazy<object>; // null if key not found
+            }
+            finally
+            {
+                ExitReadLock();
+            }
+            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+        }
+
+        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+
         #endregion
     }
 }

src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Cache
         private readonly Func<TEntity, TId> _entityGetId;
         private readonly bool _expires;
 
-        public FullDataSetRepositoryCachePolicy(IAppPolicyCache cache, IScopeAccessor scopeAccessor, Func<TEntity, TId> entityGetId, bool expires)
+        public FullDataSetRepositoryCachePolicy(IRuntimeCacheProvider cache, IScopeAccessor scopeAccessor, Func<TEntity, TId> entityGetId, bool expires)
             : base(cache, scopeAccessor)
         {
             _entityGetId = entityGetId;
@@ -55,11 +55,11 @@ namespace Umbraco.Core.Cache
 
             if (_expires)
             {
-                Cache.Insert(key, () => new DeepCloneableList<TEntity>(entities), TimeSpan.FromMinutes(5), true);
+                Cache.InsertCacheItem(key, () => new DeepCloneableList<TEntity>(entities), TimeSpan.FromMinutes(5), true);
             }
             else
             {
-                Cache.Insert(key, () => new DeepCloneableList<TEntity>(entities));
+                Cache.InsertCacheItem(key, () => new DeepCloneableList<TEntity>(entities));
             }
         }
 
@@ -171,7 +171,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public override void ClearAll()
         {
-            Cache.Clear(GetEntityTypeCacheKey());
+            Cache.ClearCacheItem(GetEntityTypeCacheKey());
         }
     }
 }

src/Umbraco.Core/Cache/HttpRequestAppCache.cs

@@ -1,144 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Web;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Implements a fast <see cref="IAppCache"/> on top of HttpContext.Items.
-    /// </summary>
-    /// <remarks>
-    /// <para>If no current HttpContext items can be found (no current HttpContext,
-    /// or no Items...) then this cache acts as a pass-through and does not cache
-    /// anything.</para>
-    /// </remarks>
-    internal class HttpRequestAppCache : FastDictionaryAppCacheBase
-    {
-        private readonly HttpContextBase _context;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpRequestAppCache"/> class with a context, for unit tests!
-        /// </summary>
-        public HttpRequestAppCache(HttpContextBase context)
-        {
-            _context = context;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpRequestAppCache"/> class.
-        /// </summary>
-        /// <remarks>
-        /// <para>Will use HttpContext.Current.</para>
-        /// TODO: https://github.com/umbraco/Umbraco-CMS/issues/4239 - use IHttpContextAccessor NOT HttpContext.Current
-        /// </remarks>
-        public HttpRequestAppCache()
-        { }
-
-        private IDictionary ContextItems => _context?.Items ?? HttpContext.Current?.Items;
-
-        private bool HasContextItems => _context?.Items != null || HttpContext.Current != null;
-
-        /// <inheritdoc />
-        public override object Get(string key, Func<object> factory)
-        {
-            //no place to cache so just return the callback result
-            if (HasContextItems == false) return factory();
-
-            key = GetCacheKey(key);
-
-            Lazy<object> result;
-
-            try
-            {
-                EnterWriteLock();
-                result = ContextItems[key] as Lazy<object>; // null if key not found
-
-                // cannot create value within the lock, so if result.IsValueCreated is false, just
-                // do nothing here - means that if creation throws, a race condition could cause
-                // more than one thread to reach the return statement below and throw - accepted.
-
-                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
-                {
-                    result = GetSafeLazy(factory);
-                    ContextItems[key] = result;
-                }
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-
-            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
-            // exceptions (but try again and again) and silently eat them - however at
-            // some point we have to report them - so need to re-throw here
-
-            // this does not throw anymore
-            //return result.Value;
-
-            var value = result.Value; // will not throw (safe lazy)
-            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
-            return value;
-        }
-
-        #region Entries
-
-        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
-        {
-            const string prefix = CacheItemPrefix + "-";
-
-            if (HasContextItems == false) return Enumerable.Empty<DictionaryEntry>();
-
-            return ContextItems.Cast<DictionaryEntry>()
-                .Where(x => x.Key is string s && s.StartsWith(prefix));
-        }
-
-        protected override void RemoveEntry(string key)
-        {
-            if (HasContextItems == false) return;
-
-            ContextItems.Remove(key);
-        }
-
-        protected override object GetEntry(string key)
-        {
-            return HasContextItems ? ContextItems[key] : null;
-        }
-
-        #endregion
-
-        #region Lock
-
-        private const string ContextItemsLockKey = "Umbraco.Core.Cache.HttpRequestCache::LockEntered";
-
-        protected override void EnterReadLock() => EnterWriteLock();
-
-        protected override void EnterWriteLock()
-        {
-            if (HasContextItems)
-            {
-                // note: cannot keep 'entered' as a class variable here,
-                // since there is one per request - so storing it within
-                // ContextItems - which is locked, so this should be safe
-
-                var entered = false;
-                Monitor.Enter(ContextItems.SyncRoot, ref entered);
-                ContextItems[ContextItemsLockKey] = entered;
-            }
-        }
-
-        protected override void ExitReadLock() => ExitWriteLock();
-
-        protected override void ExitWriteLock()
-        {
-            var entered = (bool?) ContextItems[ContextItemsLockKey] ?? false;
-            if (entered)
-                Monitor.Exit(ContextItems.SyncRoot);
-            ContextItems.Remove(ContextItemsLockKey);
-        }
-
-        #endregion
-    }
-}

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache provider that caches items in the HttpContext.Items
+    /// </summary>
+    /// <remarks>
+    /// If the Items collection is null, then this provider has no effect
+    /// </remarks>
+    internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
+    {
+        // context provider
+        // the idea is that there is only one, application-wide HttpRequestCacheProvider instance,
+        // that is initialized with a method that returns the "current" context.
+        // NOTE
+        //   but then it is initialized with () => new HttpContextWrapper(HttpContent.Current)
+        //   which is higly inefficient because it creates a new wrapper each time we refer to _context()
+        //   so replace it with _context1 and _context2 below + a way to get context.Items.
+        //private readonly Func<HttpContextBase> _context;
+
+        // NOTE
+        //   and then in almost 100% cases _context2 will be () => HttpContext.Current
+        //   so why not bring that logic in here and fallback on to HttpContext.Current when
+        //   _context1 is null?
+        //private readonly HttpContextBase _context1;
+        //private readonly Func<HttpContext> _context2;
+        private readonly HttpContextBase _context;
+
+        private IDictionary ContextItems
+        {
+            //get { return _context1 != null ? _context1.Items : _context2().Items; }
+            get { return _context != null ? _context.Items : HttpContext.Current.Items; }
+        }
+
+        private bool HasContextItems
+        {
+            get { return (_context != null && _context.Items != null) || HttpContext.Current != null; }
+        }
+
+        // for unit tests
+        public HttpRequestCacheProvider(HttpContextBase context)
+        {
+            _context = context;
+        }
+
+        // main constructor
+        // will use HttpContext.Current
+        public HttpRequestCacheProvider(/*Func<HttpContext> context*/)
+        {
+            //_context2 = context;
+        }
+
+        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
+        {
+            const string prefix = CacheItemPrefix + "-";
+
+            if (HasContextItems == false) return Enumerable.Empty<DictionaryEntry>();
+
+            return ContextItems.Cast<DictionaryEntry>()
+                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
+        }
+
+        protected override void RemoveEntry(string key)
+        {
+            if (HasContextItems == false) return;
+
+            ContextItems.Remove(key);
+        }
+
+        protected override object GetEntry(string key)
+        {
+            return HasContextItems ? ContextItems[key] : null;
+        }
+
+        #region Lock
+
+        private bool _entered;
+
+        protected override void EnterReadLock() => EnterWriteLock();
+
+        protected override void EnterWriteLock()
+        {
+            if (HasContextItems)
+            {
+                System.Threading.Monitor.Enter(ContextItems.SyncRoot, ref _entered);
+            }
+        }
+
+        protected override void ExitReadLock() => ExitWriteLock();
+
+        protected override void ExitWriteLock()
+        {
+            if (_entered)
+            {
+                _entered = false;
+                System.Threading.Monitor.Exit(ContextItems.SyncRoot);
+            }
+        }
+
+        #endregion
+
+        #region Get
+
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            //no place to cache so just return the callback result
+            if (HasContextItems == false) return getCacheItem();
+
+            cacheKey = GetCacheKey(cacheKey);
+
+            Lazy<object> result;
+
+            try
+            {
+                EnterWriteLock();
+                result = ContextItems[cacheKey] as Lazy<object>; // null if key not found
+
+                // cannot create value within the lock, so if result.IsValueCreated is false, just
+                // do nothing here - means that if creation throws, a race condition could cause
+                // more than one thread to reach the return statement below and throw - accepted.
+
+                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = GetSafeLazy(getCacheItem);
+                    ContextItems[cacheKey] = result;
+                }
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+
+            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
+            // exceptions (but try again and again) and silently eat them - however at
+            // some point we have to report them - so need to re-throw here
+
+            // this does not throw anymore
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
+            return value;
+        }
+
+        #endregion
+
+        #region Insert
+        #endregion
+
+        private class NoopLocker : DisposableObjectSlim
+        {
+            protected override void DisposeResources()
+            { }
+        }
+    }
+}

src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs

@@ -4,14 +4,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Web.Caching;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
 
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// Implements <see cref="IAppPolicyCache"/> on top of a <see cref="System.Web.Caching.Cache"/>.
+    /// A CacheProvider that wraps the logic of the HttpRuntime.Cache
     /// </summary>
-    /// <remarks>The underlying cache is expected to be HttpRuntime.Cache.</remarks>
-    internal class WebCachingAppCache : FastDictionaryAppCacheBase, IAppPolicyCache
+    internal class HttpRuntimeCacheProvider : DictionaryCacheProviderBase, IRuntimeCacheProvider
     {
         // locker object that supports upgradeable read locking
         // does not need to support recursion if we implement the cache correctly and ensure
@@ -21,43 +21,16 @@ namespace Umbraco.Core.Cache
         private readonly System.Web.Caching.Cache _cache;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="WebCachingAppCache"/> class.
+        /// Used for debugging
         /// </summary>
-        public WebCachingAppCache(System.Web.Caching.Cache cache)
+        internal Guid InstanceId { get; private set; }
+
+        public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
         {
             _cache = cache;
+            InstanceId = Guid.NewGuid();
         }
 
-        /// <inheritdoc />
-        public override object Get(string key, Func<object> factory)
-        {
-            return Get(key, factory, null, dependentFiles: null);
-        }
-
-        /// <inheritdoc />
-        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            return Get(key, factory, timeout, isSliding, priority, removedCallback, dependency);
-        }
-
-        /// <inheritdoc />
-        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            Insert(key, factory, timeout, isSliding, priority, removedCallback, dependency);
-        }
-
-        #region Dictionary
-
         protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
         {
             const string prefix = CacheItemPrefix + "-";
@@ -75,8 +48,6 @@ namespace Umbraco.Core.Cache
             return _cache.Get(key);
         }
 
-        #endregion
-
         #region Lock
 
         protected override void EnterReadLock()
@@ -103,9 +74,33 @@ namespace Umbraco.Core.Cache
 
         #endregion
 
-        private object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        #region Get
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
         {
-            key = GetCacheKey(key);
+            return GetCacheItem(cacheKey, getCacheItem, null, dependentFiles: null);
+        }
+
+        /// <summary>
+        /// This overload is here for legacy purposes
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <param name="timeout"></param>
+        /// <param name="isSliding"></param>
+        /// <param name="priority"></param>
+        /// <param name="removedCallback"></param>
+        /// <param name="dependency"></param>
+        /// <returns></returns>
+        internal object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        {
+            cacheKey = GetCacheKey(cacheKey);
 
             // NOTE - because we don't know what getCacheItem does, how long it will take and whether it will hang,
             // getCacheItem should run OUTSIDE of the global application lock else we run into lock contention and
@@ -138,7 +133,7 @@ namespace Umbraco.Core.Cache
             try
             {
                 _locker.EnterReadLock();
-                result = _cache.Get(key) as Lazy<object>; // null if key not found
+                result = _cache.Get(cacheKey) as Lazy<object>; // null if key not found
             }
             finally
             {
@@ -150,7 +145,7 @@ namespace Umbraco.Core.Cache
 
             using (var lck = new UpgradeableReadLock(_locker))
             {
-                result = _cache.Get(key) as Lazy<object>; // null if key not found
+                result = _cache.Get(cacheKey) as Lazy<object>; // null if key not found
 
                 // cannot create value within the lock, so if result.IsValueCreated is false, just
                 // do nothing here - means that if creation throws, a race condition could cause
@@ -158,13 +153,13 @@ namespace Umbraco.Core.Cache
 
                 if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                 {
-                    result = GetSafeLazy(factory);
+                    result = GetSafeLazy(getCacheItem);
                     var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
                     var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
 
                     lck.UpgradeToWriteLock();
                     //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                    _cache.Insert(key, result, dependency, absolute, sliding, priority, removedCallback);
+                    _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
                 }
             }
 
@@ -180,7 +175,31 @@ namespace Umbraco.Core.Cache
             return value;
         }
 
-        private void Insert(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            CacheDependency dependency = null;
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                dependency = new CacheDependency(dependentFiles);
+            }
+            return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
+        }
+
+        #endregion
+
+        #region Insert
+
+        /// <summary>
+        /// This overload is here for legacy purposes
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <param name="timeout"></param>
+        /// <param name="isSliding"></param>
+        /// <param name="priority"></param>
+        /// <param name="removedCallback"></param>
+        /// <param name="dependency"></param>
+        internal void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
         {
             // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
             // and make sure we don't store a null value.
@@ -206,5 +225,17 @@ namespace Umbraco.Core.Cache
                     _locker.ExitWriteLock();
             }
         }
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            CacheDependency dependency = null;
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                dependency = new CacheDependency(dependentFiles);
+            }
+            InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
+        }
+
+        #endregion
     }
 }

src/Umbraco.Core/Cache/IAppCache.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Defines an application cache.
-    /// </summary>
-    public interface IAppCache
-    {
-        /// <summary>
-        /// Gets an item identified by its key.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        /// <returns>The item, or null if the item was not found.</returns>
-        object Get(string key);
-
-        /// <summary>
-        /// Gets or creates an item identified by its key.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        /// <param name="factory">A factory function that can create the item.</param>
-        /// <returns>The item.</returns>
-        object Get(string key, Func<object> factory);
-
-        /// <summary>
-        /// Gets items with a key starting with the specified value.
-        /// </summary>
-        /// <param name="keyStartsWith">The StartsWith value to use in the search.</param>
-        /// <returns>Items matching the search.</returns>
-        IEnumerable<object> SearchByKey(string keyStartsWith);
-
-        /// <summary>
-        /// Gets items with a key matching a regular expression.
-        /// </summary>
-        /// <param name="regex">The regular expression.</param>
-        /// <returns>Items matching the search.</returns>
-        IEnumerable<object> SearchByRegex(string regex);
-
-        /// <summary>
-        /// Removes all items from the cache.
-        /// </summary>
-        void Clear();
-
-        /// <summary>
-        /// Removes an item identified by its key from the cache.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        void Clear(string key);
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </summary>
-        /// <param name="typeName">The name of the type to remove.</param>
-        /// <remarks>
-        /// <para>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</para>
-        /// <para>Performs a case-sensitive search.</para>
-        /// </remarks>
-        void ClearOfType(string typeName);
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </summary>
-        /// <typeparam name="T">The type of the items to remove.</typeparam>
-        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</remarks>
-        void ClearOfType<T>();
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </summary>
-        /// <typeparam name="T">The type of the items to remove.</typeparam>
-        /// <param name="predicate">The predicate to satisfy.</param>
-        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</remarks>
-        void ClearOfType<T>(Func<string, T, bool> predicate);
-
-        /// <summary>
-        /// Clears items with a key starting with the specified value.
-        /// </summary>
-        /// <param name="keyStartsWith">The StartsWith value to use in the search.</param>
-        void ClearByKey(string keyStartsWith);
-
-        /// <summary>
-        /// Clears items with a key matching a regular expression.
-        /// </summary>
-        /// <param name="regex">The regular expression.</param>
-        void ClearByRegex(string regex);
-    }
-}

src/Umbraco.Core/Cache/IAppPolicyCache.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Web.Caching;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Defines an application cache that support cache policies.
-    /// </summary>
-    /// <remarks>A cache policy can be used to cache with timeouts,
-    /// or depending on files, and with a remove callback, etc.</remarks>
-    public interface IAppPolicyCache : IAppCache
-    {
-        /// <summary>
-        /// Gets an item identified by its key.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        /// <param name="factory">A factory function that can create the item.</param>
-        /// <param name="timeout">An optional cache timeout.</param>
-        /// <param name="isSliding">An optional value indicating whether the cache timeout is sliding (default is false).</param>
-        /// <param name="priority">An optional cache priority (default is Normal).</param>
-        /// <param name="removedCallback">An optional callback to handle removals.</param>
-        /// <param name="dependentFiles">Files the cache entry depends on.</param>
-        /// <returns>The item.</returns>
-        object Get(
-            string key,
-            Func<object> factory,
-            TimeSpan? timeout,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null);
-
-        /// <summary>
-        /// Inserts an item.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        /// <param name="factory">A factory function that can create the item.</param>
-        /// <param name="timeout">An optional cache timeout.</param>
-        /// <param name="isSliding">An optional value indicating whether the cache timeout is sliding (default is false).</param>
-        /// <param name="priority">An optional cache priority (default is Normal).</param>
-        /// <param name="removedCallback">An optional callback to handle removals.</param>
-        /// <param name="dependentFiles">Files the cache entry depends on.</param>
-        void Insert(
-            string key,
-            Func<object> factory,
-            TimeSpan? timeout = null,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null);
-    }
-}

src/Umbraco.Core/Cache/ICacheProvider.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An interface for implementing a basic cache provider
+    /// </summary>
+    public interface ICacheProvider
+    {
+        /// <summary>
+        /// Removes all items from the cache.
+        /// </summary>
+        void ClearAllCache();
+
+        /// <summary>
+        /// Removes an item from the cache, identified by its key.
+        /// </summary>
+        /// <param name="key">The key of the item.</param>
+        void ClearCacheItem(string key);
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type.
+        /// </summary>
+        /// <param name="typeName">The name of the type to remove.</param>
+        /// <remarks>
+        /// <para>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</para>
+        /// <para>Performs a case-sensitive search.</para>
+        /// </remarks>
+        void ClearCacheObjectTypes(string typeName);
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of the items to remove.</typeparam>
+        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</remarks>
+        void ClearCacheObjectTypes<T>();
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type, satisfying a predicate.
+        /// </summary>
+        /// <typeparam name="T">The type of the items to remove.</typeparam>
+        /// <param name="predicate">The predicate to satisfy.</param>
+        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</remarks>
+        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
+
+        void ClearCacheByKeySearch(string keyStartsWith);
+        void ClearCacheByKeyExpression(string regexString);
+
+        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
+        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
+
+        /// <summary>
+        /// Returns an item with a given key
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        object GetCacheItem(string cacheKey);
+
+        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+    }
+}

src/Umbraco.Core/Cache/ICacheRefresher.cs

@@ -4,7 +4,7 @@ using Umbraco.Core.Composing;
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// The IcacheRefresher Interface is used for load balancing.
+    /// The IcacheRefresher Interface is used for loadbalancing.
     ///
     /// </summary>
     public interface ICacheRefresher : IDiscoverable

src/Umbraco.Core/Cache/IRepositoryCachePolicy.cs

@@ -48,7 +48,7 @@ namespace Umbraco.Core.Cache
         /// Updates an entity.
         /// </summary>
         /// <param name="entity">The entity.</param>
-        /// <param name="persistUpdated">The repository PersistUpdatedItem method.</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);
 

src/Umbraco.Core/Cache/IRuntimeCacheProvider.cs

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

src/Umbraco.Core/Cache/IsolatedCaches.cs

@@ -1,41 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Represents a dictionary of <see cref="IAppPolicyCache"/> for types.
-    /// </summary>
-    /// <remarks>
-    /// <para>Isolated caches are used by e.g. repositories, to ensure that each cached entity
-    /// type has its own cache, so that lookups are fast and the repository does not need to
-    /// search through all keys on a global scale.</para>
-    /// </remarks>
-    public class IsolatedCaches : AppPolicedCacheDictionary<Type>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IsolatedCaches"/> class.
-        /// </summary>
-        /// <param name="cacheFactory"></param>
-        public IsolatedCaches(Func<Type, IAppPolicyCache> cacheFactory)
-            : base(cacheFactory)
-        { }
-
-        /// <summary>
-        /// Gets a cache.
-        /// </summary>
-        public IAppPolicyCache GetOrCreate<T>()
-            => GetOrCreate(typeof(T));
-
-        /// <summary>
-        /// Tries to get a cache.
-        /// </summary>
-        public Attempt<IAppPolicyCache> Get<T>()
-            => Get(typeof(T));
-
-        /// <summary>
-        /// Clears a cache.
-        /// </summary>
-        public void ClearCache<T>()
-            => ClearCache(typeof(T));
-    }
-}

src/Umbraco.Core/Cache/IsolatedRuntimeCache.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Concurrent;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Used to get/create/manipulate isolated runtime cache
+    /// </summary>
+    /// <remarks>
+    /// This is useful for repository level caches to ensure that cache lookups by key are fast so
+    /// that the repository doesn't need to search through all keys on a global scale.
+    /// </remarks>
+    public class IsolatedRuntimeCache
+    {
+        internal Func<Type, IRuntimeCacheProvider> CacheFactory { get; set; }
+
+        /// <summary>
+        /// Constructor that allows specifying a factory for the type of runtime isolated cache to create
+        /// </summary>
+        /// <param name="cacheFactory"></param>
+        public IsolatedRuntimeCache(Func<Type, IRuntimeCacheProvider> cacheFactory)
+        {
+            CacheFactory = cacheFactory;
+        }
+
+        private readonly ConcurrentDictionary<Type, IRuntimeCacheProvider> _isolatedCache = new ConcurrentDictionary<Type, IRuntimeCacheProvider>();
+
+        /// <summary>
+        /// Returns an isolated runtime cache for a given type
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public IRuntimeCacheProvider GetOrCreateCache<T>()
+        {
+            return _isolatedCache.GetOrAdd(typeof(T), type => CacheFactory(type));
+        }
+
+        /// <summary>
+        /// Returns an isolated runtime cache for a given type
+        /// </summary>
+        /// <returns></returns>
+        public IRuntimeCacheProvider GetOrCreateCache(Type type)
+        {
+            return _isolatedCache.GetOrAdd(type, t => CacheFactory(t));
+        }
+
+        /// <summary>
+        /// Tries to get a cache by the type specified
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public Attempt<IRuntimeCacheProvider> GetCache<T>()
+        {
+            IRuntimeCacheProvider cache;
+            if (_isolatedCache.TryGetValue(typeof(T), out cache))
+            {
+                return Attempt.Succeed(cache);
+            }
+            return Attempt<IRuntimeCacheProvider>.Fail();
+        }
+
+        /// <summary>
+        /// Clears all values inside this isolated runtime cache
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public void ClearCache<T>()
+        {
+            IRuntimeCacheProvider cache;
+            if (_isolatedCache.TryGetValue(typeof(T), out cache))
+            {
+                cache.ClearAllCache();
+            }
+        }
+
+        /// <summary>
+        /// Clears all of the isolated caches
+        /// </summary>
+        public void ClearAllCaches()
+        {
+            foreach (var key in _isolatedCache.Keys)
+            {
+                IRuntimeCacheProvider cache;
+                if (_isolatedCache.TryRemove(key, out cache))
+                {
+                    cache.ClearAllCache();
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Cache/JsonCacheRefresherBase.cs

@@ -13,8 +13,8 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Initializes a new instance of the <see cref="JsonCacheRefresherBase{TInstanceType}"/>.
         /// </summary>
-        /// <param name="appCaches">A cache helper.</param>
-        protected JsonCacheRefresherBase(AppCaches appCaches) : base(appCaches)
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected JsonCacheRefresherBase(CacheHelper cacheHelper) : base(cacheHelper)
         { }
 
         /// <summary>

src/Umbraco.Core/Cache/NoAppCache.cs

@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Caching;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Implements <see cref="IAppPolicyCache"/> and do not cache.
-    /// </summary>
-    public class NoAppCache : IAppPolicyCache
-    {
-        private NoAppCache() { }
-
-        /// <summary>
-        /// Gets the singleton instance.
-        /// </summary>
-        public static NoAppCache Instance { get; } = new NoAppCache();
-
-        /// <inheritdoc />
-        public virtual object Get(string cacheKey)
-        {
-            return null;
-        }
-
-        /// <inheritdoc />
-        public virtual object Get(string cacheKey, Func<object> factory)
-        {
-            return factory();
-        }
-
-        /// <inheritdoc />
-        public virtual IEnumerable<object> SearchByKey(string keyStartsWith)
-        {
-            return Enumerable.Empty<object>();
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<object> SearchByRegex(string regex)
-        {
-            return Enumerable.Empty<object>();
-        }
-
-        /// <inheritdoc />
-        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            return factory();
-        }
-
-        /// <inheritdoc />
-        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        { }
-
-        /// <inheritdoc />
-        public virtual void Clear()
-        { }
-
-        /// <inheritdoc />
-        public virtual void Clear(string key)
-        { }
-
-        /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
-        { }
-
-        /// <inheritdoc />
-        public virtual void ClearOfType<T>()
-        { }
-
-        /// <inheritdoc />
-        public virtual void ClearOfType<T>(Func<string, T, bool> predicate)
-        { }
-
-        /// <inheritdoc />
-        public virtual void ClearByKey(string keyStartsWith)
-        { }
-
-        /// <inheritdoc />
-        public virtual void ClearByRegex(string regex)
-        { }
-    }
-}

src/Umbraco.Core/Cache/NoCacheRepositoryCachePolicy.cs

@@ -13,7 +13,7 @@ namespace Umbraco.Core.Cache
 
         public static NoCacheRepositoryCachePolicy<TEntity, TId> Instance { get; } = new NoCacheRepositoryCachePolicy<TEntity, TId>();
 
-        public IRepositoryCachePolicy<TEntity, TId> Scoped(IAppPolicyCache runtimeCache, IScope scope)
+        public IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
         {
             throw new NotImplementedException();
         }

src/Umbraco.Core/Cache/NullCacheProvider.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Represents a cache provider that does not cache anything.
+    /// </summary>
+    public class NullCacheProvider : IRuntimeCacheProvider
+    {
+        private NullCacheProvider() { }
+
+        public static NullCacheProvider Instance { get; } = new NullCacheProvider();
+
+        public virtual void ClearAllCache()
+        { }
+
+        public virtual void ClearCacheItem(string key)
+        { }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        { }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        { }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        { }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        { }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        { }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return Enumerable.Empty<object>();
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return Enumerable.Empty<object>();
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            return default(object);
+        }
+
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            return getCacheItem();
+        }
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        { }
+    }
+}

src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs

@@ -11,142 +11,31 @@ using CacheItemPriority = System.Web.Caching.CacheItemPriority;
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// Implements <see cref="IAppPolicyCache"/> on top of a <see cref="ObjectCache"/>.
+    /// Represents a cache provider that caches item in a <see cref="MemoryCache"/>.
+    /// A cache provider that wraps the logic of a System.Runtime.Caching.ObjectCache
     /// </summary>
-    public class ObjectCacheAppCache : IAppPolicyCache
+    /// <remarks>The <see cref="MemoryCache"/> is created with name "in-memory". That name is
+    /// used to retrieve configuration options. It does not identify the memory cache, i.e.
+    /// each instance of this class has its own, independent, memory cache.</remarks>
+    public class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
     {
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        internal ObjectCache MemoryCache;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ObjectCacheAppCache"/>.
+        /// Used for debugging
         /// </summary>
-        public ObjectCacheAppCache()
+        internal Guid InstanceId { get; private set; }
+
+        public ObjectCacheRuntimeCacheProvider()
         {
-            // the MemoryCache is created with name "in-memory". That name is
-            // used to retrieve configuration options. It does not identify the memory cache, i.e.
-            // each instance of this class has its own, independent, memory cache.
             MemoryCache = new MemoryCache("in-memory");
+            InstanceId = Guid.NewGuid();
         }
 
-        /// <summary>
-        /// Gets the internal memory cache, for tests only!
-        /// </summary>
-        internal ObjectCache MemoryCache { get; private set; }
+        #region Clear
 
-        /// <inheritdoc />
-        public object Get(string key)
-        {
-            Lazy<object> result;
-            try
-            {
-                _locker.EnterReadLock();
-                result = MemoryCache.Get(key) as Lazy<object>; // null if key not found
-            }
-            finally
-            {
-                if (_locker.IsReadLockHeld)
-                    _locker.ExitReadLock();
-            }
-            return result == null ? null : FastDictionaryAppCacheBase.GetSafeLazyValue(result); // return exceptions as null
-        }
-
-        /// <inheritdoc />
-        public object Get(string key, Func<object> factory)
-        {
-            return Get(key, factory, null);
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<object> SearchByKey(string keyStartsWith)
-        {
-            KeyValuePair<string, object>[] entries;
-            try
-            {
-                _locker.EnterReadLock();
-                entries = MemoryCache
-                    .Where(x => x.Key.InvariantStartsWith(keyStartsWith))
-                    .ToArray(); // evaluate while locked
-            }
-            finally
-            {
-                if (_locker.IsReadLockHeld)
-                    _locker.ExitReadLock();
-            }
-            return entries
-                .Select(x => FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                .Where(x => x != null) // backward compat, don't store null values in the cache
-                .ToList();
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<object> SearchByRegex(string regex)
-        {
-            var compiled = new Regex(regex, RegexOptions.Compiled);
-
-            KeyValuePair<string, object>[] entries;
-            try
-            {
-                _locker.EnterReadLock();
-                entries = MemoryCache
-                    .Where(x => compiled.IsMatch(x.Key))
-                    .ToArray(); // evaluate while locked
-            }
-            finally
-            {
-                if (_locker.IsReadLockHeld)
-                    _locker.ExitReadLock();
-            }
-            return entries
-                .Select(x => FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                .Where(x => x != null) // backward compat, don't store null values in the cache
-                .ToList();
-        }
-
-        /// <inheritdoc />
-        public object Get(string key, Func<object> factory, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            // see notes in HttpRuntimeAppCache
-
-            Lazy<object> result;
-
-            using (var lck = new UpgradeableReadLock(_locker))
-            {
-                result = MemoryCache.Get(key) as Lazy<object>;
-                if (result == null || FastDictionaryAppCacheBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
-                {
-                    result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
-                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
-
-                    lck.UpgradeToWriteLock();
-                    //NOTE: This does an add or update
-                    MemoryCache.Set(key, result, policy);
-                }
-            }
-
-            //return result.Value;
-
-            var value = result.Value; // will not throw (safe lazy)
-            if (value is FastDictionaryAppCacheBase.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
-            return value;
-        }
-
-        /// <inheritdoc />
-        public void Insert(string key, Func<object> factory, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
-            // and make sure we don't store a null value.
-
-            var result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
-            var value = result.Value; // force evaluation now
-            if (value == null) return; // do not store null values (backward compat)
-
-            var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
-            //NOTE: This does an add or update
-            MemoryCache.Set(key, result, policy);
-        }
-
-        /// <inheritdoc />
-        public virtual void Clear()
+        public virtual void ClearAllCache()
         {
             try
             {
@@ -161,8 +50,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void Clear(string key)
+        public virtual void ClearCacheItem(string key)
         {
             try
             {
@@ -177,8 +65,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearOfType(string typeName)
+        public virtual void ClearCacheObjectTypes(string typeName)
         {
             var type = TypeFinder.GetTypeByName(typeName);
             if (type == null) return;
@@ -192,7 +79,7 @@ namespace Umbraco.Core.Cache
                         // x.Value is Lazy<object> and not null, its value may be null
                         // remove null values as well, does not hurt
                         // get non-created as NonCreatedValue & exceptions as null
-                        var value = FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
 
                         // if T is an interface remove anything that implements that interface
                         // otherwise remove exact types (not inherited types)
@@ -209,13 +96,12 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearOfType<T>()
+        public virtual void ClearCacheObjectTypes<T>()
         {
             try
             {
                 _locker.EnterWriteLock();
-                var typeOfT = typeof(T);
+                var typeOfT = typeof (T);
                 var isInterface = typeOfT.IsInterface;
                 foreach (var key in MemoryCache
                     .Where(x =>
@@ -223,7 +109,7 @@ namespace Umbraco.Core.Cache
                         // x.Value is Lazy<object> and not null, its value may be null
                         // remove null values as well, does not hurt
                         // get non-created as NonCreatedValue & exceptions as null
-                        var value = FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
 
                         // if T is an interface remove anything that implements that interface
                         // otherwise remove exact types (not inherited types)
@@ -241,8 +127,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearOfType<T>(Func<string, T, bool> predicate)
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
         {
             try
             {
@@ -255,7 +140,7 @@ namespace Umbraco.Core.Cache
                         // x.Value is Lazy<object> and not null, its value may be null
                         // remove null values as well, does not hurt
                         // get non-created as NonCreatedValue & exceptions as null
-                        var value = FastDictionaryAppCacheBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
                         if (value == null) return true;
 
                         // if T is an interface remove anything that implements that interface
@@ -274,8 +159,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearByKey(string keyStartsWith)
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
         {
             try
             {
@@ -293,16 +177,13 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <inheritdoc />
-        public virtual void ClearByRegex(string regex)
+        public virtual void ClearCacheByKeyExpression(string regexString)
         {
-            var compiled = new Regex(regex, RegexOptions.Compiled);
-
             try
             {
                 _locker.EnterWriteLock();
                 foreach (var key in MemoryCache
-                    .Where(x => compiled.IsMatch(x.Key))
+                    .Where(x => Regex.IsMatch(x.Key, regexString))
                     .Select(x => x.Key)
                     .ToArray()) // ToArray required to remove
                     MemoryCache.Remove(key);
@@ -314,6 +195,120 @@ namespace Umbraco.Core.Cache
             }
         }
 
+        #endregion
+
+        #region Get
+
+        public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            KeyValuePair<string, object>[] entries;
+            try
+            {
+                _locker.EnterReadLock();
+                entries = MemoryCache
+                    .Where(x => x.Key.InvariantStartsWith(keyStartsWith))
+                    .ToArray(); // evaluate while locked
+            }
+            finally
+            {
+                if (_locker.IsReadLockHeld)
+                    _locker.ExitReadLock();
+            }
+            return entries
+                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Where(x => x != null) // backward compat, don't store null values in the cache
+                .ToList();
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            KeyValuePair<string, object>[] entries;
+            try
+            {
+                _locker.EnterReadLock();
+                entries = MemoryCache
+                    .Where(x => Regex.IsMatch(x.Key, regexString))
+                    .ToArray(); // evaluate while locked
+            }
+            finally
+            {
+                if (_locker.IsReadLockHeld)
+                    _locker.ExitReadLock();
+            }
+            return entries
+                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Where(x => x != null) // backward compat, don't store null values in the cache
+                .ToList();
+        }
+
+        public object GetCacheItem(string cacheKey)
+        {
+            Lazy<object> result;
+            try
+            {
+                _locker.EnterReadLock();
+                result = MemoryCache.Get(cacheKey) as Lazy<object>; // null if key not found
+            }
+            finally
+            {
+                if (_locker.IsReadLockHeld)
+                    _locker.ExitReadLock();
+            }
+            return result == null ? null : DictionaryCacheProviderBase.GetSafeLazyValue(result); // return exceptions as null
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, getCacheItem, null);
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            // see notes in HttpRuntimeCacheProvider
+
+            Lazy<object> result;
+
+            using (var lck = new UpgradeableReadLock(_locker))
+            {
+                result = MemoryCache.Get(cacheKey) as Lazy<object>;
+                if (result == null || DictionaryCacheProviderBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
+                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+
+                    lck.UpgradeToWriteLock();
+                    //NOTE: This does an add or update
+                    MemoryCache.Set(cacheKey, result, policy);
+                }
+            }
+
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            if (value is DictionaryCacheProviderBase.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
+            return value;
+        }
+
+        #endregion
+
+        #region Insert
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
+            // and make sure we don't store a null value.
+
+            var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
+            var value = result.Value; // force evaluation now
+            if (value == null) return; // do not store null values (backward compat)
+
+            var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+            //NOTE: This does an add or update
+            MemoryCache.Set(cacheKey, result, policy);
+        }
+
+        #endregion
+
         private static CacheItemPolicy GetPolicy(TimeSpan? timeout = null, bool isSliding = false, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
         {
             var absolute = isSliding ? ObjectCache.InfiniteAbsoluteExpiration : (timeout == null ? ObjectCache.InfiniteAbsoluteExpiration : DateTime.Now.Add(timeout.Value));

src/Umbraco.Core/Cache/PayloadCacheRefresherBase.cs

@@ -15,8 +15,8 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Initializes a new instance of the <see cref="PayloadCacheRefresherBase{TInstanceType, TPayload}"/>.
         /// </summary>
-        /// <param name="appCaches">A cache helper.</param>
-        protected PayloadCacheRefresherBase(AppCaches appCaches) : base(appCaches)
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected PayloadCacheRefresherBase(CacheHelper cacheHelper) : base(cacheHelper)
         { }
 
         #region Json

src/Umbraco.Core/Cache/RepositoryCachePolicyBase.cs

@@ -13,16 +13,16 @@ namespace Umbraco.Core.Cache
     internal abstract class RepositoryCachePolicyBase<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
         where TEntity : class, IEntity
     {
-        private readonly IAppPolicyCache _globalCache;
+        private readonly IRuntimeCacheProvider _globalCache;
         private readonly IScopeAccessor _scopeAccessor;
 
-        protected RepositoryCachePolicyBase(IAppPolicyCache globalCache, IScopeAccessor scopeAccessor)
+        protected RepositoryCachePolicyBase(IRuntimeCacheProvider globalCache, IScopeAccessor scopeAccessor)
         {
             _globalCache = globalCache ?? throw new ArgumentNullException(nameof(globalCache));
             _scopeAccessor = scopeAccessor ?? throw new ArgumentNullException(nameof(scopeAccessor));
         }
 
-        protected IAppPolicyCache Cache
+        protected IRuntimeCacheProvider Cache
         {
             get
             {
@@ -32,9 +32,9 @@ namespace Umbraco.Core.Cache
                     case RepositoryCacheMode.Default:
                         return _globalCache;
                     case RepositoryCacheMode.Scoped:
-                        return ambientScope.IsolatedCaches.GetOrCreate<TEntity>();
+                        return ambientScope.IsolatedRuntimeCache.GetOrCreateCache<TEntity>();
                     case RepositoryCacheMode.None:
-                        return NoAppCache.Instance;
+                        return NullCacheProvider.Instance;
                     default:
                         throw new NotSupportedException($"Repository cache mode {ambientScope.RepositoryCacheMode} is not supported.");
                 }

src/Umbraco.Core/Cache/SingleItemsOnlyRepositoryCachePolicy.cs

@@ -16,7 +16,7 @@ namespace Umbraco.Core.Cache
     internal class SingleItemsOnlyRepositoryCachePolicy<TEntity, TId> : DefaultRepositoryCachePolicy<TEntity, TId>
         where TEntity : class, IEntity
     {
-        public SingleItemsOnlyRepositoryCachePolicy(IAppPolicyCache cache, IScopeAccessor scopeAccessor, RepositoryCachePolicyOptions options)
+        public SingleItemsOnlyRepositoryCachePolicy(IRuntimeCacheProvider cache, IScopeAccessor scopeAccessor, RepositoryCachePolicyOptions options)
             : base(cache, scopeAccessor, options)
         { }
 

src/Umbraco.Core/Cache/StaticCacheProvider.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Represents a cache provider that statically caches item in a concurrent dictionary.
+    /// </summary>
+    public class StaticCacheProvider : ICacheProvider
+    {
+        internal readonly ConcurrentDictionary<string, object> StaticCache = new ConcurrentDictionary<string, object>();
+
+        public virtual void ClearAllCache()
+        {
+            StaticCache.Clear();
+        }
+
+        public virtual void ClearCacheItem(string key)
+        {
+            object val;
+            StaticCache.TryRemove(key, out val);
+        }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            var typeOfT = typeof(T);
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            var typeOfT = typeof(T);
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
+        }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            StaticCache.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
+        }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            StaticCache.RemoveAll(kvp => Regex.IsMatch(kvp.Key, regexString));
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return (from KeyValuePair<string, object> c in StaticCache
+                    where c.Key.InvariantStartsWith(keyStartsWith)
+                    select c.Value).ToList();
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return (from KeyValuePair<string, object> c in StaticCache
+                    where Regex.IsMatch(c.Key, regexString)
+                    select c.Value).ToList();
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            var result = StaticCache[cacheKey];
+            return result;
+        }
+
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return StaticCache.GetOrAdd(cacheKey, key => getCacheItem());
+        }
+    }
+}

src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs

@@ -14,9 +14,9 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Initializes a new instance of the <see cref="TypedCacheRefresherBase{TInstanceType, TEntityType}"/>.
         /// </summary>
-        /// <param name="appCaches">A cache helper.</param>
-        protected TypedCacheRefresherBase(AppCaches appCaches)
-            : base(appCaches)
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected TypedCacheRefresherBase(CacheHelper cacheHelper)
+            : base(cacheHelper)
         { }
 
         #region Refresher

src/Umbraco.Core/Collections/ObservableDictionary.cs

@@ -125,18 +125,6 @@ namespace Umbraco.Core.Collections
 
         }
 
-        public void ReplaceAll(IEnumerable<TValue> values)
-        {
-            if (values == null) throw new ArgumentNullException(nameof(values));
-
-            Clear();
-
-            foreach (var value in values)
-            {
-                Add(value);
-            }
-        }
-
         public bool Remove(TKey key)
         {
             if (!Indecies.ContainsKey(key)) return false;

src/Umbraco.Core/Components/AuditEventsComponent.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Web;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
@@ -11,7 +10,7 @@ using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core.Components
 {
     public sealed class AuditEventsComponent : IComponent
     {

src/Umbraco.Core/Components/AuditEventsComposer.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core.Components
 {
     public sealed class AuditEventsComposer : ComponentComposer<AuditEventsComponent>, ICoreComposer
     { }

src/Umbraco.Core/Components/ComponentCollection.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Represents the collection of <see cref="IComponent"/> implementations.
@@ -23,7 +24,7 @@ namespace Umbraco.Core.Composing
         {
             using (_logger.DebugDuration<ComponentCollection>($"Initializing. (log components when >{LogThresholdMilliseconds}ms)", "Initialized."))
             {
-                foreach (var component in this)
+                foreach (var component in this.Reverse()) // terminate components in reverse order
                 {
                     var componentType = component.GetType();
                     using (_logger.DebugDuration<ComponentCollection>($"Initializing {componentType.FullName}.", $"Initialized {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))

src/Umbraco.Core/Components/ComponentCollectionBuilder.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Builds a <see cref="ComponentCollection"/>.
@@ -30,7 +31,7 @@ namespace Umbraco.Core.Composing
 
         protected override IComponent CreateItem(IFactory factory, Type itemType)
         {
-            using (_logger.DebugDuration<ComponentCollectionBuilder>($"Creating {itemType.FullName}.", $"Created {itemType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
+            using (_logger.DebugDuration<Composers>($"Creating {itemType.FullName}.", $"Created {itemType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
             {
                 return base.CreateItem(factory, itemType);
             }

src/Umbraco.Core/Components/ComponentComposer.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core.Compose;
-
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Provides a base class for composers which compose a component.

src/Umbraco.Core/Components/ComposeAfterAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Indicates that a composer requires another composer.

src/Umbraco.Core/Components/ComposeBeforeAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Indicates that a component is required by another composer.

src/Umbraco.Core/Components/Composers.cs

@@ -6,7 +6,7 @@ using System.Text;
 using Umbraco.Core.Collections;
 using Umbraco.Core.Logging;
 
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     // note: this class is NOT thread-safe in any ways
 
@@ -70,104 +70,42 @@ namespace Umbraco.Core.Composing
             }
         }
 
-        internal IEnumerable<Type> PrepareComposerTypes()
-        {
-            var requirements = GetRequirements();
-
-            // only for debugging, this is verbose
-            //_logger.Debug<Composers>(GetComposersReport(requirements));
-
-            var sortedComposerTypes = SortComposers(requirements);
-
-            // bit verbose but should help for troubleshooting
-            //var text = "Ordered Composers: " + Environment.NewLine + string.Join(Environment.NewLine, sortedComposerTypes) + Environment.NewLine;
-            _logger.Debug<Composers>("Ordered Composers: {SortedComposerTypes}", sortedComposerTypes);
-
-            return sortedComposerTypes;
-        }
-
-        internal Dictionary<Type, List<Type>> GetRequirements(bool throwOnMissing = true)
+        private IEnumerable<Type> PrepareComposerTypes()
         {
             // create a list, remove those that cannot be enabled due to runtime level
             var composerTypeList = _composerTypes
                 .Where(x =>
                 {
-                    // use the min/max levels specified by the attribute if any
-                    // otherwise, min: user composers are Run, anything else is Unknown (always run)
-                    //            max: everything is Run (always run)
+                    // use the min level specified by the attribute if any
+                    // otherwise, user composers have Run min level, anything else is Unknown (always run)
                     var attr = x.GetCustomAttribute<RuntimeLevelAttribute>();
                     var minLevel = attr?.MinLevel ?? (x.Implements<IUserComposer>() ? RuntimeLevel.Run : RuntimeLevel.Unknown);
-                    var maxLevel = attr?.MaxLevel ?? RuntimeLevel.Run;
-                    return _composition.RuntimeState.Level >= minLevel && _composition.RuntimeState.Level <= maxLevel;
+                    return _composition.RuntimeState.Level >= minLevel;
                 })
                 .ToList();
 
             // enable or disable composers
             EnableDisableComposers(composerTypeList);
 
-            void GatherInterfaces<TAttribute>(Type type, Func<TAttribute, Type> getTypeInAttribute, HashSet<Type> iset, List<Type> set2)
-                where TAttribute : Attribute
-            {
-                foreach (var attribute in type.GetCustomAttributes<TAttribute>())
-                {
-                    var typeInAttribute = getTypeInAttribute(attribute);
-                    if (typeInAttribute != null && // if the attribute references a type ...
-                        typeInAttribute.IsInterface && // ... which is an interface ...
-                        typeof(IComposer).IsAssignableFrom(typeInAttribute) && // ... which implements IComposer ...
-                        !iset.Contains(typeInAttribute)) // ... which is not already in the list
-                    {
-                        // add it to the new list
-                        iset.Add(typeInAttribute);
-                        set2.Add(typeInAttribute);
-
-                        // add all its interfaces implementing IComposer
-                        foreach (var i in typeInAttribute.GetInterfaces().Where(x => typeof(IComposer).IsAssignableFrom(x)))
-                        {
-                            iset.Add(i);
-                            set2.Add(i);
-                        }
-                    }
-                }
-            }
-
-            // gather interfaces too
-            var interfaces = new HashSet<Type>(composerTypeList.SelectMany(x => x.GetInterfaces().Where(y => typeof(IComposer).IsAssignableFrom(y))));
-            composerTypeList.AddRange(interfaces);
-            var list1 = composerTypeList;
-            while (list1.Count > 0)
-            {
-                var list2 = new List<Type>();
-                foreach (var t in list1)
-                {
-                    GatherInterfaces<ComposeAfterAttribute>(t, a => a.RequiredType, interfaces, list2);
-                    GatherInterfaces<ComposeBeforeAttribute>(t, a => a.RequiringType, interfaces, list2);
-                }
-                composerTypeList.AddRange(list2);
-                list1 = list2;
-            }
-
             // sort the composers according to their dependencies
             var requirements = new Dictionary<Type, List<Type>>();
-            foreach (var type in composerTypeList)
-                requirements[type] = null;
+            foreach (var type in composerTypeList) requirements[type] = null;
             foreach (var type in composerTypeList)
             {
-                GatherRequirementsFromAfterAttribute(type, composerTypeList, requirements, throwOnMissing);
-                GatherRequirementsFromBeforeAttribute(type, composerTypeList, requirements);
+                GatherRequirementsFromRequireAttribute(type, composerTypeList, requirements);
+                GatherRequirementsFromRequiredByAttribute(type, composerTypeList, requirements);
             }
 
-            return requirements;
-        }
+            // only for debugging, this is verbose
+            //_logger.Debug<Composers>(GetComposersReport(requirements));
 
-        internal IEnumerable<Type> SortComposers(Dictionary<Type, List<Type>> requirements)
-        {
             // sort composers
             var graph = new TopoGraph<Type, KeyValuePair<Type, List<Type>>>(kvp => kvp.Key, kvp => kvp.Value);
             graph.AddItems(requirements);
             List<Type> sortedComposerTypes;
             try
             {
-                sortedComposerTypes = graph.GetSortedItems().Select(x => x.Key).Where(x => !x.IsInterface).ToList();
+                sortedComposerTypes = graph.GetSortedItems().Select(x => x.Key).ToList();
             }
             catch (Exception e)
             {
@@ -177,37 +115,40 @@ namespace Umbraco.Core.Composing
                 throw;
             }
 
+            // bit verbose but should help for troubleshooting
+            //var text = "Ordered Composers: " + Environment.NewLine + string.Join(Environment.NewLine, sortedComposerTypes) + Environment.NewLine;
+            _logger.Debug<Composers>("Ordered Composers: {SortedComposerTypes}", sortedComposerTypes);
+
             return sortedComposerTypes;
         }
 
-        internal static string GetComposersReport(Dictionary<Type, List<Type>> requirements)
+        private static string GetComposersReport(Dictionary<Type, List<Type>> requirements)
         {
             var text = new StringBuilder();
             text.AppendLine("Composers & Dependencies:");
-            text.AppendLine("  <  compose before");
-            text.AppendLine("  >  compose after");
-            text.AppendLine("  :  implements");
-            text.AppendLine("  =  depends");
             text.AppendLine();
 
-            bool HasReq(IEnumerable<Type> types, Type type)
-                => types.Any(x => type.IsAssignableFrom(x) && !x.IsInterface);
-
             foreach (var kvp in requirements)
             {
                 var type = kvp.Key;
 
                 text.AppendLine(type.FullName);
                 foreach (var attribute in type.GetCustomAttributes<ComposeAfterAttribute>())
-                {
-                    var weak = !(attribute.RequiredType.IsInterface ? attribute.Weak == false : attribute.Weak != true);
-                    text.AppendLine("  > " + attribute.RequiredType +
-                        (weak ? " (weak" : " (strong") + (HasReq(requirements.Keys, attribute.RequiredType) ? ", found" : ", missing") + ")");
-                }
+                    text.AppendLine("  -> " + attribute.RequiredType + (attribute.Weak.HasValue
+                        ? (attribute.Weak.Value ? " (weak)" : (" (strong" + (requirements.ContainsKey(attribute.RequiredType) ? ", missing" : "") + ")"))
+                        : ""));
                 foreach (var attribute in type.GetCustomAttributes<ComposeBeforeAttribute>())
-                    text.AppendLine("  < " + attribute.RequiringType);
+                    text.AppendLine("  -< " + attribute.RequiringType);
                 foreach (var i in type.GetInterfaces())
+                {
                     text.AppendLine("  : " + i.FullName);
+                    foreach (var attribute in i.GetCustomAttributes<ComposeAfterAttribute>())
+                        text.AppendLine("    -> " + attribute.RequiredType + (attribute.Weak.HasValue
+                            ? (attribute.Weak.Value ? " (weak)" : (" (strong" + (requirements.ContainsKey(attribute.RequiredType) ? ", missing" : "") + ")"))
+                            : ""));
+                    foreach (var attribute in i.GetCustomAttributes<ComposeBeforeAttribute>())
+                        text.AppendLine("    -< " + attribute.RequiringType);
+                }
                 if (kvp.Value != null)
                     foreach (var t in kvp.Value)
                         text.AppendLine("  = " + t);
@@ -230,46 +171,27 @@ namespace Umbraco.Core.Composing
             // what happens in case of conflicting remote declarations is unspecified. more
             // precisely, the last declaration to be processed wins, but the order of the
             // declarations depends on the type finder and is unspecified.
-
-            void UpdateEnableInfo(Type composerType, int weight2, Dictionary<Type, EnableInfo> enabled2, bool value)
-            {
-                if (enabled.TryGetValue(composerType, out var enableInfo) == false) enableInfo = enabled2[composerType] = new EnableInfo();
-                if (enableInfo.Weight > weight2) return;
-
-                enableInfo.Enabled = value;
-                enableInfo.Weight = weight2;
-            }
-
-            var assemblies = types.Select(x => x.Assembly).Distinct();
-            foreach (var assembly in assemblies)
-            {
-                foreach (var attr in assembly.GetCustomAttributes<EnableComposerAttribute>())
-                {
-                    var type = attr.EnabledType;
-                    UpdateEnableInfo(type, 2, enabled, true);
-                }
-
-                foreach (var attr in assembly.GetCustomAttributes<DisableComposerAttribute>())
-                {
-                    var type = attr.DisabledType;
-                    UpdateEnableInfo(type, 2, enabled, false);
-                }
-            }
-
             foreach (var composerType in types)
             {
                 foreach (var attr in composerType.GetCustomAttributes<EnableAttribute>())
                 {
                     var type = attr.EnabledType ?? composerType;
-                    var weight = type == composerType ? 1 : 3;
-                    UpdateEnableInfo(type, weight, enabled, true);
-                }
+                    if (enabled.TryGetValue(type, out var enableInfo) == false) enableInfo = enabled[type] = new EnableInfo();
+                    var weight = type == composerType ? 1 : 2;
+                    if (enableInfo.Weight > weight) continue;
 
+                    enableInfo.Enabled = true;
+                    enableInfo.Weight = weight;
+                }
                 foreach (var attr in composerType.GetCustomAttributes<DisableAttribute>())
                 {
                     var type = attr.DisabledType ?? composerType;
-                    var weight = type == composerType ? 1 : 3;
-                    UpdateEnableInfo(type, weight, enabled, false);
+                    if (enabled.TryGetValue(type, out var enableInfo) == false) enableInfo = enabled[type] = new EnableInfo();
+                    var weight = type == composerType ? 1 : 2;
+                    if (enableInfo.Weight > weight) continue;
+
+                    enableInfo.Enabled = false;
+                    enableInfo.Weight = weight;
                 }
             }
 
@@ -278,16 +200,16 @@ namespace Umbraco.Core.Composing
                 types.Remove(kvp.Key);
         }
 
-        private static void GatherRequirementsFromAfterAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements, bool throwOnMissing = true)
+        private static void GatherRequirementsFromRequireAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
         {
             // get 'require' attributes
             // these attributes are *not* inherited because we want to "custom-inherit" for interfaces only
-            var afterAttributes = type
+            var requireAttributes = type
                 .GetInterfaces().SelectMany(x => x.GetCustomAttributes<ComposeAfterAttribute>()) // those marking interfaces
                 .Concat(type.GetCustomAttributes<ComposeAfterAttribute>()); // those marking the composer
 
             // what happens in case of conflicting attributes (different strong/weak for same type) is not specified.
-            foreach (var attr in afterAttributes)
+            foreach (var attr in requireAttributes)
             {
                 if (attr.RequiredType == type) continue; // ignore self-requirements (+ exclude in implems, below)
 
@@ -295,13 +217,13 @@ namespace Umbraco.Core.Composing
                 // unless strong, and then require at least one enabled composer implementing that interface
                 if (attr.RequiredType.IsInterface)
                 {
-                    var implems = types.Where(x => x != type && attr.RequiredType.IsAssignableFrom(x) && !x.IsInterface).ToList();
+                    var implems = types.Where(x => x != type && attr.RequiredType.IsAssignableFrom(x)).ToList();
                     if (implems.Count > 0)
                     {
                         if (requirements[type] == null) requirements[type] = new List<Type>();
                         requirements[type].AddRange(implems);
                     }
-                    else if (attr.Weak == false && throwOnMissing) // if explicitly set to !weak, is strong, else is weak
+                    else if (attr.Weak == false) // if explicitly set to !weak, is strong, else is weak
                         throw new Exception($"Broken composer dependency: {type.FullName} -> {attr.RequiredType.FullName}.");
                 }
                 // requiring a class = require that the composer is enabled
@@ -313,28 +235,28 @@ namespace Umbraco.Core.Composing
                         if (requirements[type] == null) requirements[type] = new List<Type>();
                         requirements[type].Add(attr.RequiredType);
                     }
-                    else if (attr.Weak != true && throwOnMissing) // if not explicitly set to weak, is strong
+                    else if (attr.Weak != true) // if not explicitly set to weak, is strong
                         throw new Exception($"Broken composer dependency: {type.FullName} -> {attr.RequiredType.FullName}.");
                 }
             }
         }
 
-        private static void GatherRequirementsFromBeforeAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
+        private static void GatherRequirementsFromRequiredByAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
         {
             // get 'required' attributes
             // these attributes are *not* inherited because we want to "custom-inherit" for interfaces only
-            var beforeAttributes = type
+            var requiredAttributes = type
                 .GetInterfaces().SelectMany(x => x.GetCustomAttributes<ComposeBeforeAttribute>()) // those marking interfaces
                 .Concat(type.GetCustomAttributes<ComposeBeforeAttribute>()); // those marking the composer
 
-            foreach (var attr in beforeAttributes)
+            foreach (var attr in requiredAttributes)
             {
                 if (attr.RequiringType == type) continue; // ignore self-requirements (+ exclude in implems, below)
 
                 // required by an interface = by any enabled composer implementing this that interface
                 if (attr.RequiringType.IsInterface)
                 {
-                    var implems = types.Where(x => x != type && attr.RequiringType.IsAssignableFrom(x) && !x.IsInterface).ToList();
+                    var implems = types.Where(x => x != type && attr.RequiringType.IsAssignableFrom(x)).ToList();
                     foreach (var implem in implems)
                     {
                         if (requirements[implem] == null) requirements[implem] = new List<Type>();

src/Umbraco.Core/Components/Composition.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Represents a composition.
@@ -16,7 +17,7 @@ namespace Umbraco.Core.Composing
     public class Composition : IRegister
     {
         private readonly Dictionary<Type, ICollectionBuilder> _builders = new Dictionary<Type, ICollectionBuilder>();
-        private readonly Dictionary<string, Action<IRegister>> _uniques = new Dictionary<string, Action<IRegister>>();
+        private readonly Dictionary<Type, Unique> _uniques = new Dictionary<Type, Unique>();
         private readonly IRegister _register;
 
         /// <summary>
@@ -82,32 +83,11 @@ namespace Umbraco.Core.Composing
 
         /// <inheritdoc />
         public void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
             => _register.Register(factory, lifetime);
 
         /// <inheritdoc />
-        public void Register(Type serviceType, object instance)
-            => _register.Register(serviceType, instance);
-
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-            => _register.RegisterFor<TService, TTarget>(lifetime);
-
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-            => _register.RegisterFor<TService, TTarget>(implementingType, lifetime);
-
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-            => _register.RegisterFor<TService, TTarget>(factory, lifetime);
-
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(TService instance)
-            where TService : class
-            => _register.RegisterFor<TService, TTarget>(instance);
+        public void RegisterInstance(Type serviceType, object instance)
+            => _register.RegisterInstance(serviceType, instance);
 
         /// <inheritdoc />
         public void RegisterAuto(Type serviceBaseType)
@@ -124,12 +104,10 @@ namespace Umbraco.Core.Composing
                 onCreating();
 
             foreach (var unique in _uniques.Values)
-                unique(_register);
-            _uniques.Clear(); // no point keep them around
+                unique.RegisterWith(_register);
 
             foreach (var builder in _builders.Values)
                 builder.RegisterWith(_register);
-            _builders.Clear(); // no point keep them around
 
             Configs.RegisterWith(_register);
 
@@ -145,78 +123,74 @@ namespace Umbraco.Core.Composing
 
         #region Unique
 
-        private string GetUniqueName<TService>()
-            => GetUniqueName(typeof(TService));
-
-        private string GetUniqueName(Type serviceType)
-            => serviceType.FullName;
-
-        private string GetUniqueName<TService, TTarget>()
-            => GetUniqueName(typeof(TService), typeof(TTarget));
-
-        private string GetUniqueName(Type serviceType, Type targetType)
-            => serviceType.FullName + "::" + targetType.FullName;
-
         /// <summary>
-        /// Registers a unique service as its own implementation.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUnique(Type serviceType)
-            => _uniques[GetUniqueName(serviceType)] = register => register.Register(serviceType, Lifetime.Singleton);
-
-        /// <summary>
-        /// Registers a unique service with an implementation type.
+        /// Registers a unique service.
         /// </summary>
         /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
         public void RegisterUnique(Type serviceType, Type implementingType)
-            => _uniques[GetUniqueName(serviceType)] = register => register.Register(serviceType, implementingType, Lifetime.Singleton);
+            => _uniques[serviceType] = new Unique(serviceType, implementingType);
 
         /// <summary>
-        /// Registers a unique service with an implementation factory.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUnique<TService>(Func<IFactory, TService> factory)
-            where TService : class
-            => _uniques[GetUniqueName<TService>()] = register => register.Register<TService>(factory, Lifetime.Singleton);
-
-        /// <summary>
-        /// Registers a unique service with an implementing instance.
+        /// Registers a unique service.
         /// </summary>
         /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
         public void RegisterUnique(Type serviceType, object instance)
-            => _uniques[GetUniqueName(serviceType)] = register => register.Register(serviceType, instance);
+            => _uniques[serviceType] = new Unique(serviceType, instance);
 
         /// <summary>
-        /// Registers a unique service for a target, as its own implementation.
+        /// Registers a unique service.
         /// </summary>
         /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUniqueFor<TService, TTarget>()
-            where TService : class
-            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(Lifetime.Singleton);
+        public void RegisterUnique<TService>(Func<IFactory, TService> factory)
+            => _uniques[typeof(TService)] = new Unique<TService>(factory);
 
-        /// <summary>
-        /// Registers a unique service for a target, with an implementing type.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUniqueFor<TService, TTarget>(Type implementingType)
-            where TService : class
-            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(implementingType, Lifetime.Singleton);
+        private class Unique
+        {
+            private readonly Type _serviceType;
+            private readonly Type _implementingType;
+            private readonly object _instance;
 
-        /// <summary>
-        /// Registers a unique service for a target, with an implementation factory.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUniqueFor<TService, TTarget>(Func<IFactory, TService> factory)
-            where TService : class
-            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(factory, Lifetime.Singleton);
+            protected Unique(Type serviceType)
+            {
+                _serviceType = serviceType;
+            }
 
-        /// <summary>
-        /// Registers a unique service for a target, with an implementing instance.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUniqueFor<TService, TTarget>(TService instance)
-            where TService : class
-            => _uniques[GetUniqueName<TService, TTarget>()] = register => register.RegisterFor<TService, TTarget>(instance);
+            public Unique(Type serviceType, Type implementingType)
+                : this(serviceType)
+            {
+                _implementingType = implementingType;
+            }
+
+            public Unique(Type serviceType, object instance)
+                : this(serviceType)
+            {
+                _instance = instance;
+            }
+
+            public virtual void RegisterWith(IRegister register)
+            {
+                if (_implementingType != null)
+                    register.Register(_serviceType, _implementingType, Lifetime.Singleton);
+                else if (_instance != null)
+                    register.RegisterInstance(_serviceType, _instance);
+            }
+        }
+
+        private class Unique<TService> : Unique
+        {
+            private readonly Func<IFactory, TService> _factory;
+
+            public Unique(Func<IFactory, TService> factory)
+                : base(typeof(TService))
+            {
+                _factory = factory;
+            }
+
+            public override void RegisterWith(IRegister register)
+            {
+                register.Register(_factory, Lifetime.Singleton);
+            }
+        }
 
         #endregion
 

src/Umbraco.Core/Components/CompositionExtensions.cs

@@ -1,23 +1,62 @@
 using System;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Dictionary;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
-using Umbraco.Core.Logging.Viewer;
+using Umbraco.Core.Migrations;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PackageActions;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
+using Umbraco.Core._Legacy.PackageActions;
 
-namespace Umbraco.Core
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Provides extension methods to the <see cref="Composition"/> class.
     /// </summary>
-    public static partial class CompositionExtensions
+    public static class CompositionExtensions
     {
+        #region FileSystems
+
+        /// <summary>
+        /// Registers a filesystem.
+        /// </summary>
+        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
+        /// <typeparam name="TImplementing">The implementing type.</typeparam>
+        /// <param name="composition">The composition.</param>
+        /// <param name="supportingFileSystemFactory">A factory method creating the supporting filesystem.</param>
+        /// <returns>The register.</returns>
+        public static void RegisterFileSystem<TFileSystem, TImplementing>(this Composition composition, Func<IFactory, IFileSystem> supportingFileSystemFactory)
+            where TImplementing : FileSystemWrapper, TFileSystem
+        {
+            composition.RegisterUnique<TFileSystem>(factory =>
+            {
+                var fileSystems = factory.GetInstance<FileSystems>();
+                return fileSystems.GetFileSystem<TImplementing>(supportingFileSystemFactory(factory));
+            });
+        }
+
+        /// <summary>
+        /// Registers a filesystem.
+        /// </summary>
+        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
+        /// <param name="composition">The composition.</param>
+        /// <param name="supportingFileSystemFactory">A factory method creating the supporting filesystem.</param>
+        /// <returns>The register.</returns>
+        public static void RegisterFileSystem<TFileSystem>(this Composition composition, Func<IFactory, IFileSystem> supportingFileSystemFactory)
+            where TFileSystem : FileSystemWrapper
+        {
+            composition.RegisterUnique(factory =>
+            {
+                var fileSystems = factory.GetInstance<FileSystems>();
+                return fileSystems.GetFileSystem<TFileSystem>(supportingFileSystemFactory(factory));
+            });
+        }
+
+        #endregion
+
         #region Collection Builders
 
         /// <summary>
@@ -69,6 +108,13 @@ namespace Umbraco.Core
         internal static ManifestValueValidatorCollectionBuilder Validators(this Composition composition)
             => composition.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>();
 
+        /// <summary>
+        /// Gets the post-migrations collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        internal static PostMigrationCollectionBuilder PostMigrations(this Composition composition)
+            => composition.WithCollectionBuilder<PostMigrationCollectionBuilder>();
+
         /// <summary>
         /// Gets the components collection builder.
         /// </summary>
@@ -156,7 +202,7 @@ namespace Umbraco.Core
         /// Sets the server registrar.
         /// </summary>
         /// <param name="composition">The composition.</param>
-        /// <param name="factory">A function creating a server registrar.</param>
+        /// <param name="factory">A function creating a server registar.</param>
         public static void SetServerRegistrar(this Composition composition, Func<IFactory, IServerRegistrar> factory)
         {
             composition.RegisterUnique(factory);
@@ -203,28 +249,6 @@ namespace Umbraco.Core
             composition.RegisterUnique(_ => registrar);
         }
 
-        /// <summary>
-        /// Sets the database server messenger options.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        /// <param name="factory">A function creating the options.</param>
-        /// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
-        public static void SetDatabaseServerMessengerOptions(this Composition composition, Func<IFactory, DatabaseServerMessengerOptions> factory)
-        {
-            composition.RegisterUnique(factory);
-        }
-
-        /// <summary>
-        /// Sets the database server messenger options.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        /// <param name="options">Options.</param>
-        /// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
-        public static void SetDatabaseServerMessengerOptions(this Composition composition, DatabaseServerMessengerOptions options)
-        {
-            composition.RegisterUnique(_ => options);
-        }
-
         /// <summary>
         /// Sets the short string helper.
         /// </summary>
@@ -256,53 +280,6 @@ namespace Umbraco.Core
             composition.RegisterUnique(_ => helper);
         }
 
-        /// <summary>
-        /// Sets the underlying media filesystem.
-        /// </summary>
-        /// <param name="composition">A composition.</param>
-        /// <param name="filesystemFactory">A filesystem factory.</param>
-        public static void SetMediaFileSystem(this Composition composition, Func<IFactory, IFileSystem> filesystemFactory)
-            => composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(filesystemFactory);
-
-        /// <summary>
-        /// Sets the underlying media filesystem.
-        /// </summary>
-        /// <param name="composition">A composition.</param>
-        /// <param name="filesystemFactory">A filesystem factory.</param>
-        public static void SetMediaFileSystem(this Composition composition, Func<IFileSystem> filesystemFactory)
-            => composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(_ => filesystemFactory());
-
-        /// <summary>
-        /// Sets the log viewer.
-        /// </summary>
-        /// <typeparam name="T">The type of the log viewer.</typeparam>
-        /// <param name="composition">The composition.</param>
-        public static void SetLogViewer<T>(this Composition composition)
-            where T : ILogViewer
-        {
-            composition.RegisterUnique<ILogViewer, T>();
-        }
-
-        /// <summary>
-        /// Sets the log viewer.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        /// <param name="factory">A function creating a log viewer.</param>
-        public static void SetLogViewer(this Composition composition, Func<IFactory, ILogViewer> factory)
-        {
-            composition.RegisterUnique(factory);
-        }
-
-        /// <summary>
-        /// Sets the log viewer.
-        /// </summary>
-        /// <param name="composition">A composition.</param>
-        /// <param name="helper">A log viewer.</param>
-        public static void SetLogViewer(this Composition composition, ILogViewer viewer)
-        {
-            composition.RegisterUnique(_ => viewer);
-        }
-
         #endregion
     }
 }

src/Umbraco.Core/Components/DisableAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Indicates that a composer should be disabled.
@@ -9,8 +9,9 @@ namespace Umbraco.Core.Composing
     /// <para>If a type is specified, disables the composer of that type, else disables the composer marked with the attribute.</para>
     /// <para>This attribute is *not* inherited.</para>
     /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
+    /// <para>If a composer ends up being both enabled and disabled: attributes marking the composer itself have lower priority
+    /// than attributes on *other* composers, eg if a composer declares itself as disabled it is possible to enable it from
+    /// another composer. Anything else is unspecified.</para>
     /// </remarks>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
     public class DisableAttribute : Attribute

src/Umbraco.Core/Components/EnableAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Indicates that a composer should be enabled.
@@ -9,8 +9,9 @@ namespace Umbraco.Core.Composing
     /// <para>If a type is specified, enables the composer of that type, else enables the composer marked with the attribute.</para>
     /// <para>This attribute is *not* inherited.</para>
     /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
+    /// <para>If a composer ends up being both enabled and disabled: attributes marking the composer itself have lower priority
+    /// than attributes on *other* composers, eg if a composer declares itself as disabled it is possible to enable it from
+    /// another composer. Anything else is unspecified.</para>
     /// </remarks>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
     public class EnableAttribute : Attribute

src/Umbraco.Core/Components/IComponent.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Represents a component.

src/Umbraco.Core/Components/IComposer.cs

@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Composing
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Represents a composer.
@@ -8,6 +10,7 @@
         /// <summary>
         /// Compose.
         /// </summary>
+        /// <param name="composition"></param>
         void Compose(Composition composition);
     }
-}
+}

src/Umbraco.Core/Components/ICoreComposer.cs

@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Represents a core <see cref="IComposer"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>All core composers are required by (compose before) all user composers,
+    /// and require (compose after) all runtime composers.</para>
+    /// </remarks>
+    [ComposeAfter(typeof(IRuntimeComposer))]
+    public interface ICoreComposer : IComposer
+    { }
+}

src/Umbraco.Core/Components/IRuntimeComposer.cs

@@ -0,0 +1,11 @@
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Represents a runtime <see cref="IComposer"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>All runtime composers are required by (compose before) all core composers</para>
+    /// </remarks>
+    public interface IRuntimeComposer : IComposer
+    { }
+}

src/Umbraco.Core/Components/IUserComposer.cs

@@ -1,12 +1,12 @@
-namespace Umbraco.Core.Composing
+namespace Umbraco.Core.Components
 {
     /// <summary>
     /// Represents a user <see cref="IComposer"/>.
     /// </summary>
     /// <remarks>
-    /// <para>User composers compose after core composers, and before the final composer.</para>
+    /// <para>All user composers require (compose after) all core composers.</para>
     /// </remarks>
     [ComposeAfter(typeof(ICoreComposer))]
     public interface IUserComposer : IComposer
     { }
-}
+}

src/Umbraco.Core/Components/ManifestWatcherComponent.cs

@@ -1,10 +1,9 @@
 using System.IO;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core.Components
 {
     public sealed class ManifestWatcherComponent : IComponent
     {

src/Umbraco.Core/Components/ManifestWatcherComposer.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core.Components
 {
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
     public class ManifestWatcherComposer : ComponentComposer<ManifestWatcherComponent>, ICoreComposer

src/Umbraco.Core/Components/RelateOnCopyComponent.cs

@@ -3,9 +3,9 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core.Components
 {
-    // TODO: This should just exist in the content service/repo!
+    //TODO: This should just exist in the content service/repo!
     public sealed class RelateOnCopyComponent : IComponent
     {
         public void Initialize()

src/Umbraco.Core/Components/RelateOnCopyComposer.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core.Components
 {
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
     public sealed class RelateOnCopyComposer : ComponentComposer<RelateOnCopyComponent>, ICoreComposer

src/Umbraco.Core/Components/RelateOnTrashComponent.cs

@@ -5,7 +5,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core.Components
 {
     public sealed class RelateOnTrashComponent : IComponent
     {

src/Umbraco.Core/Components/RelateOnTrashComposer.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core.Components
 {
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
     public sealed class RelateOnTrashComposer : ComponentComposer<RelateOnTrashComponent>, ICoreComposer

src/Umbraco.Core/Components/RuntimeLevelAttribute.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Umbraco.Core.Components
+{
+    [AttributeUsage(AttributeTargets.Class /*, AllowMultiple = false, Inherited = true*/)]
+    public class RuntimeLevelAttribute : Attribute
+    {
+        //public RuntimeLevelAttribute()
+        //{ }
+
+        public RuntimeLevel MinLevel { get; set; } = RuntimeLevel.Boot;
+    }
+}

src/Umbraco.Core/Composing/CollectionBuilderBase.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Composing
     /// <typeparam name="TItem">The type of the items.</typeparam>
     public abstract class CollectionBuilderBase<TBuilder, TCollection, TItem> : ICollectionBuilder<TCollection, TItem>
         where TBuilder: CollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TCollection : class, IBuilderCollection<TItem>
+        where TCollection : IBuilderCollection<TItem>
     {
         private readonly List<Type> _types = new List<Type>();
         private readonly object _locker = new object();

src/Umbraco.Core/Composing/Composers/ConfigurationComposer.cs

@@ -1,11 +1,13 @@
-using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Components;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
 
-namespace Umbraco.Core.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.Composers
 {
     /// <summary>
     /// Compose configurations.
     /// </summary>
-    public static class Configuration
+    public static class ConfigurationComposer
     {
         public static Composition ComposeConfiguration(this Composition composition)
         {
@@ -13,6 +15,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             // register others
 
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Content);
+            composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Templates);
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().RequestHandler);
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoSettingsSection>().Security);
 

src/Umbraco.Core/Composing/Composers/CoreMappingProfilesComposer.cs

@@ -1,10 +1,11 @@
 using AutoMapper;
+using Umbraco.Core.Components;
 using Umbraco.Core.Models.Identity;
 
-namespace Umbraco.Core.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.Composers
 
 {
-    public static class CoreMappingProfiles
+    public static class CoreMappingProfilesComposer
     {
         public static Composition ComposeCoreMappingProfiles(this Composition composition)
         {

src/Umbraco.Core/Composing/Composers/FileSystemsComposer.cs

@@ -1,10 +1,10 @@
-using Umbraco.Core.Compose;
+using Umbraco.Core.Components;
 using Umbraco.Core.IO;
 using Umbraco.Core.IO.MediaPathSchemes;
 
-namespace Umbraco.Core.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.Composers
 {
-    public static class FileSystems
+    public static class FileSystemsComposer
     {
         /*
          * HOW TO REPLACE THE MEDIA UNDERLYING FILESYSTEM
@@ -12,9 +12,10 @@ namespace Umbraco.Core.Composing.CompositionExtensions
          *
          * Create a component and use it to modify the composition by adding something like:
          *
-         *   composition.RegisterUniqueFor<IFileSystem, IMediaFileSystem>(...);
+         *   composition.Container.RegisterFileSystem<IMediaFileSystem, MediaFileSystem>(
+         *       factory => new PhysicalFileSystem("~/somewhere"));
          *
-         * and register whatever supporting filesystem you like.
+         * return whatever supporting filesystem you like.
          *
          *
          * HOW TO IMPLEMENT MY OWN FILESYSTEM
@@ -29,15 +30,12 @@ namespace Umbraco.Core.Composing.CompositionExtensions
          *       { }
          *   }
          *
-         * The ctor can have more parameters, that will be resolved by the container.
+         * The ctor can have more parameters that will be resolved by the container.
          *
          * Register your filesystem, in a component:
          *
-         *   composition.RegisterFileSystem<MyFileSystem>();
-         *
-         * Register the underlying filesystem:
-         *
-         *   composition.RegisterUniqueFor<IFileSystem, MyFileSystem>(...);
+         *    composition.Container.RegisterFileSystem<MyFileSystem>(
+         *        factory => new PhysicalFileSystem("~/my"));
          *
          * And that's it, you can inject MyFileSystem wherever it's needed.
          *
@@ -50,8 +48,8 @@ namespace Umbraco.Core.Composing.CompositionExtensions
          * Make the class implement the interface, then
          * register your filesystem, in a component:
          *
-         *   composition.RegisterFileSystem<IMyFileSystem, MyFileSystem>();
-         *   composition.RegisterUniqueFor<IFileSystem, IMyFileSystem>(...);
+         *    composition.Container.RegisterFileSystem<IMyFileSystem, MyFileSystem>(
+         *        factory => new PhysicalFileSystem("~/my"));
          *
          * And that's it, you can inject IMyFileSystem wherever it's needed.
          *
@@ -73,24 +71,17 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             // it needs to be registered (not only the interface) because it provides additional
             // functionality eg for scoping, and is injected in the scope provider - whereas the
             // interface is really for end-users to get access to filesystems.
-            composition.RegisterUnique(factory => factory.CreateInstance<IO.FileSystems>(factory));
+            composition.RegisterUnique(factory => factory.CreateInstance<FileSystems>(factory));
 
             // register IFileSystems, which gives access too all filesystems
-            composition.RegisterUnique<IFileSystems>(factory => factory.GetInstance<IO.FileSystems>());
+            composition.RegisterUnique<IFileSystems>(factory => factory.GetInstance<FileSystems>());
 
             // register the scheme for media paths
-            composition.RegisterUnique<IMediaPathScheme, UniqueMediaPathScheme>();
+            composition.RegisterUnique<IMediaPathScheme, TwoGuidsMediaPathScheme>();
 
-            // register the IMediaFileSystem implementation
-            composition.RegisterFileSystem<IMediaFileSystem, MediaFileSystem>();
-
-            // register the supporting filesystems provider
-            composition.Register(factory => new SupportingFileSystems(factory), Lifetime.Singleton);
-
-            // register the IFileSystem supporting the IMediaFileSystem
-            // THIS IS THE ONLY THING THAT NEEDS TO CHANGE, IN ORDER TO REPLACE THE UNDERLYING FILESYSTEM
-            // and, SupportingFileSystem.For<IMediaFileSystem>() returns the underlying filesystem
-            composition.SetMediaFileSystem(() => new PhysicalFileSystem("~/media"));
+            // register the IMediaFileSystem implementation with a supporting filesystem
+            composition.RegisterFileSystem<IMediaFileSystem, MediaFileSystem>(
+                factory => new PhysicalFileSystem("~/media"));
 
             return composition;
         }

src/Umbraco.Core/Composing/Composers/RepositoriesComposer.cs

@@ -1,12 +1,13 @@
-using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Components;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 
-namespace Umbraco.Core.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.Composers
 {
     /// <summary>
     /// Composes repositories.
     /// </summary>
-    public static class Repositories
+    public static class RepositoriesComposer
     {
         public static Composition ComposeRepositories(this Composition composition)
         {

src/Umbraco.Core/Composing/Composers/ServicesComposer.cs

@@ -2,16 +2,16 @@
 using System.IO;
 using System.Linq;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Components;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Packaging;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
-namespace Umbraco.Core.Composing.CompositionExtensions
+namespace Umbraco.Core.Composing.Composers
 {
-    public static class Services
+    public static class ServicesComposer
     {
         public static Composition ComposeServices(this Composition composition)
         {
@@ -36,7 +36,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
             composition.RegisterUnique<IMemberService, MemberService>();
             composition.RegisterUnique<IMediaService, MediaService>();
             composition.RegisterUnique<IContentTypeService, ContentTypeService>();
-            composition.RegisterUnique<IContentTypeBaseServiceProvider, ContentTypeBaseServiceProvider>();
             composition.RegisterUnique<IMediaTypeService, MediaTypeService>();
             composition.RegisterUnique<IDataTypeService, DataTypeService>();
             composition.RegisterUnique<IFileService, FileService>();
@@ -57,36 +56,14 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                 factory.GetInstance<Lazy<LocalizedTextServiceFileSources>>(),
                 factory.GetInstance<ILogger>()));
 
-            composition.RegisterUnique<IEntityXmlSerializer, EntityXmlSerializer>();
-
-            composition.RegisterUnique<IPackageActionRunner, PackageActionRunner>();
-
-            composition.RegisterUnique<ConflictingPackageData>();
-            composition.RegisterUnique<CompiledPackageXmlParser>();
-            composition.RegisterUnique<ICreatedPackagesRepository>(factory => CreatePackageRepository(factory, "createdPackages.config"));
-            composition.RegisterUnique<IInstalledPackagesRepository>(factory => CreatePackageRepository(factory, "installedPackages.config"));
-            composition.RegisterUnique<PackageDataInstallation>();
-            composition.RegisterUnique<PackageFileInstallation>();
-            composition.RegisterUnique<IPackageInstallation>(factory => //factory required because we need to pass in a string path
-                new PackageInstallation(
-                    factory.GetInstance<PackageDataInstallation>(), factory.GetInstance<PackageFileInstallation>(),
-                    factory.GetInstance<CompiledPackageXmlParser>(), factory.GetInstance<IPackageActionRunner>(),
-                    new DirectoryInfo(IOHelper.GetRootDirectorySafe())));
+            //TODO: These are replaced in the web project - we need to declare them so that
+            // something is wired up, just not sure this is very nice but will work for now.
+            composition.RegisterUnique<IApplicationTreeService, EmptyApplicationTreeService>();
+            composition.RegisterUnique<ISectionService, EmptySectionService>();
 
             return composition;
         }
 
-        /// <summary>
-        /// Creates an instance of PackagesRepository for either the ICreatedPackagesRepository or the IInstalledPackagesRepository
-        /// </summary>
-        /// <param name="factory"></param>
-        /// <param name="packageRepoFileName"></param>
-        /// <returns></returns>
-        private static PackagesRepository CreatePackageRepository(IFactory factory, string packageRepoFileName)
-            => new PackagesRepository(
-                factory.GetInstance<IContentService>(), factory.GetInstance<IContentTypeService>(), factory.GetInstance<IDataTypeService>(), factory.GetInstance<IFileService>(), factory.GetInstance<IMacroService>(), factory.GetInstance<ILocalizationService>(), factory.GetInstance<IEntityXmlSerializer>(), factory.GetInstance<ILogger>(),
-                packageRepoFileName);
-
         private static LocalizedTextServiceFileSources SourcesFactory(IFactory container)
         {
             var mainLangFolder = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Umbraco + "/config/lang/"));
@@ -111,7 +88,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
 
             return new LocalizedTextServiceFileSources(
                 container.GetInstance<ILogger>(),
-                container.GetInstance<AppCaches>(),
+                container.GetInstance<CacheHelper>().RuntimeCache,
                 mainLangFolder,
                 pluginLangFolders.Concat(userLangFolders));
         }

src/Umbraco.Core/Composing/CompositionExtensions.cs

@@ -0,0 +1,62 @@
+using Umbraco.Core.Cache;
+using Umbraco.Core.Components;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Provides extension methods to the <see cref="Composition"/> class.
+    /// </summary>
+    public static class CompositionExtensions
+    {
+        #region Essentials
+
+        /// <summary>
+        /// Registers essential services.
+        /// </summary>
+        public static void RegisterEssentials(this Composition composition,
+            ILogger logger, IProfiler profiler, IProfilingLogger profilingLogger,
+            IMainDom mainDom,
+            CacheHelper appCaches,
+            IUmbracoDatabaseFactory databaseFactory,
+            TypeLoader typeLoader,
+            IRuntimeState state)
+        {
+            composition.RegisterUnique(logger);
+            composition.RegisterUnique(profiler);
+            composition.RegisterUnique(profilingLogger);
+            composition.RegisterUnique(mainDom);
+            composition.RegisterUnique(appCaches);
+            composition.RegisterUnique(factory => factory.GetInstance<CacheHelper>().RuntimeCache);
+            composition.RegisterUnique(databaseFactory);
+            composition.RegisterUnique(factory => factory.GetInstance<IUmbracoDatabaseFactory>().SqlContext);
+            composition.RegisterUnique(typeLoader);
+            composition.RegisterUnique(state);
+        }
+
+        #endregion
+
+        #region Unique
+
+        /// <summary>
+        /// Registers a unique service as its own implementation.
+        /// </summary>
+        public static void RegisterUnique<TService>(this Composition composition)
+            => composition.RegisterUnique(typeof(TService), typeof(TService));
+
+        /// <summary>
+        /// Registers a unique service with an implementation type.
+        /// </summary>
+        public static void RegisterUnique<TService, TImplementing>(this Composition composition)
+            => composition.RegisterUnique(typeof(TService), typeof(TImplementing));
+
+        /// <summary>
+        /// Registers a unique service with an implementing instance.
+        /// </summary>
+        public static void RegisterUnique<TService>(this Composition composition, TService instance)
+            => composition.RegisterUnique(typeof(TService), instance);
+
+        #endregion
+    }
+}

src/Umbraco.Core/Composing/Current.cs

@@ -5,14 +5,13 @@ using Umbraco.Core.Dictionary;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PackageActions;
-using Umbraco.Core.Packaging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
+using Umbraco.Core._Legacy.PackageActions;
 
 namespace Umbraco.Core.Composing
 {
@@ -29,7 +28,7 @@ namespace Umbraco.Core.Composing
     {
         private static IFactory _factory;
 
-        // TODO: get rid of these oddities
+        // fixme - refactor
         // we don't want Umbraco tests to die because the container has not been properly initialized,
         // for some too-important things such as IShortStringHelper or loggers, so if it's not
         // registered we setup a default one. We should really refactor our tests so that it does
@@ -162,9 +161,6 @@ namespace Umbraco.Core.Composing
         internal static PackageActionCollection PackageActions
             => Factory.GetInstance<PackageActionCollection>();
 
-        internal static IPackageActionRunner PackageActionRunner
-            => Factory.GetInstance<IPackageActionRunner>();
-
         internal static PropertyValueConverterCollection PropertyValueConverters
             => Factory.GetInstance<PropertyValueConverterCollection>();
 
@@ -180,8 +176,8 @@ namespace Umbraco.Core.Composing
         public static ICultureDictionaryFactory CultureDictionaryFactory
             => Factory.GetInstance<ICultureDictionaryFactory>();
 
-        public static AppCaches AppCaches
-            => Factory.GetInstance<AppCaches>();
+        public static CacheHelper ApplicationCache
+            => Factory.GetInstance<CacheHelper>();
 
         public static ServiceContext Services
             => Factory.GetInstance<ServiceContext>();

src/Umbraco.Core/Composing/DisableComposerAttribute.cs

@@ -1,28 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Indicates that a composer should be disabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class DisableComposerAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisableComposerAttribute"/> class.
-        /// </summary>
-        public DisableComposerAttribute(Type disabledType)
-        {
-            DisabledType = disabledType;
-        }
-
-        /// <summary>
-        /// Gets the disabled type, or null if it is the composer marked with the attribute.
-        /// </summary>
-        public Type DisabledType { get; }
-    }
-}

src/Umbraco.Core/Composing/EnableComposerAttribute.cs

@@ -1,31 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Indicates that a composer should be enabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>If a type is specified, enables the composer of that type, else enables the composer marked with the attribute.</para>
-    /// <para>This attribute is *not* inherited.</para>
-    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class EnableComposerAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableComposerAttribute"/> class.
-        /// </summary>
-        public EnableComposerAttribute(Type enabledType)
-        {
-            EnabledType = enabledType;
-        }
-
-        /// <summary>
-        /// Gets the enabled type, or null if it is the composer marked with the attribute.
-        /// </summary>
-        public Type EnabledType { get; }
-    }
-}

src/Umbraco.Core/Composing/FactoryExtensions.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Umbraco.Core.Composing;
 
-namespace Umbraco.Core
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Provides extension methods to the <see cref="IFactory"/> class.
@@ -18,7 +17,6 @@ namespace Umbraco.Core
         /// <returns>An instance of the specified type.</returns>
         /// <remarks>Throws an exception if the factory failed to get an instance of the specified type.</remarks>
         public static T GetInstance<T>(this IFactory factory)
-            where T : class
             => (T)factory.GetInstance(typeof(T));
 
         /// <summary>
@@ -30,7 +28,6 @@ namespace Umbraco.Core
         /// of the specified type. Throws an exception if the factory does know how
         /// to get an instance of the specified type, but failed to do so.</remarks>
         public static T TryGetInstance<T>(this IFactory factory)
-            where T : class
             => (T)factory.TryGetInstance(typeof(T));
 
         /// <summary>
@@ -45,7 +42,6 @@ namespace Umbraco.Core
         /// <para>The arguments are used as dependencies by the factory.</para>
         /// </remarks>
         public static T CreateInstance<T>(this IFactory factory, params object[] args)
-            where T : class
             => (T)factory.CreateInstance(typeof(T), args);
 
         /// <summary>

src/Umbraco.Core/Composing/ICoreComposer.cs

@@ -1,11 +0,0 @@
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Represents a core <see cref="IComposer"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>Core composers compose after the initial composer, and before user composers.</para>
-    /// </remarks>
-    public interface ICoreComposer : IComposer
-    { }
-}

src/Umbraco.Core/Composing/IFactory.cs

@@ -3,6 +3,13 @@ using System.Collections.Generic;
 
 namespace Umbraco.Core.Composing
 {
+    // Implementing:
+    //
+    // The factory
+    // - always picks the constructor with the most parameters
+    // - supports Lazy parameters (and prefers them over non-Lazy) in constructors
+    // - what happens with 'releasing' is unclear
+
     /// <summary>
     /// Defines a service factory for Umbraco.
     /// </summary>
@@ -21,15 +28,6 @@ namespace Umbraco.Core.Composing
         /// <remarks>Throws an exception if the container failed to get an instance of the specified type.</remarks>
         object GetInstance(Type type);
 
-        /// <summary>
-        /// Gets a targeted instance of a service.
-        /// </summary>
-        /// <typeparam name="TService">The type of the service.</typeparam>
-        /// <typeparam name="TTarget">The type of the target.</typeparam>
-        /// <returns>The instance of the specified type for the specified target.</returns>
-        /// <remarks>Throws an exception if the container failed to get an instance of the specified type.</remarks>
-        TService GetInstanceFor<TService, TTarget>();
-
         /// <summary>
         /// Tries to get an instance of a service.
         /// </summary>
@@ -50,8 +48,7 @@ namespace Umbraco.Core.Composing
         /// Gets all instances of a service.
         /// </summary>
         /// <typeparam name="TService">The type of the service.</typeparam>
-        IEnumerable<TService> GetAllInstances<TService>()
-            where TService : class;
+        IEnumerable<TService> GetAllInstances<TService>();
 
         /// <summary>
         /// Releases an instance.

src/Umbraco.Core/Composing/IRegister.cs

@@ -2,6 +2,17 @@
 
 namespace Umbraco.Core.Composing
 {
+    // Implementing:
+    //
+    // The register
+    // - supports registering a service, even after some instances of other services have been created
+    // - supports re-registering a service, as long as no instance of that service has been created
+    // - throws when re-registering a service, and an instance of that service has been created
+    //
+    // - registers only one implementation of a nameless service, re-registering replaces the previous
+    //   registration - names are required to register multiple implementations - and getting an
+    //   IEnumerable of the service, nameless, returns them all
+
     /// <summary>
     /// Defines a service register for Umbraco.
     /// </summary>
@@ -25,53 +36,12 @@ namespace Umbraco.Core.Composing
         /// <summary>
         /// Registers a service with an implementation factory.
         /// </summary>
-        void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
+        void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient);
 
         /// <summary>
         /// Registers a service with an implementing instance.
         /// </summary>
-        void Register(Type serviceType, object instance);
-
-        /// <summary>
-        /// Registers a service for a target, as its own implementation.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementation type.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementation factory.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementing instance.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(TService instance)
-            where TService : class;
+        void RegisterInstance(Type serviceType, object instance);
 
         /// <summary>
         /// Registers a base type for auto-registration.

src/Umbraco.Core/Composing/LazyCollectionBuilderBase.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Composing
     /// <typeparam name="TItem">The type of the items.</typeparam>
     public abstract class LazyCollectionBuilderBase<TBuilder, TCollection, TItem> : CollectionBuilderBase<TBuilder, TCollection, TItem>
         where TBuilder : LazyCollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TCollection : class, IBuilderCollection<TItem>
+        where TCollection : IBuilderCollection<TItem>
     {
         private readonly List<Func<IEnumerable<Type>>> _producers = new List<Func<IEnumerable<Type>>>();
         private readonly List<Type> _excluded = new List<Type>();

src/Umbraco.Core/Composing/Lifetime.cs

@@ -15,7 +15,7 @@
         /// <summary>
         /// One unique instance per request.
         /// </summary>
-        // TODO: review lifetimes for LightInject vs other containers
+        // fixme - not what you think!
         // currently, corresponds to 'Request' in LightInject which is 'Transient + disposed by Scope'
         // but NOT (in LightInject) a per-web-request lifetime, more a TransientScoped
         //

src/Umbraco.Core/Composing/LightInject/LightInjectContainer.cs

@@ -102,25 +102,18 @@ namespace Umbraco.Core.Composing.LightInject
         /// <inheritdoc />
         public IFactory CreateFactory() => this;
 
-        private static string GetTargetedServiceName<TTarget>() => "TARGET:" + typeof(TTarget).FullName;
-
         #region Factory
 
         /// <inheritdoc />
         public object GetInstance(Type type)
             => Container.GetInstance(type);
 
-        /// <inheritdoc />
-        public TService GetInstanceFor<TService, TTarget>()
-            => Container.GetInstance<TService>(GetTargetedServiceName<TTarget>());
-
         /// <inheritdoc />
         public object TryGetInstance(Type type)
             => Container.TryGetInstance(type);
 
         /// <inheritdoc />
         public IEnumerable<T> GetAllInstances<T>()
-            where T : class
             => Container.GetAllInstances<T>();
 
         /// <inheritdoc />
@@ -145,7 +138,21 @@ namespace Umbraco.Core.Composing.LightInject
 
         /// <inheritdoc />
         public void Register(Type serviceType, Lifetime lifetime = Lifetime.Transient)
-            => Container.Register(serviceType, GetLifetime(lifetime));
+        {
+            switch (lifetime)
+            {
+                case Lifetime.Transient:
+                    Container.Register(serviceType);
+                    break;
+                case Lifetime.Request:
+                case Lifetime.Scope:
+                case Lifetime.Singleton:
+                    Container.Register(serviceType, GetLifetime(lifetime));
+                    break;
+                default:
+                    throw new NotSupportedException($"Lifetime {lifetime} is not supported.");
+            }
+        }
 
         /// <inheritdoc />
         public void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient)
@@ -167,41 +174,22 @@ namespace Umbraco.Core.Composing.LightInject
 
         /// <inheritdoc />
         public void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
         {
-            Container.Register(f => factory(this), GetLifetime(lifetime));
+            switch (lifetime)
+            {
+                case Lifetime.Transient:
+                    Container.Register(f => factory(this));
+                    break;
+                case Lifetime.Request:
+                case Lifetime.Scope:
+                case Lifetime.Singleton:
+                    Container.Register(f => factory(this), GetLifetime(lifetime));
+                    break;
+                default:
+                    throw new NotSupportedException($"Lifetime {lifetime} is not supported.");
+            }
         }
 
-        /// <inheritdoc />
-        public void Register(Type serviceType, object instance)
-            => Container.RegisterInstance(serviceType, instance);
-
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-            => RegisterFor<TService, TTarget>(typeof(TService), lifetime);
-
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-        {
-            // note that there can only be one implementation or instance registered "for" a service
-            Container.Register(typeof(TService), implementingType, GetTargetedServiceName<TTarget>(), GetLifetime(lifetime));
-        }
-
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-        {
-            // note that there can only be one implementation or instance registered "for" a service
-            Container.Register(f => factory(this), GetTargetedServiceName<TTarget>(), GetLifetime(lifetime));
-        }
-
-        /// <inheritdoc />
-        public void RegisterFor<TService, TTarget>(TService instance)
-            where TService : class
-            => Container.RegisterInstance(typeof(TService), instance, GetTargetedServiceName<TTarget>());
-
         private ILifetime GetLifetime(Lifetime lifetime)
         {
             switch (lifetime)
@@ -219,6 +207,10 @@ namespace Umbraco.Core.Composing.LightInject
             }
         }
 
+        /// <inheritdoc />
+        public void RegisterInstance(Type serviceType, object instance)
+            => Container.RegisterInstance(serviceType, instance);
+
         /// <inheritdoc />
         public void RegisterAuto(Type serviceBaseType)
         {
@@ -231,6 +223,17 @@ namespace Umbraco.Core.Composing.LightInject
             }, null);
         }
 
+        // was the Light-Inject specific way of dealing with args, but we've replaced it with our own
+        // beware! does NOT work on singletons, see https://github.com/seesharper/LightInject/issues/294
+        //
+        ///// <inheritdoc />
+        //public void RegisterConstructorDependency<TDependency>(Func<IContainer, ParameterInfo, TDependency> factory)
+        //    => Container.RegisterConstructorDependency((f, x) => factory(this, x));
+        //
+        ///// <inheritdoc />
+        //public void RegisterConstructorDependency<TDependency>(Func<IContainer, ParameterInfo, object[], TDependency> factory)
+        //    => Container.RegisterConstructorDependency((f, x, a) => factory(this, x, a));
+
         #endregion
 
         #region Control
@@ -253,14 +256,21 @@ namespace Umbraco.Core.Composing.LightInject
 
         private class AssemblyScanner : IAssemblyScanner
         {
+            //private readonly IAssemblyScanner _scanner;
+
+            //public AssemblyScanner(IAssemblyScanner scanner)
+            //{
+            //    _scanner = scanner;
+            //}
+
             public void Scan(Assembly assembly, IServiceRegistry serviceRegistry, Func<ILifetime> lifetime, Func<Type, Type, bool> shouldRegister, Func<Type, Type, string> serviceNameProvider)
             {
-                // nothing - we don't want LightInject to scan
+                // nothing - we *could* scan non-Umbraco assemblies, though
             }
 
             public void Scan(Assembly assembly, IServiceRegistry serviceRegistry)
             {
-                // nothing - we don't want LightInject to scan
+                // nothing - we *could* scan non-Umbraco assemblies, though
             }
         }
 

src/Umbraco.Core/Composing/LightInject/MixedLightInjectScopeManagerProvider.cs

@@ -13,9 +13,6 @@ namespace Umbraco.Core.Composing.LightInject
     // of PerWebRequestScopeManagerProvider - but all delegates see is the mixed one - and therefore
     // they can transition without issues.
     //
-    // The PerWebRequestScopeManager maintains the scope in HttpContext and LightInject registers a
-    // module (PreApplicationStartMethod) which disposes it on EndRequest
-    //
     // the mixed provider is installed in container.ConfigureUmbracoCore() and then,
     // when doing eg container.EnableMvc() or anything that does container.EnablePerWebRequestScope()
     // we need to take great care to preserve the mixed scope manager provider!

src/Umbraco.Core/Composing/OrderedCollectionBuilderBase.cs

@@ -11,7 +11,7 @@ namespace Umbraco.Core.Composing
     /// <typeparam name="TItem">The type of the items.</typeparam>
     public abstract class OrderedCollectionBuilderBase<TBuilder, TCollection, TItem> : CollectionBuilderBase<TBuilder, TCollection, TItem>
         where TBuilder : OrderedCollectionBuilderBase<TBuilder, TCollection, TItem>
-        where TCollection : class, IBuilderCollection<TItem>
+        where TCollection : IBuilderCollection<TItem>
     {
         protected abstract TBuilder This { get; }
 
@@ -78,6 +78,33 @@ namespace Umbraco.Core.Composing
             return This;
         }
 
+        /// <summary>
+        /// Appends a type after another type.
+        /// </summary>
+        /// <typeparam name="TAfter">The other type.</typeparam>
+        /// <typeparam name="T">The type to append.</typeparam>
+        /// <returns>The builder.</returns>
+        /// <remarks>Throws if both types are identical, or if the other type does not already belong to the collection.</remarks>
+        public TBuilder AppendAfter<TAfter, T>()
+            where TAfter : TItem
+            where T : TItem
+        {
+            Configure(types =>
+            {
+                var typeAfter = typeof (TAfter);
+                var type = typeof(T);
+                if (typeAfter == type) throw new InvalidOperationException();
+
+                var index = types.IndexOf(typeAfter);
+                if (index < 0) throw new InvalidOperationException();
+
+                if (types.Contains(type)) types.Remove(type);
+                index = types.IndexOf(typeAfter); // in case removing type changed index
+                types.Insert(index + 1, type);
+            });
+            return This;
+        }
+
         /// <summary>
         /// Inserts a type into the collection.
         /// </summary>
@@ -179,69 +206,6 @@ namespace Umbraco.Core.Composing
             return This;
         }
 
-        /// <summary>
-        /// Inserts a type after another type.
-        /// </summary>
-        /// <typeparam name="TAfter">The other type.</typeparam>
-        /// <typeparam name="T">The type to append.</typeparam>
-        /// <returns>The builder.</returns>
-        /// <remarks>Throws if both types are identical, or if the other type does not already belong to the collection.</remarks>
-        public TBuilder InsertAfter<TAfter, T>()
-            where TAfter : TItem
-            where T : TItem
-        {
-            Configure(types =>
-            {
-                var typeAfter = typeof(TAfter);
-                var type = typeof(T);
-                if (typeAfter == type) throw new InvalidOperationException();
-
-                var index = types.IndexOf(typeAfter);
-                if (index < 0) throw new InvalidOperationException();
-
-                if (types.Contains(type)) types.Remove(type);
-                index = types.IndexOf(typeAfter); // in case removing type changed index
-                index += 1; // insert here
-
-                if (index == types.Count)
-                    types.Add(type);
-                else
-                    types.Insert(index, type);
-            });
-            return This;
-        }
-
-        /// <summary>
-        /// Inserts a type after another type.
-        /// </summary>
-        /// <param name="typeAfter">The other type.</param>
-        /// <param name="type">The type to insert.</param>
-        /// <returns>The builder.</returns>
-        /// <remarks>Throws if both types are identical, or if the other type does not already belong to the collection.</remarks>
-        public TBuilder InsertAfter(Type typeAfter, Type type)
-        {
-            Configure(types =>
-            {
-                EnsureType(typeAfter, "find");
-                EnsureType(type, "register");
-
-                if (typeAfter == type) throw new InvalidOperationException();
-
-                var index = types.IndexOf(typeAfter);
-                if (index < 0) throw new InvalidOperationException();
-
-                if (types.Contains(type)) types.Remove(type);
-                index = types.IndexOf(typeAfter); // in case removing type changed index
-                index += 1; // insert here
-
-                if (index == types.Count)
-                    types.Add(type);
-                else
-                    types.Insert(index, type);
-            });
-            return This;
-        }
-
         /// <summary>
         /// Removes a type from the collection.
         /// </summary>

src/Umbraco.Core/Composing/RegisterExtensions.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core
+namespace Umbraco.Core.Composing
 {
     /// <summary>
     /// Provides extension methods to the <see cref="IRegister"/> class.
@@ -13,32 +11,22 @@ namespace Umbraco.Core
         public static void Register<TService, TImplementing>(this IRegister register, Lifetime lifetime = Lifetime.Transient)
             => register.Register(typeof(TService), typeof(TImplementing), lifetime);
 
-        /// <summary>
-        /// Registers a service with an implementation type, for a target.
-        /// </summary>
-        public static void RegisterFor<TService, TImplementing, TTarget>(this IRegister register, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
-            => register.RegisterFor<TService, TTarget>(typeof(TImplementing), lifetime);
-
         /// <summary>
         /// Registers a service as its own implementation.
         /// </summary>
         public static void Register<TService>(this IRegister register, Lifetime lifetime = Lifetime.Transient)
-            where TService : class
             => register.Register(typeof(TService), lifetime);
 
         /// <summary>
         /// Registers a service with an implementing instance.
         /// </summary>
-        public static void Register<TService>(this IRegister register, TService instance)
-            where TService : class
-            => register.Register(typeof(TService), instance);
+        public static void RegisterInstance<TService>(this IRegister register, TService instance)
+            => register.RegisterInstance(typeof(TService), instance);
 
         /// <summary>
         /// Registers a base type for auto-registration.
         /// </summary>
         public static void RegisterAuto<TServiceBase>(this IRegister register)
-            where TServiceBase : class
             => register.RegisterAuto(typeof(TServiceBase));
     }
 }

src/Umbraco.Core/Composing/RegisterFactory.cs

@@ -18,14 +18,14 @@ namespace Umbraco.Core.Composing
         /// Creates a new instance of the configured container.
         /// </summary>
         /// <remarks>
-        /// To override the default LightInjectContainer, add an appSetting named 'Umbraco.Core.RegisterType' with
+        /// To override the default LightInjectContainer, add an appSetting named umbracoContainerType with
         /// a fully qualified type name to a class with a static method "Create" returning an IRegister.
         /// </remarks>
         public static IRegister Create()
         {
             Type type;
 
-            var configuredTypeName = ConfigurationManager.AppSettings[Constants.AppSettings.RegisterType];
+            var configuredTypeName = ConfigurationManager.AppSettings["umbracoRegisterType"];
             if (configuredTypeName.IsNullOrWhiteSpace())
             {
                 // try to get the web LightInject container type,