Merge branch 'temp-v8-UI-infinite-editing-U4-11225' into temp-v8-UI-infinite-editing

fixes: U4-11209 Update layout for developer dashboards to fit new styles

.editorconfig

@@ -8,9 +8,10 @@ root = true
 # Use 4 spaces as indentation
 [*]
 insert_final_newline = true
+end_of_line = lf
 indent_style = space
 indent_size = 4
 
 # Trim trailing whitespace, limited support.
 # https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
-trim_trailing_whitespace = true
+trim_trailing_whitespace = true

.gitignore

@@ -4,26 +4,33 @@
 *.aps
 *.pch
 *.vspscc
+*.orig
+*.suo
+*.vs10x
+*.ndproj
+
 .DS_Store
 ._.DS_Store
+
 [Bb]in
 [Db]ebug*/
 obj/
 [Rr]elease*/
+
 _ReSharper*/
+
 _NCrunch_*/
 *.ncrunchsolution
 *.ncrunchsolution.user
 *.ncrunchproject
 *.crunchsolution.cache
+
 [Tt]est[Rr]esult*
 [Bb]uild[Ll]og.*
 *.[Pp]ublish.xml
-*.suo
 [sS]ource
 [sS]andbox
 umbraco.config
-*.vs10x
 App_Data/TEMP/*
 [Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
 [Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
@@ -46,12 +53,11 @@ src/Umbraco.Web.UI/Web.*.config.transformed
 
 umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
 umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
-*.ncrunchsolution
+
 src/Umbraco.Tests/config/applications.config
 src/Umbraco.Tests/config/trees.config
 src/Umbraco.Web.UI/web.config
 src/Umbraco.Web.UI/Config/ClientDependency.config
-*.orig
 src/Umbraco.Tests/config/404handlers.config
 src/Umbraco.Web.UI/[Vv]iews/*.cshtml
 src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
@@ -89,6 +95,7 @@ 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
 tools/NDepend/
 
@@ -97,9 +104,8 @@ src/*.psess
 src/*.vspx
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
 NDependOut/*
-*.ndproj
 QueryResult.htm
-*.ndproj
+
 src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
 src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
 src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
@@ -126,9 +132,13 @@ src/*.boltdata/
 src/umbraco.sln.ide/*
 src/.vs/
 src/Umbraco.Web.UI/umbraco/js/install.loader.js
+src/Umbraco.Web.UI/js/*
 src/Umbraco.Tests/media
 tools/docfx/*
 apidocs/_site/*
+src/*/project.lock.json
+src/.idea/*
+
 apidocs/api/*
 build/docs.zip
 build/ui-docs.zip
@@ -137,8 +147,8 @@ build/csharp-docs.zip
 src/packages/
 src/PrecompiledWeb/*
 
-
+# build
 build.out/
 build.tmp/
-build/Modules/*/temp/
-/src/.idea/*
+build/hooks/
+build/temp/

BUILD.md

@@ -55,6 +55,10 @@ The best solution is to unblock the Zip file before un-zipping: right-click the
 
 Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
 
+If PowerShell does not execute the script due to a security error, you may have to run the following command from an administrator prompt: 
+
+    Set-ExecutionPolicy -ExecutionPolicy RemoteSigned
+
 # Build
 
 The Umbraco Build solution relies on a PowerShell module. The module needs to be imported into PowerShell. From within Umbraco's repository root:

README.md

@@ -1,5 +1,3 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7)
-
 Umbraco CMS
 ===========
 The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)

appveyor.yml

@@ -1,62 +0,0 @@
-version: '{build}'
-shallow_clone: true
-
-init:
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  
-build_script:
-- cmd: >-
-    SET SLN=%CD%
-
-    SET SRC=%SLN%\src
-
-    SET PACKAGES=%SRC%\packages
-
-    CD build
-
-    SET "release="
-
-    FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
-
-    ECHO "Restoring NuGet into %PACKAGES%"
-    
-    %SRC%\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
-    
-    %SRC%\.nuget\NuGet.exe restore %SRC%\umbraco.sln -Verbosity Quiet -NonInteractive -PackagesDirectory %PACKAGES%
-
-    ECHO Building Release %release% build%APPVEYOR_BUILD_NUMBER%
-    
-    SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-    
-    SET MSBUILD="C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe"
-
-    XCOPY "%SRC%\Umbraco.Tests\unit-test-log4net.CI.config" "%SRC%\Umbraco.Tests\unit-test-log4net.config" /Y
-    
-    %MSBUILD% "%SLN%/src/Umbraco.Tests/Umbraco.Tests.csproj" /consoleloggerparameters:Summary;ErrorsOnly;WarningsOnly /p:NugetPackagesDirectory=%PACKAGES%
-    
-    build.bat -integration -release:%release% -comment:build%APPVEYOR_BUILD_NUMBER% -nugetfolder:%PACKAGES%
-    
-test:
-  assemblies: src\Umbraco.Tests\bin\Debug\Umbraco.Tests.dll
-artifacts:
-- path: build\UmbracoCms.*
-  name: UmbracoFiles
-- path: build\msbuild.log
-  name: BuildLog
-deploy:
-- provider: AzureBlob
-  storage_account_name: umbraconightlies
-  storage_access_key:
-    secure: bmEMml2SF7QLHULiePa/a01XOeIa2SxJeXuaZ+1R27b+Vb2nNUQVYiPlUyF2cZAFSHI/zO/LekRsVU1rTescGhJjF7SSjKybymI3p+F/OWpwqiu2WfFee1ofXBFx8QHw
-  container: umbraco-750
-  artifact: UmbracoFiles
-  on:
-    branch: dev-v7
-notifications:
-- provider: Slack
-  auth_token:
-    secure: v2csJi2V5ghR0rPdODK8GJdOGNCA+XaK84iQ9MdPOClqB+VU+40ybdKp6gPirGSH
-  channel: '#build-umbraco-core'
-  on_build_success: false
-  on_build_failure: true
-  on_build_status_changed: false

build.bat

@@ -1,14 +0,0 @@
-@ECHO OFF
-powershell .\build\build.ps1
-
-IF ERRORLEVEL 1 (
-	GOTO :error 
-) ELSE (
-	GOTO :EOF 
-)
-
-:error
-ECHO.
-ECHO Can not run build\build.ps1.
-ECHO If this is due to a SecurityError then please refer to BUILD.md for help!
-ECHO.

build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1

@@ -1,112 +0,0 @@
-#
-
-function Build-UmbracoDocs
-{
-  $uenv = Get-UmbracoBuildEnv
-  
-  $src = "$($uenv.SolutionRoot)\src"
-  $out = "$($uenv.SolutionRoot)\build.out"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  
-  $buildTemp = "$PSScriptRoot\temp"
-  $cache = 2
-  
-  Prepare-Build -keep $uenv
-
-  ################ Do the UI docs
-  # get a temp clean node env (will restore)
-  Sandbox-Node $uenv
-  
-  Write-Host "Executing gulp docs"
-  
-  push-location "$($uenv.SolutionRoot)\src\Umbraco.Web.UI.Client"
-  write "node version is:" > $tmp\belle-docs.log
-  &node -v >> $tmp\belle-docs.log 2>&1
-  write "npm version is:" >> $tmp\belle-docs.log 2>&1
-  &npm -v >> $tmp\belle-docs.log 2>&1
-  write "executing npm install" >> $tmp\belle-docs.log 2>&1
-  &npm install >> $tmp\belle-docs.log 2>&1
-  write "executing bower install" >> $tmp\belle-docs.log 2>&1
-  &npm install -g bower >> $tmp\belle-docs.log 2>&1
-  write "installing gulp" >> $tmp\belle-docs.log 2>&1
-  &npm install -g gulp >> $tmp\belle-docs.log 2>&1
-  write "installing gulp-cli" >> $tmp\belle-docs.log 2>&1
-  &npm install -g gulp-cli --quiet >> $tmp\belle-docs.log 2>&1
-  write "building docs using gulp" >> $tmp\belle-docs.log 2>&1
-  &gulp docs >> $tmp\belle-docs.log 2>&1
-  pop-location  
-
-  Write-Host "Completed gulp docs build"
-  
-  # fixme - should we filter the log to find errors?
-  #get-content .\build.tmp\belle-docs.log | %{ if ($_ -match "build") { write $_}}
-  
-  # change baseUrl
-  $baseUrl = "https://our.umbraco.org/apidocs/ui/"
-  $indexPath = "$src/Umbraco.Web.UI.Client/docs/api/index.html"
-  (Get-Content $indexPath).Replace("origin + location.href.substr(origin.length).replace(rUrl, indexFile)", "'$baseUrl'") `
-    | Set-Content $indexPath
-    
-  # restore
-  Restore-Node
-  
-  # zip
-  &$uenv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*" `
-    > $null
-
-  ################ Do the c# docs
-  
-  Write-Host "Build C# documentation"
-  
-  # Build the solution in debug mode
-  # FIXME no only a simple compilation should be enough!
-  # FIXME we MUST handle msbuild & co error codes!
-  # FIXME deal with weird things in gitconfig?
-  #Build-Umbraco -Configuration Debug
-  Restore-NuGet $uenv
-  Compile-Umbraco $uenv "Debug" # FIXME different log file!
-  Restore-WebConfig "$src\Umbraco.Web.UI"
-  
-  # ensure we have docfx
-  Get-DocFx $uenv $buildTemp
-
-  # clear
-  $docFxOutput = "$($uenv.SolutionRoot)\apidocs\_site"
-  if (test-path($docFxOutput))
-  {
-    Remove-Directory $docFxOutput
-  }
-
-  # run
-  $docFxJson = "$($uenv.SolutionRoot)\apidocs\docfx.json"
-  push-location "$($uenv.SolutionRoot)\build" # silly docfx.json wants this
-  
-  Write-Host "Run DocFx metadata"
-  Write-Host "Logging to $tmp\docfx.metadata.log"
-  &$uenv.DocFx metadata $docFxJson > "$tmp\docfx.metadata.log"
-  Write-Host "Run DocFx build"
-  Write-Host "Logging to $tmp\docfx.build.log"
-  &$uenv.DocFx build $docFxJson > "$tmp\docfx.build.log"
-  
-  pop-location
-
-  # zip
-  &$uenv.Zip a -tzip -r "$out\csharp-docs.zip" "$docFxOutput\*.*" `
-    > $null
-}
-
-function Get-DocFx($uenv, $buildTemp)
-{
-  $docFx = "$buildTemp\docfx"
-  if (-not (test-path $docFx))
-  {
-    $source = "https://github.com/dotnet/docfx/releases/download/v2.19.2/docfx.zip"
-    Write-Host "Download DocFx from $source"
-    
-    Invoke-WebRequest $source -OutFile "$buildTemp\docfx.zip"
-    
-    &$uenv.Zip x "$buildTemp\docfx.zip" -o"$buildTemp\docfx" -aos > $nul
-    Remove-File "$buildTemp\docfx.zip"  
-  }
-  $uenv | add-member -memberType NoteProperty -name DocFx -value "$docFx\docfx.exe"
-}

build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1

@@ -1,182 +0,0 @@
-#
-# Get-UmbracoBuildEnv
-# Gets the Umbraco build environment
-# Downloads tools if necessary
-#
-function Get-UmbracoBuildEnv
-{
-  # store tools in the module's directory
-  # and cache them for two days
-  $path = "$PSScriptRoot\temp"
-  $src = "$PSScriptRoot\..\..\..\src"
-  $cache = 2
-  
-  if (-not (test-path $path))
-  {
-    mkdir $path > $null
-  }
-
-  # ensure we have NuGet
-  $nuget = "$path\nuget.exe"
-  $source = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-  if ((test-path $nuget) -and ((ls $nuget).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
-  {
-    Remove-File $nuget
-  }
-  if (-not (test-path $nuget))
-  {
-    Write-Host "Download NuGet..."
-    Invoke-WebRequest $source -OutFile $nuget
-  }
-  
-  # ensure we have 7-Zip
-  $sevenZip = "$path\7za.exe"
-  if ((test-path $sevenZip) -and ((ls $sevenZip).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
-  {
-    Remove-File $sevenZip
-  }
-  if (-not (test-path $sevenZip))
-  {
-    Write-Host "Download 7-Zip..."
-    &$nuget install 7-Zip.CommandLine -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
-    $dir = ls "$path\7-Zip.CommandLine.*" | sort -property Name -descending | select -first 1
-    $file = ls -path "$dir" -name 7za.exe -recurse
-    $file = ls -path "$dir" -name 7za.exe -recurse | select -first 1 #A select is because there is tools\7za.exe & tools\x64\7za.exe
-    mv "$dir\$file" $sevenZip
-    Remove-Directory $dir
-  }
-  
-  # ensure we have vswhere
-  $vswhere = "$path\vswhere.exe"
-  if ((test-path $vswhere) -and ((ls $vswhere).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
-  {
-    Remove-File $vswhere
-  }
-  if (-not (test-path $vswhere))
-  {
-    Write-Host "Download VsWhere..."
-    &$nuget install vswhere -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
-    $dir = ls "$path\vswhere.*" | sort -property Name -descending | select -first 1
-    $file = ls -path "$dir" -name vswhere.exe -recurse
-    mv "$dir\$file" $vswhere
-    Remove-Directory $dir
-  }
-  
-  # ensure we have semver
-  $semver = "$path\Semver.dll"
-  if ((test-path $semver) -and ((ls $semver).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
-  {
-    Remove-File $semver
-  }
-  if (-not (test-path $semver))
-  {
-    Write-Host "Download Semver..."
-    &$nuget install semver -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
-    $dir = ls "$path\semver.*" | sort -property Name -descending | select -first 1
-    $file = "$dir\lib\net452\Semver.dll"
-    if (-not (test-path $file))
-    {
-      Write-Error "Failed to file $file"
-      return
-    }
-    mv "$file" $semver
-    Remove-Directory $dir
-  }
-
-  try
-  {
-    [Reflection.Assembly]::LoadFile($semver) > $null
-  }
-  catch
-  {
-    Write-Error -Exception $_.Exception -Message "Failed to load $semver"
-    break
-  }
-  
-  # ensure we have node
-  $node = "$path\node-v6.9.1-win-x86"
-  $source = "http://nodejs.org/dist/v6.9.1/node-v6.9.1-win-x86.7z"
-  if (-not (test-path $node))
-  {
-    Write-Host "Download Node..."
-    Invoke-WebRequest $source -OutFile "$path\node-v6.9.1-win-x86.7z"
-    &$sevenZip x "$path\node-v6.9.1-win-x86.7z" -o"$path" -aos > $nul
-    Remove-File "$path\node-v6.9.1-win-x86.7z"    
-  }
-  
-  # note: why? node already brings everything we need!
-  ## ensure we have npm
-  #$npm = "$path\npm.*"
-  #$getNpm = $true
-  #if (test-path $npm)
-  #{
-  #  $getNpm = $false
-  #  $tmpNpm = ls "$path\npm.*" | sort -property Name -descending | select -first 1
-  #  if ($tmpNpm.CreationTime -lt [DateTime]::Now.AddDays(-$cache))
-  #  {
-  #    $getNpm = $true
-  #  }
-  #  else
-  #  {
-  #    $npm = $tmpNpm.ToString()
-  #  }
-  #}
-  #if ($getNpm)
-  #{
-  #  Write-Host "Download Npm..."
-  #  &$nuget install npm -OutputDirectory $path -Verbosity quiet
-  #  $npm = ls "$path\npm.*" | sort -property Name -descending | select -first 1
-  #  $npm.CreationTime = [DateTime]::Now
-  #  $npm = $npm.ToString()
-  #}
-  
-  # find visual studio
-  # will not work on VSO but VSO does not need it
-  $vsPath = ""
-  $vsVer = ""
-  $msBuild = $null
-  &$vswhere | foreach {
-    if ($_.StartsWith("installationPath:")) { $vsPath = $_.SubString("installationPath:".Length).Trim() }
-    if ($_.StartsWith("installationVersion:")) { $vsVer = $_.SubString("installationVersion:".Length).Trim() }
-  }
-  if ($vsPath -ne "")
-  {
-    $vsVerParts = $vsVer.Split('.')
-    $vsMajor = [int]::Parse($vsVerParts[0])
-    $vsMinor = [int]::Parse($vsVerParts[1])
-    if ($vsMajor -eq 15) {
-      $msBuild = "$vsPath\MSBuild\$vsMajor.0\Bin"
-    }
-    elseif ($vsMajor -eq 14) {
-      $msBuild = "c:\Program Files (x86)\MSBuild\$vsMajor\Bin"
-    }
-    else 
-    {
-      $msBuild = $null
-    }
-  }
- 
-  $vs = $null
-  if ($msBuild)
-  {
-    $vs = new-object -typeName PsObject
-    $vs | add-member -memberType NoteProperty -name Path -value $vsPath
-    $vs | add-member -memberType NoteProperty -name Major -value $vsMajor
-    $vs | add-member -memberType NoteProperty -name Minor -value $vsMinor
-    $vs | add-member -memberType NoteProperty -name MsBuild -value "$msBuild\MsBuild.exe"
-  }
-  
-  $solutionRoot = Get-FullPath "$PSScriptRoot\..\..\.."
-  
-  $uenv = new-object -typeName PsObject
-  $uenv | add-member -memberType NoteProperty -name SolutionRoot -value $solutionRoot
-  $uenv | add-member -memberType NoteProperty -name VisualStudio -value $vs
-  $uenv | add-member -memberType NoteProperty -name NuGet -value $nuget
-  $uenv | add-member -memberType NoteProperty -name Zip -value $sevenZip
-  $uenv | add-member -memberType NoteProperty -name VsWhere -value $vswhere
-  $uenv | add-member -memberType NoteProperty -name Semver -value $semver
-  $uenv | add-member -memberType NoteProperty -name NodePath -value $node
-  #$uenv | add-member -memberType NoteProperty -name NpmPath -value $npm
-  
-  return $uenv
-}

build/Modules/Umbraco.Build/Get-UmbracoVersion.ps1

@@ -1,26 +0,0 @@
-#
-# Get-UmbracoVersion
-# Gets the Umbraco version
-#
-function Get-UmbracoVersion
-{  
-  $uenv = Get-UmbracoBuildEnv
-  
-  # parse SolutionInfo and retrieve the version string
-  $filepath = "$($uenv.SolutionRoot)\src\SolutionInfo.cs"
-  $text = [System.IO.File]::ReadAllText($filepath)
-  $match = [System.Text.RegularExpressions.Regex]::Matches($text, "AssemblyInformationalVersion\(`"(.+)?`"\)")
-  $version = $match.Groups[1]
-
-  # semver-parse the version string
-  $semver = [SemVer.SemVersion]::Parse($version)
-  $release = "" + $semver.Major + "." + $semver.Minor + "." + $semver.Patch
-
-  $versions = new-object -typeName PsObject
-  $versions | add-member -memberType NoteProperty -name Semver -value $semver
-  $versions | add-member -memberType NoteProperty -name Release -value $release
-  $versions | add-member -memberType NoteProperty -name Comment -value $semver.PreRelease
-  $versions | add-member -memberType NoteProperty -name Build -value $semver.Build
-  
-  return $versions
-}

build/Modules/Umbraco.Build/Get-VisualStudio.ps1

@@ -1,30 +0,0 @@
-# finds msbuild
-function Get-VisualStudio($vswhere)
-{
-  $vsPath = ""
-  $vsVer = ""
-  &$vswhere | foreach {
-    if ($_.StartsWith("installationPath:")) { $vsPath = $_.SubString("installationPath:".Length).Trim() }
-    if ($_.StartsWith("installationVersion:")) { $vsVer = $_.SubString("installationVersion:".Length).Trim() }
-  }
-  if ($vsPath -eq "") { return $null }
-  
-  $vsVerParts = $vsVer.Split('.')
-  $vsMajor = [int]::Parse($vsVerParts[0])
-  $vsMinor = [int]::Parse($vsVerParts[1])
-  if ($vsMajor -eq 15) {
-    $msBuild = "$vsPath\MSBuild\$vsMajor.$vsMinor\Bin"
-  }
-  elseif ($vsMajor -eq 14) {
-    $msBuild = "c:\Program Files (x86)\MSBuild\$vsMajor\Bin"
-  }
-  else { return $null }
-  $msBuild = "$msBuild\MsBuild.exe"
-  
-  $vs = new-object -typeName PsObject
-  $vs | add-member -memberType NoteProperty -name Path -value $vsPath
-  $vs | add-member -memberType NoteProperty -name Major -value $vsMajor
-  $vs | add-member -memberType NoteProperty -name Minor -value $vsMinor
-  $vs | add-member -memberType NoteProperty -name MsBuild -value $msBuild
-  return $vs
-}

build/Modules/Umbraco.Build/Set-UmbracoContinuousVersion.ps1

@@ -1,30 +0,0 @@
-#
-# Set-UmbracoContinuousVersion
-# Sets the Umbraco version for continuous integration
-#
-#   -Version <version>
-#   where <version> is a Semver valid version
-#   eg 1.2.3, 1.2.3-alpha, 1.2.3-alpha+456
-#
-#   -BuildNumber <buildNumber>
-#   where <buildNumber> is a string coming from the build server
-#   eg 34, 126, 1
-#
-function Set-UmbracoContinuousVersion
-{
-  param (
-    [Parameter(Mandatory=$true)]
-    [string]
-    $version,
-    [Parameter(Mandatory=$true)]
-    [string]
-    $buildNumber
-  )
-  
-  Write-Host "Version is currently set to $version"
-
-  $umbracoVersion = "$($version.Trim())-alpha$($buildNumber)"
-  Write-Host "Setting Umbraco Version to $umbracoVersion"
-
-  Set-UmbracoVersion $umbracoVersion
-}

build/Modules/Umbraco.Build/Set-UmbracoVersion.ps1

@@ -1,117 +0,0 @@
-#
-# Set-UmbracoVersion
-# Sets the Umbraco version
-#
-#   -Version <version>
-#   where <version> is a Semver valid version
-#   eg 1.2.3, 1.2.3-alpha, 1.2.3-alpha+456
-#
-function Set-UmbracoVersion
-{
-  param (
-    [Parameter(Mandatory=$true)]
-    [string]
-    $version
-  )
-  
-  $uenv = Get-UmbracoBuildEnv
-  
-  try
-  {
-    [Reflection.Assembly]::LoadFile($uenv.Semver) > $null
-  }
-  catch
-  {
-    Write-Error "Failed to load $uenv.Semver"
-    break
-  }
-  
-  # validate input
-  $ok = [Regex]::Match($version, "^[0-9]+\.[0-9]+\.[0-9]+(\-[a-z0-9]+)?(\+[0-9]+)?$")
-  if (-not $ok.Success)
-  {
-    Write-Error "Invalid version $version"
-    break
-  }
-
-  # parse input
-  try
-  {
-    $semver = [SemVer.SemVersion]::Parse($version)
-  }
-  catch
-  {
-    Write-Error "Invalid version $version"
-    break
-  }
-  
-  #
-  $release = "" + $semver.Major + "." + $semver.Minor + "." + $semver.Patch
-  
-  # edit files and set the proper versions and dates
-  Write-Host "Update UmbracoVersion.cs"
-  Replace-FileText "$($uenv.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs" `
-    "(\d+)\.(\d+)\.(\d+)(.(\d+))?" `
-    "$release" 
-  Replace-FileText "$($uenv.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs" `
-    "CurrentComment { get { return `"(.+)`"" `
-    "CurrentComment { get { return `"$($semver.PreRelease)`""
-  Write-Host "Update SolutionInfo.cs"
-  Replace-FileText "$($uenv.SolutionRoot)\src\SolutionInfo.cs" `
-    "AssemblyFileVersion\(`"(.+)?`"\)" `
-    "AssemblyFileVersion(`"$release`")"
-  Replace-FileText "$($uenv.SolutionRoot)\src\SolutionInfo.cs" `
-    "AssemblyInformationalVersion\(`"(.+)?`"\)" `
-    "AssemblyInformationalVersion(`"$semver`")"
-  $year = [System.DateTime]::Now.ToString("yyyy")
-  Replace-FileText "$($uenv.SolutionRoot)\src\SolutionInfo.cs" `
-    "AssemblyCopyright\(`"Copyright © Umbraco (\d{4})`"\)" `
-    "AssemblyCopyright(`"Copyright © Umbraco $year`")"
-   
-  # edit csproj and set IIS Express port number
-  # this is a raw copy of ReplaceIISExpressPortNumber.exe
-  # it probably can be achieved in a much nicer way - l8tr
-  $source = @"
-  using System;
-  using System.IO;
-  using System.Xml;
-  using System.Globalization;
-
-  namespace Umbraco
-  {
-    public static class PortUpdater
-    {
-      public static void Update(string path, string release)
-      {
-        XmlDocument xmlDocument = new XmlDocument();
-        string fullPath = Path.GetFullPath(path);
-        xmlDocument.Load(fullPath);
-        int result = 1;
-        int.TryParse(release.Replace(`".`", `"`"), out result);
-        while (result < 1024)
-          result *= 10;
-        XmlNode xmlNode1 = xmlDocument.GetElementsByTagName(`"IISUrl`").Item(0);
-        if (xmlNode1 != null)
-          xmlNode1.InnerText = `"http://localhost:`" + (object) result;
-        XmlNode xmlNode2 = xmlDocument.GetElementsByTagName(`"DevelopmentServerPort`").Item(0);
-        if (xmlNode2 != null)
-          xmlNode2.InnerText = result.ToString((IFormatProvider) CultureInfo.InvariantCulture);
-        xmlDocument.Save(fullPath);
-      }
-    }
-  }
-"@
-
-  $assem = (
-    "System.Xml",
-    "System.IO",
-    "System.Globalization"
-  )
-
-  Write-Host "Update Umbraco.Web.UI.csproj"
-  add-type -referencedAssemblies $assem -typeDefinition $source -language CSharp
-  $csproj = "$($uenv.SolutionRoot)\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj"
-  [Umbraco.PortUpdater]::Update($csproj, $release)
-
-  return $semver
-}

build/Modules/Umbraco.Build/Umbraco.Build.psm1

@@ -1,615 +0,0 @@
-
-# Umbraco.Build.psm1
-#
-# $env:PSModulePath = "$pwd\build\Modules\;$env:PSModulePath"
-# Import-Module Umbraco.Build -Force -DisableNameChecking
-#
-# PowerShell Modules:
-# https://msdn.microsoft.com/en-us/library/dd878324%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396
-#
-# PowerShell Module Manifest:
-# https://msdn.microsoft.com/en-us/library/dd878337%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396
-#
-# See also
-# http://www.powershellmagazine.com/2014/08/15/pstip-taking-control-of-verbose-and-debug-output-part-5/
-
-
-. "$PSScriptRoot\Utilities.ps1"
-. "$PSScriptRoot\Get-VisualStudio.ps1"
-
-. "$PSScriptRoot\Get-UmbracoBuildEnv.ps1"
-. "$PSScriptRoot\Set-UmbracoVersion.ps1"
-. "$PSScriptRoot\Set-UmbracoContinuousVersion.ps1"
-. "$PSScriptRoot\Get-UmbracoVersion.ps1"
-. "$PSScriptRoot\Verify-NuGet.ps1"
-
-. "$PSScriptRoot\Build-UmbracoDocs.ps1"
-
-#
-# Prepares the build
-#
-function Prepare-Build
-{
-  param (
-    $uenv, # an Umbraco build environment (see Get-UmbracoBuildEnv)
-    
-    [Alias("k")]
-    [switch]
-    $keep = $false
-  )
-
-  Write-Host ">> Prepare Build"
-  
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $out = "$($uenv.SolutionRoot)\build.out"
-
-  # clear
-  Write-Host "Clear folders and files"
-
-  Remove-Directory "$src\Umbraco.Web.UI.Client\bower_components"
-
-  if (-not $keep)
-  {
-	Remove-Directory "$tmp"
-	Remove-Directory "$out"
-  }
-
-  if (-not (Test-Path "$tmp")) 
-  {
-    mkdir "$tmp" > $null
-  }
-  if (-not (Test-Path "$out")) 
-  {
-    mkdir "$out" > $null
-  }
-    
-  # ensure proper web.config
-  $webUi = "$src\Umbraco.Web.UI"
-  Store-WebConfig $webUi
-  Write-Host "Create clean web.config"
-  Copy-File "$webUi\web.Template.config" "$webUi\web.config"
-}
-
-function Clear-EnvVar($var)
-{
-  $value = [Environment]::GetEnvironmentVariable($var)
-  if (test-path "env:$var") { rm "env:$var" }
-  return $value
-}
-
-function Set-EnvVar($var, $value)
-{
-  if ($value)
-  {
-    [Environment]::SetEnvironmentVariable($var, $value)
-  }
-  else
-  {
-    if (test-path "env:$var") { rm "env:$var" }
-  }
-}
-
-function Sandbox-Node
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-  
-  $global:node_path = $env:path
-  $nodePath = $uenv.NodePath
-  $gitExe = (get-command git).Source  
-  $gitPath = [System.IO.Path]::GetDirectoryName($gitExe)
-  $env:path = "$nodePath;$gitPath"
-  
-  $global:node_nodepath = Clear-EnvVar "NODEPATH"
-  $global:node_npmcache = Clear-EnvVar "NPM_CONFIG_CACHE"
-  $global:node_npmprefix = Clear-EnvVar "NPM_CONFIG_PREFIX"
-}
-
-function Restore-Node
-{
-  $env:path = $node_path
-  
-  Set-EnvVar "NODEPATH" $node_nodepath
-  Set-EnvVar "NPM_CONFIG_CACHE" $node_npmcache
-  Set-EnvVar "NPM_CONFIG_PREFIX" $node_npmprefix
-}
-
-#
-# Builds the Belle UI project
-#
-function Compile-Belle
-{
-  param (
-    $uenv, # an Umbraco build environment (see Get-UmbracoBuildEnv)
-    $version # an Umbraco version object (see Get-UmbracoVersion)
-  )
-
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $src = "$($uenv.SolutionRoot)\src"
-  
-  Write-Host ">> Compile Belle"
-  Write-Host "Logging to $tmp\belle.log"
-  
-  # get a temp clean node env (will restore)
-  Sandbox-Node $uenv
-  
-  push-location "$($uenv.SolutionRoot)\src\Umbraco.Web.UI.Client"
-  write "node version is:" > $tmp\belle.log
-  &node -v >> $tmp\belle.log 2>&1
-  write "npm version is:" >> $tmp\belle.log 2>&1
-  &npm -v >> $tmp\belle.log 2>&1
-  write "cleaning npm cache" >> $tmp\belle.log 2>&1
-  &npm cache clean >> $tmp\belle.log 2>&1
-  write "installing bower" >> $tmp\belle.log 2>&1
-  &npm install -g bower >> $tmp\belle.log 2>&1
-  write "installing gulp" >> $tmp\belle.log 2>&1
-  &npm install -g gulp >> $tmp\belle.log 2>&1
-  write "installing gulp-cli" >> $tmp\belle.log 2>&1
-  &npm install -g gulp-cli --quiet >> $tmp\belle.log 2>&1
-  write "executing npm install" >> $tmp\belle.log 2>&1
-  &npm install >> $tmp\belle.log 2>&1
-  write "executing gulp build for version $version" >> $tmp\belle.log 2>&1
-  &gulp build --buildversion=$version.Release >> $tmp\belle.log 2>&1
-  pop-location
-  
-  # fixme - should we filter the log to find errors?
-  #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
-
-  # restore
-  Restore-Node
-  
-  # setting node_modules folder to hidden
-  # used to prevent VS13 from crashing on it while loading the websites project
-  # also makes sure aspnet compiler does not try to handle rogue files and chokes
-  # in VSO with Microsoft.VisualC.CppCodeProvider -related errors
-  # use get-item -force 'cos it might be hidden already
-  write "Set hidden attribute on node_modules"
-  $dir = get-item -force "$src\Umbraco.Web.UI.Client\node_modules"
-  $dir.Attributes = $dir.Attributes -bor ([System.IO.FileAttributes]::Hidden)
-}
-
-#
-# Compiles Umbraco
-#
-function Compile-Umbraco
-{
-  param (
-    $uenv, # an Umbraco build environment (see Get-UmbracoBuildEnv)
-    [string] $buildConfiguration = "Release"
-  )
-
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $out = "$($uenv.SolutionRoot)\build.out"
-  
-  if ($uenv.VisualStudio -eq $null)
-  {
-    Write-Error "Build environment does not provide VisualStudio."
-    break
-  }
-  
-  $toolsVersion = "4.0"
-  if ($uenv.VisualStudio.Major -eq 15)
-  {
-    $toolsVersion = "15.0"
-  }
-    
-  Write-Host ">> Compile Umbraco"
-  Write-Host "Logging to $tmp\msbuild.umbraco.log"
-
-  # beware of the weird double \\ at the end of paths
-  # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
-  &$uenv.VisualStudio.MsBuild "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
-    /p:WarningLevel=0 `
-    /p:Configuration=$buildConfiguration `
-    /p:Platform=AnyCPU `
-    /p:UseWPP_CopyWebApplication=True `
-    /p:PipelineDependsOnBuild=False `
-    /p:OutDir=$tmp\bin\\ `
-    /p:WebProjectOutputDir=$tmp\WebApp\\ `
-    /p:Verbosity=minimal `
-    /t:Clean`;Rebuild `
-    /tv:$toolsVersion `
-    /p:UmbracoBuild=True `
-    > $tmp\msbuild.umbraco.log
-    
-  # /p:UmbracoBuild tells the csproj that we are building from PS
-}
-
-#
-# Prepare Tests
-#
-function Prepare-Tests
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-  
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  
-  Write-Host ">> Prepare 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"
-  
-  # data
-  Write-Host "Copy data files"
-  if (-Not (Test-Path -Path "$tmp\tests\Packaging" ) )
-  {
-    Write-Host "Create packaging directory"
-    mkdir "$tmp\tests\Packaging" > $null
-  }
-  Copy-Files "$src\Umbraco.Tests\Packaging\Packages" "*" "$tmp\tests\Packaging\Packages"
-  
-  # required for package install tests  
-  if (-Not (Test-Path -Path "$tmp\tests\bin" ) )
-  {
-    Write-Host "Create bin directory"
-    mkdir "$tmp\tests\bin" > $null
-  }
-}
-
-#
-# Compiles Tests
-#
-function Compile-Tests
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $out = "$tmp\tests"
-
-  $buildConfiguration = "Release"
-  
-  if ($uenv.VisualStudio -eq $null)
-  {
-    Write-Error "Build environment does not provide VisualStudio."
-    break
-  }
-  
-  $toolsVersion = "4.0"
-  if ($uenv.VisualStudio.Major -eq 15)
-  {
-    $toolsVersion = "15.0"
-  }
-    
-  Write-Host ">> Compile Tests"
-  Write-Host "Logging to $tmp\msbuild.tests.log"
-
-  # beware of the weird double \\ at the end of paths
-  # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
-  &$uenv.VisualStudio.MsBuild "$src\Umbraco.Tests\Umbraco.Tests.csproj" `
-    /p:WarningLevel=0 `
-    /p:Configuration=$buildConfiguration `
-    /p:Platform=AnyCPU `
-    /p:UseWPP_CopyWebApplication=True `
-    /p:PipelineDependsOnBuild=False `
-    /p:OutDir=$out\\ `
-    /p:Verbosity=minimal `
-    /t:Build `
-    /tv:$toolsVersion `
-    /p:UmbracoBuild=True `
-    /p:NugetPackages=$src\packages `
-    > $tmp\msbuild.tests.log
-    
-  # /p:UmbracoBuild tells the csproj that we are building from PS
-}
-
-#
-# Cleans things up and prepare files after compilation
-#
-function Prepare-Packages
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-
-  Write-Host ">> Prepare Packages" 
-  
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $out = "$($uenv.SolutionRoot)\build.out"
-
-  $buildConfiguration = "Release"
-
-  # restore web.config
-  Restore-WebConfig "$src\Umbraco.Web.UI"
-
-  # cleanup build
-  Write-Host "Clean build"
-  Remove-File "$tmp\bin\*.dll.config"
-  Remove-File "$tmp\WebApp\bin\*.dll.config"
-
-  # cleanup presentation
-  Write-Host "Cleanup presentation"
-  Remove-Directory "$tmp\WebApp\umbraco.presentation"
-
-  # create directories
-  Write-Host "Create directories"
-  mkdir "$tmp\Configs" > $null
-  mkdir "$tmp\Configs\Lang" > $null
-  mkdir "$tmp\WebApp\App_Data" > $null
-  #mkdir "$tmp\WebApp\Media" > $null
-  #mkdir "$tmp\WebApp\Views" > $null
-
-  # copy various files
-  Write-Host "Copy xml documentation"
-  cp -force "$tmp\bin\*.xml" "$tmp\WebApp\bin"
-
-  Write-Host "Copy transformed configs and langs"
-  # note: exclude imageprocessor/*.config as imageprocessor pkg installs them
-  Copy-Files "$tmp\WebApp\config" "*.config" "$tmp\Configs" `
-    { -not $_.RelativeName.StartsWith("imageprocessor") }
-  Copy-Files "$tmp\WebApp\config" "*.js" "$tmp\Configs"
-  Copy-Files "$tmp\WebApp\config\lang" "*.xml" "$tmp\Configs\Lang"
-  Copy-File "$tmp\WebApp\web.config" "$tmp\Configs\web.config.transform"
-
-  Write-Host "Copy transformed web.config"
-  Copy-File "$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed" "$tmp\WebApp\web.config"
-
-  # offset the modified timestamps on all umbraco dlls, as WebResources
-  # break if date is in the future, which, due to timezone offsets can happen.
-  Write-Host "Offset dlls timestamps"
-  ls -r "$tmp\*.dll" | foreach {
-    $_.CreationTime = $_.CreationTime.AddHours(-11)
-    $_.LastWriteTime = $_.LastWriteTime.AddHours(-11)
-  }
-
-  # copy libs
-  Write-Host "Copy SqlCE libraries"
-  Copy-Files "$src\packages\SqlServerCE.4.0.0.1" "*.*" "$tmp\bin" `
-    { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") }
-  Copy-Files "$src\packages\SqlServerCE.4.0.0.1" "*.*" "$tmp\WebApp\bin" `
-    { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") }
-          
-  # copy Belle
-  Write-Host "Copy Belle"
-  Copy-Files "$src\Umbraco.Web.UI\umbraco\assets" "*" "$tmp\WebApp\umbraco\assets"
-  Copy-Files "$src\Umbraco.Web.UI\umbraco\js" "*" "$tmp\WebApp\umbraco\js"
-  Copy-Files "$src\Umbraco.Web.UI\umbraco\lib" "*" "$tmp\WebApp\umbraco\lib"
-  Copy-Files "$src\Umbraco.Web.UI\umbraco\views" "*" "$tmp\WebApp\umbraco\views"
-
-}
-
-#
-# Creates the Zip packages
-#
-function Package-Zip
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-
-  Write-Host ">> Create Zip packages" 
-  
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $out = "$($uenv.SolutionRoot)\build.out"
-
-  Write-Host "Zip all binaries"  
-  &$uenv.Zip a -r "$out\UmbracoCms.AllBinaries.$($version.Semver).zip" `
-    "$tmp\bin\*" `
-    "-x!dotless.Core.*" `
-    > $null
-   
-  Write-Host "Zip cms"  
-  &$uenv.Zip a -r "$out\UmbracoCms.$($version.Semver).zip" `
-    "$tmp\WebApp\*" `
-    "-x!dotless.Core.*" "-x!Content_Types.xml" "-x!*.pdb"`
-    > $null
-}
-
-#
-# Prepares NuGet
-#
-function Prepare-NuGet
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-
-  Write-Host ">> Prepare NuGet" 
-  
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $out = "$($uenv.SolutionRoot)\build.out"
-
-  # add Web.config transform files to the NuGet package
-  Write-Host "Add web.config transforms to NuGet package"
-  mv "$tmp\WebApp\Views\Web.config" "$tmp\WebApp\Views\Web.config.transform"
-  
-  # fixme - that one does not exist in .bat build either?
-  #mv "$tmp\WebApp\Xslt\Web.config" "$tmp\WebApp\Xslt\Web.config.transform"
-}
-
-#
-# Restores NuGet
-#
-function Restore-NuGet
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-
-  Write-Host ">> Restore NuGet"
-  Write-Host "Logging to $tmp\nuget.restore.log" 
-  
-  &$uenv.NuGet restore "$src\Umbraco.sln" -configfile "$src\NuGet.config" > "$tmp\nuget.restore.log"
-}
-
-#
-# Copies the Azure Gallery script to output
-#
-function Prepare-AzureGallery
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-  
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $out = "$($uenv.SolutionRoot)\build.out"
-  $psScript = "$($uenv.SolutionRoot)\build\azuregalleryrelease.ps1"
-  
-  Write-Host ">> Copy azuregalleryrelease.ps1 to output folder"
-  Copy-Item $psScript $out
-}
-
-#
-# Creates the NuGet packages
-#
-function Package-NuGet
-{
-  param (
-    $uenv, # an Umbraco build environment (see Get-UmbracoBuildEnv)
-    $version # an Umbraco version object (see Get-UmbracoVersion)
-  )
-  
-  $src = "$($uenv.SolutionRoot)\src"
-  $tmp = "$($uenv.SolutionRoot)\build.tmp"
-  $out = "$($uenv.SolutionRoot)\build.out"
-  $nuspecs = "$($uenv.SolutionRoot)\build\NuSpecs"
-  
-  Write-Host ">> Create NuGet packages"
-
-  # see https://docs.microsoft.com/en-us/nuget/schema/nuspec
-  # note - warnings about SqlCE native libs being outside of 'lib' folder,
-  # nothing much we can do about it as it's intentional yet there does not
-  # seem to be a way to disable the warning
-  
-  &$uenv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
-    -Properties BuildTmp="$tmp" `
-    -Version $version.Semver.ToString() `
-    -Symbols -Verbosity quiet -outputDirectory $out
-
-  &$uenv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
-    -Properties BuildTmp="$tmp" `
-    -Version $version.Semver.ToString() `
-    -Verbosity quiet -outputDirectory $out
-}
-
-#
-# Builds Umbraco
-#
-function Build-Umbraco
-{
-  [CmdletBinding()]
-  param (
-    [string]
-    $target = "all",
-    [string]
-    $buildConfiguration = "Release"
-  )
-  
-  $target = $target.ToLowerInvariant()
-  Write-Host ">> Build-Umbraco <$target> <$buildConfiguration>"
-
-  Write-Host "Get Build Environment"
-  $uenv = Get-UmbracoBuildEnv
-  
-  Write-Host "Get Version"
-  $version = Get-UmbracoVersion
-  Write-Host "Version $($version.Semver)"
-
-  if ($target -eq "pre-build")
-  {
-    Prepare-Build $uenv
-    #Compile-Belle $uenv $version
-
-    # set environment variables
-    $env:UMBRACO_VERSION=$version.Semver.ToString()
-    $env:UMBRACO_RELEASE=$version.Release
-    $env:UMBRACO_COMMENT=$version.Comment
-    $env:UMBRACO_BUILD=$version.Build
-
-    # set environment variable for VSO
-    # https://github.com/Microsoft/vsts-tasks/issues/375
-    # https://github.com/Microsoft/vsts-tasks/blob/master/docs/authoring/commands.md
-    Write-Host ("##vso[task.setvariable variable=UMBRACO_VERSION;]$($version.Semver.ToString())")
-    Write-Host ("##vso[task.setvariable variable=UMBRACO_RELEASE;]$($version.Release)")
-    Write-Host ("##vso[task.setvariable variable=UMBRACO_COMMENT;]$($version.Comment)")
-    Write-Host ("##vso[task.setvariable variable=UMBRACO_BUILD;]$($version.Build)")
-    
-    Write-Host ("##vso[task.setvariable variable=UMBRACO_TMP;]$($uenv.SolutionRoot)\build.tmp")
-  }
-  elseif ($target -eq "pre-tests")
-  {
-    Prepare-Tests $uenv
-  }
-  elseif ($target -eq "compile-tests")
-  {
-    Compile-Tests $uenv
-  }
-  elseif ($target -eq "compile-umbraco")
-  {
-    Compile-Umbraco $uenv $buildConfiguration
-  }
-  elseif ($target -eq "pre-packages")
-  {
-    Prepare-Packages $uenv
-  }
-  elseif ($target -eq "pre-nuget")
-  {
-    Prepare-NuGet $uenv
-  }
-  elseif ($target -eq "restore-nuget")
-  {
-    Restore-NuGet $uenv
-  }
-  elseif ($target -eq "pkg-zip")
-  {
-    Package-Zip $uenv
-  }
-  elseif ($target -eq "compile-belle")
-  {
-    Compile-Belle $uenv $version
-  }
-  elseif ($target -eq "prepare-azuregallery")
-  {
-    Prepare-AzureGallery $uenv
-  }
-  elseif ($target -eq "all")
-  {
-    Prepare-Build $uenv
-    Restore-NuGet $uenv
-    Compile-Belle $uenv $version
-    Compile-Umbraco $uenv $buildConfiguration
-    Prepare-Tests $uenv
-    Compile-Tests $uenv
-    # not running tests...
-    Prepare-Packages $uenv
-    Package-Zip $uenv
-    Verify-NuGet $uenv
-    Prepare-NuGet $uenv
-    Package-NuGet $uenv $version
-	Prepare-AzureGallery $uenv
-  }
-  else
-  {
-    Write-Error "Unsupported target `"$target`"."
-  }
-}
-
-#
-# export functions
-#
-Export-ModuleMember -function Get-UmbracoBuildEnv
-Export-ModuleMember -function Set-UmbracoVersion
-Export-ModuleMember -function Set-UmbracoContinuousVersion
-Export-ModuleMember -function Get-UmbracoVersion
-Export-ModuleMember -function Build-Umbraco
-Export-ModuleMember -function Build-UmbracoDocs
-Export-ModuleMember -function Verify-NuGet
-
-#eof

build/Modules/Umbraco.Build/Utilities.ps1

@@ -1,95 +0,0 @@
-# returns the full path if $file is relative to $pwd
-function Get-FullPath($file)
-{
-  $path = [System.IO.Path]::Combine($pwd, $file)
-  $path = [System.IO.Path]::GetFullPath($path)
-  return $path
-}
-
-# removes a directory, doesn't complain if it does not exist
-function Remove-Directory($dir)
-{
-  remove-item $dir -force -recurse -errorAction SilentlyContinue > $null
-}
-
-# removes a file, doesn't complain if it does not exist
-function Remove-File($file)
-{
-  remove-item $file -force -errorAction SilentlyContinue > $null
-}
-
-# copies a file, creates target dir if needed
-function Copy-File($source, $target)
-{
-  $ignore = new-item -itemType file -path $target -force
-  cp -force $source $target
-}
-
-# copies files to a directory
-function Copy-Files($source, $select, $target, $filter)
-{
-  $files = ls -r "$source\$select"
-  $files | foreach {
-    $relative = $_.FullName.SubString($source.Length+1)
-    $_ | add-member -memberType NoteProperty -name RelativeName -value $relative
-  }
-  if ($filter -ne $null) {
-    $files = $files | where $filter 
-  }
-  $files |
-    foreach {
-      if ($_.PsIsContainer) {
-        $ignore = new-item -itemType directory -path "$target\$($_.RelativeName)" -force
-      }
-      else {
-        Copy-File $_.FullName "$target\$($_.RelativeName)"
-      }
-    }
-}
-
-# regex-replaces content in a file
-function Replace-FileText($filename, $source, $replacement)
-{
-  $filepath = Get-FullPath $filename
-  $text = [System.IO.File]::ReadAllText($filepath)
-  $text = [System.Text.RegularExpressions.Regex]::Replace($text, $source, $replacement)
-  $utf8bom = New-Object System.Text.UTF8Encoding $true
-  [System.IO.File]::WriteAllText($filepath, $text, $utf8bom)
-}
-
-# store web.config
-function Store-WebConfig($webUi)
-{
-  if (test-path "$webUi\web.config")
-  {
-    if (test-path "$webUi\web.config.temp-build")
-    {
-      Write-Host "Found existing web.config.temp-build"
-      $i = 0
-      while (test-path "$webUi\web.config.temp-build.$i")
-      {
-        $i = $i + 1
-      }
-      Write-Host "Save existing web.config as web.config.temp-build.$i"
-      Write-Host "(WARN: the original web.config.temp-build will be restored during post-build)"
-      mv "$webUi\web.config" "$webUi\web.config.temp-build.$i"
-    }
-    else
-    {
-      Write-Host "Save existing web.config as web.config.temp-build"
-      Write-Host "(will be restored during post-build)"
-      mv "$webUi\web.config" "$webUi\web.config.temp-build"
-    }
-  }
-}
-
-# restore web.config
-function Restore-WebConfig($webUi)
-{
-  if (test-path "$webUi\web.config.temp-build")
-  {
-    Write-Host "Restoring existing web.config"
-    Remove-File "$webUi\web.config"
-    mv "$webUi\web.config.temp-build" "$webUi\web.config"
-  }
-}

build/Modules/Umbraco.Build/Verify-NuGet.ps1

@@ -1,444 +0,0 @@
-#
-# Verify-NuGet
-#
-
-function Format-Dependency
-{
-  param ( $d )
-  
-  $m = $d.Id + " "
-  if ($d.MinInclude) { $m = $m + "[" }
-  else { $m = $m + "(" }
-  $m = $m + $d.MinVersion
-  if ($d.MaxVersion -ne $d.MinVersion) { $m = $m + "," + $d.MaxVersion }
-  if ($d.MaxInclude) { $m = $m + "]" }
-  else { $m = $m + ")" }
-
-  return $m
-}
-
-function Write-NuSpec
-{
-  param ( $name, $deps )
-
-  Write-Host ""
-  Write-Host "$name NuSpec dependencies:"
-  
-  foreach ($d in $deps)
-  {
-    $m = Format-Dependency $d
-    Write-Host " $m"
-  }
-}
-
-function Write-Package
-{
-  param ( $name, $pkgs )
-  
-  Write-Host ""
-  Write-Host "$name packages:"
-  
-  foreach ($p in $pkgs)
-  {
-    Write-Host " $($p.Id) $($p.Version)"
-  }
-}
-
-function Verify-NuGet
-{
-  param (
-    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
-  )
-  
-  if ($uenv -eq $null)
-  {
-    $uenv = Get-UmbracoBuildEnv
-  }
-
-  $source = @"
-  
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.IO;
-    using System.Xml;
-    using System.Xml.Serialization;
-    using Semver;
-  
-    namespace Umbraco.Build
-    {
-      public class NuGet
-      {       
-        public static Dependency[] GetNuSpecDependencies(string filename)
-        {
-          NuSpec nuspec;
-          var serializer = new XmlSerializer(typeof(NuSpec));
-          using (var reader = new StreamReader(filename))
-          {
-            nuspec = (NuSpec) serializer.Deserialize(reader);
-          }
-          var nudeps = nuspec.Metadata.Dependencies;
-          var deps = new List<Dependency>();
-          foreach (var nudep in nudeps)
-          {
-            var dep = new Dependency();
-            dep.Id = nudep.Id;
-            
-            var parts = nudep.Version.Split(',');
-            if (parts.Length == 1)
-            {
-              dep.MinInclude = parts[0].StartsWith("[");
-              dep.MaxInclude = parts[0].EndsWith("]");
-              
-              SemVersion version;
-              if (!SemVersion.TryParse(parts[0].Substring(1, parts[0].Length-2).Trim(), out version)) continue;
-              dep.MinVersion = dep.MaxVersion = version; //parts[0].Substring(1, parts[0].Length-2).Trim();
-            }
-            else
-            {
-              SemVersion version;
-              if (!SemVersion.TryParse(parts[0].Substring(1).Trim(), out version)) continue;
-              dep.MinVersion = version; //parts[0].Substring(1).Trim();
-              if (!SemVersion.TryParse(parts[1].Substring(0, parts[1].Length-1).Trim(), out version)) continue;
-              dep.MaxVersion = version; //parts[1].Substring(0, parts[1].Length-1).Trim();
-              dep.MinInclude = parts[0].StartsWith("[");
-              dep.MaxInclude = parts[1].EndsWith("]");
-            }
-            
-            deps.Add(dep);
-          }
-          return deps.ToArray();
-        }
-
-        public static IEnumerable<TSource> DistinctBy<TSource, TKey>(/*this*/ IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
-        {
-          HashSet<TKey> knownKeys = new HashSet<TKey>();
-          foreach (TSource element in source)
-          {
-            if (knownKeys.Add(keySelector(element)))
-            {
-              yield return element;
-            }
-          }
-        }
-        
-        public static Package[] GetProjectsPackages(string src, string[] projects)
-        {
-          var l = new List<Package>();
-          foreach (var project in projects)
-          {
-            var path = Path.Combine(src, project);
-            var packageConfig = Path.Combine(path, "packages.config");
-            if (File.Exists(packageConfig))
-              ReadPackagesConfig(packageConfig, l);
-            var csprojs = Directory.GetFiles(path, "*.csproj");
-            foreach (var csproj in csprojs)
-            {
-              ReadCsProj(csproj, l);
-            }
-          }
-          IEnumerable<Package> p = l.OrderBy(x => x.Id);
-          p = DistinctBy(p, x => x.Id + ":::" + x.Version);
-          return p.ToArray();
-        }
-        
-        public static object[] GetPackageErrors(Package[] pkgs)
-        {
-          return pkgs
-            .GroupBy(x => x.Id)
-            .Where(x => x.Count() > 1)
-            .ToArray();
-        }
-        
-        public static object[] GetNuSpecErrors(Package[] pkgs, Dependency[] deps)
-        {
-          var d = pkgs.ToDictionary(x => x.Id, x => x.Version);
-          return deps
-            .Select(x => 
-            {
-              SemVersion v;
-              if (!d.TryGetValue(x.Id, out v)) return null;
-              
-              var ok = true;
-              
-              /*
-              if (x.MinInclude)
-              {
-                if (v < x.MinVersion) ok = false;
-              }
-              else
-              {
-                if (v <= x.MinVersion) ok = false;
-              }
-
-              if (x.MaxInclude)
-              {
-                if (v > x.MaxVersion) ok = false;
-              }
-              else
-              {
-                if (v >= x.MaxVersion) ok = false;
-              }
-              */
-              
-              if (!x.MinInclude || v != x.MinVersion) ok = false;
-              
-              return ok ? null : new { Dependency = x, Version = v };
-            })
-            .Where(x => x != null)
-            .ToArray();
-        }
-        
-        /*
-        public static Package[] GetProjectPackages(string path)
-        {
-          var l = new List<Package>();
-          var packageConfig = Path.Combine(path, "packages.config");
-          if (File.Exists(packageConfig))
-            ReadPackagesConfig(packageConfig, l);
-          var csprojs = Directory.GetFiles(path, "*.csproj");
-          foreach (var csproj in csprojs)
-          {
-            ReadCsProj(csproj, l);
-          }
-          return l.ToArray();
-        }
-        */
-        
-        public static string GetDirectoryName(string filename)
-        {
-          return Path.GetFileName(Path.GetDirectoryName(filename));
-        }
-        
-        public static void ReadPackagesConfig(string filename, List<Package> packages)
-        {
-          //Console.WriteLine("read " + filename);
-
-          PackagesConfigPackages pkgs;
-          var serializer = new XmlSerializer(typeof(PackagesConfigPackages));
-          using (var reader = new StreamReader(filename))
-          {
-            pkgs = (PackagesConfigPackages) serializer.Deserialize(reader);
-          }
-          foreach (var p in pkgs.Packages)
-          {
-            SemVersion version;
-            if (!SemVersion.TryParse(p.Version, out version)) continue;
-            packages.Add(new Package { Id = p.Id, Version = version, Project = GetDirectoryName(filename) });
-          }
-        }
-        
-        public static void ReadCsProj(string filename, List<Package> packages)
-        {
-          //Console.WriteLine("read " + filename);
-          
-          // if xmlns then it's not a VS2017 with PackageReference
-          var text = File.ReadAllLines(filename);
-          var line = text.FirstOrDefault(x => x.Contains("<Project"));
-          if (line == null) return;
-          if (line.Contains("xmlns")) return;         
-
-          CsProjProject proj;
-          var serializer = new XmlSerializer(typeof(CsProjProject));
-          using (var reader = new StreamReader(filename))
-          {
-            proj = (CsProjProject) serializer.Deserialize(reader);
-          }
-          foreach (var p in proj.ItemGroups.Where(x => x.Packages != null).SelectMany(x => x.Packages))
-          {
-            var sversion = p.VersionE ?? p.VersionA;
-            SemVersion version;
-            if (!SemVersion.TryParse(sversion, out version)) continue;
-            packages.Add(new Package { Id = p.Id, Version = version, Project = GetDirectoryName(filename) });
-          }
-        }
-        
-        public class Dependency
-        {
-          public string Id { get; set; }
-          public SemVersion MinVersion { get; set; }
-          public SemVersion MaxVersion { get; set; }
-          public bool MinInclude { get; set; }
-          public bool MaxInclude { get; set; }
-        }
-        
-        public class Package
-        {
-          public string Id { get; set; }
-          public SemVersion Version { get; set; }
-          public string Project { get; set; }
-        }
-
-        [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd")]
-        [XmlRoot(Namespace = "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd", IsNullable = false, ElementName = "package")]
-        public class NuSpec
-        {
-          [XmlElement("metadata")]
-          public NuSpecMetadata Metadata { get; set; }
-        }
-
-        [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd", TypeName = "metadata")]
-        public class NuSpecMetadata
-        {
-          [XmlArray("dependencies")]
-          [XmlArrayItem("dependency", IsNullable = false)]
-          public NuSpecDependency[] Dependencies { get; set; }
-        }
-
-        [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd", TypeName = "dependencies")]
-        public class NuSpecDependency
-        {
-          [XmlAttribute(AttributeName = "id")]
-          public string Id { get; set; }
-
-          [XmlAttribute(AttributeName = "version")]
-          public string Version { get; set; }
-        }
-        
-        [XmlType(AnonymousType = true)]
-        [XmlRoot(Namespace = "", IsNullable = false, ElementName = "packages")]
-        public class PackagesConfigPackages
-        {
-            [XmlElement("package")]
-            public PackagesConfigPackage[] Packages { get; set; }
-        }
-
-        [XmlType(AnonymousType = true, TypeName = "package")]
-        public class PackagesConfigPackage
-        {
-            [XmlAttribute(AttributeName = "id")]
-            public string Id { get; set; }
-
-            [XmlAttribute(AttributeName = "version")]
-            public string Version { get; set; }
-        }
-        
-        [XmlType(AnonymousType = true)]
-        [XmlRoot(Namespace = "", IsNullable = false, ElementName = "Project")]
-        public class CsProjProject
-        {
-            [XmlElement("ItemGroup")]
-            public CsProjItemGroup[] ItemGroups { get; set; }
-        }
-        
-        [XmlType(AnonymousType = true, TypeName = "ItemGroup")]
-        public class CsProjItemGroup
-        {
-            [XmlElement("PackageReference")]
-            public CsProjPackageReference[] Packages { get; set; }
-        }
-        
-        [XmlType(AnonymousType = true, TypeName = "PackageReference")]
-        public class CsProjPackageReference
-        {
-            [XmlAttribute(AttributeName = "Include")]
-            public string Id { get; set; }
-
-            [XmlAttribute(AttributeName = "Version")]
-            public string VersionA { get; set; }
-            
-            [XmlElement("Version")]
-            public string VersionE { get; set;}
-        }
-      }
-    }
-    
-"@
-
-  Write-Host ">> Verify NuGet consistency"
-
-  $assem = (
-    "System.Xml",
-    "System.Core", # "System.Collections.Generic"
-    "System.Linq",
-    "System.Xml.Serialization",
-    "System.IO",
-    "System.Globalization",
-    $uenv.Semver
-  )
-  
-  try
-  {
-    # as long as the code hasn't changed it's fine to re-add, but if the code
-    # has changed this will throw - better warn the dev that we have an issue
-    add-type -referencedAssemblies $assem -typeDefinition $source -language CSharp
-  }
-  catch
-  {
-    if ($_.FullyQualifiedErrorId.StartsWith("TYPE_ALREADY_EXISTS,"))
-      { Write-Error "Failed to add type, did you change the code?" }
-    else
-      { Write-Error $_ }
-  }
-  if (-not $?) { break }
-  
-  $nuspecs = (
-    "UmbracoCms",
-    "UmbracoCms.Core"
-  )
-  
-  $projects = (
-    "Umbraco.Core",
-    "Umbraco.Web",
-    "Umbraco.Web.UI",
-    "UmbracoExamine"#,
-    #"Umbraco.Tests",
-    #"Umbraco.Tests.Benchmarks"
-  )
-   
-  $src = "$($uenv.SolutionRoot)\src"
-  $pkgs = [Umbraco.Build.NuGet]::GetProjectsPackages($src, $projects)
-  if (-not $?) { break }
-  #Write-Package "All" $pkgs
-  
-  $errs = [Umbraco.Build.NuGet]::GetPackageErrors($pkgs)
-  if (-not $?) { break }
-  
-  if ($errs.Length -gt 0)
-  {
-    Write-Host ""
-  }
-  foreach ($err in $errs)
-  {
-    Write-Host $err.Key
-    foreach ($e in $err)
-    {
-      Write-Host " $($e.Version) required by $($e.Project)"
-    }
-  }
-  if ($errs.Length -gt 0)
-  {
-    Write-Error "Found non-consolidated package dependencies"
-    break
-  }
-  
-  $nuerr = $false
-  $nupath = "$($uenv.SolutionRoot)\build\NuSpecs"
-  foreach ($nuspec in $nuspecs)
-  {  
-    $deps = [Umbraco.Build.NuGet]::GetNuSpecDependencies("$nupath\$nuspec.nuspec")
-    if (-not $?) { break }
-    #Write-NuSpec $nuspec $deps
-    
-    $errs = [Umbraco.Build.NuGet]::GetNuSpecErrors($pkgs, $deps)
-    if (-not $?) { break }
-    
-    if ($errs.Length -gt 0)
-    {
-      Write-Host ""
-      Write-Host "$nuspec requires:"
-      $nuerr = $true
-    }
-    foreach ($err in $errs)
-    {
-      $m = Format-Dependency $err.Dependency
-      Write-Host " $m but projects require $($err.Version)"
-    }
-  }
-  
-  if ($nuerr)
-  {
-    Write-Error "Found inconsistent NuGet dependencies"
-    break
-  }
-}

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -1,107 +1,72 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="3.4.4">
-    <id>UmbracoCms.Core</id>
-    <version>7.0.0</version>
-    <title>Umbraco Cms Core Binaries</title>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <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>      
-      <dependency id="log4net" version="[2.0.8,3.0.0)" />
-      <dependency id="Log4Net.Async" version="[2.0.4,3.0.0)" />
-      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.3,6.0.0)" />
-      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
-      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.1.0, 4.0.0)" />
-      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.1.0, 4.0.0)" />
-      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.1.0, 4.0.0)" />
-      <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
-      <dependency id="HtmlAgilityPack" version="[1.4.9.5, 2.0.0)" />
-      <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
-      <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.6, 2.0.0)" />
-      <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
-      <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Examine" version="[0.1.89, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
-      <dependency id="semver" version="[1.1.2, 3.0.0)" />
-	    <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
-      <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
-      <dependency id="System.ValueTuple" version="[4.4.0, 5.0.0)" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="$BuildTmp$\WebApp\bin\businesslogic.dll" target="lib\net45\businesslogic.dll" />
-    <file src="$BuildTmp$\WebApp\bin\businesslogic.xml" target="lib\net45\businesslogic.xml" />
-    <file src="$BuildTmp$\WebApp\bin\cms.dll" target="lib\net45\cms.dll" />
-    <file src="$BuildTmp$\WebApp\bin\cms.xml" target="lib\net45\cms.xml" />
-    <file src="$BuildTmp$\WebApp\bin\controls.dll" target="lib\net45\controls.dll" />
-    <file src="$BuildTmp$\WebApp\bin\controls.xml" target="lib\net45\controls.xml" />
-    <file src="$BuildTmp$\WebApp\bin\interfaces.dll" target="lib\net45\interfaces.dll" />
-    <file src="$BuildTmp$\WebApp\bin\interfaces.xml" target="lib\net45\interfaces.xml" />
-    <file src="$BuildTmp$\WebApp\bin\log4net.dll" target="lib\net45\log4net.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net45\Microsoft.ApplicationBlocks.Data.dll" />
-    <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.dll" target="lib\net45\SQLCE4Umbraco.dll" />
-    <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.xml" target="lib\net45\SQLCE4Umbraco.xml" />
-    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\net45\System.Data.SqlServerCe.dll" />
-    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\net45\System.Data.SqlServerCe.Entity.dll" />
-    <file src="$BuildTmp$\WebApp\bin\TidyNet.dll" target="lib\net45\TidyNet.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net45\Umbraco.Core.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net45\Umbraco.Core.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.dll" target="lib\net45\umbraco.DataLayer.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.xml" target="lib\net45\umbraco.DataLayer.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.dll" target="lib\net45\umbraco.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.xml" target="lib\net45\umbraco.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.dll" target="lib\net45\umbraco.editorControls.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.xml" target="lib\net45\umbraco.editorControls.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.dll" target="lib\net45\umbraco.MacroEngines.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.xml" target="lib\net45\umbraco.MacroEngines.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.providers.dll" target="lib\net45\umbraco.providers.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.providers.xml" target="lib\net45\umbraco.providers.xml" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net45\Umbraco.Web.UI.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net45\Umbraco.Web.UI.xml" />
-    <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.dll" target="lib\net45\UmbracoExamine.dll" />
-    <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.xml" target="lib\net45\UmbracoExamine.xml" />
-    <file src="tools\install.core.ps1" target="tools\install.ps1" />
-
-    <!-- Added to be able to produce a symbols package -->
-    <file src="$BuildTmp$\bin\SQLCE4Umbraco.pdb" target="lib" />
-    <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
-    <file src="$BuildTmp$\bin\businesslogic.pdb" target="lib" />
-    <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
-    <file src="$BuildTmp$\bin\cms.pdb" target="lib" />
-    <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
-    <file src="$BuildTmp$\bin\controls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
-    <file src="$BuildTmp$\bin\interfaces.pdb" target="lib" />
-    <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
-    <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
-    <file src="$BuildTmp$\bin\umbraco.DataLayer.pdb" target="lib" />
-    <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
-    <file src="$BuildTmp$\bin\umbraco.editorControls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
-    <file src="$BuildTmp$\bin\umbraco.MacroEngines.pdb" target="lib" />
-    <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
-    <file src="$BuildTmp$\bin\umbraco.providers.pdb" target="lib" />
-    <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
-    <file src="$BuildTmp$\bin\umbraco.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
-    <file src="$BuildTmp$\bin\Umbraco.Web.UI.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
-    <file src="$BuildTmp$\bin\UmbracoExamine.pdb" target="lib" />
-    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
-  </files>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="3.4.4">
+    <id>UmbracoCms.Core</id>
+    <version>8.0.0</version>
+    <title>Umbraco Cms Core Binaries</title>
+    <authors>Umbraco HQ</authors>
+    <owners>Umbraco HQ</owners>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>http://umbraco.com/</projectUrl>
+    <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>
+      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.4,6.0.0)" />
+      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.4,6.0.0)" />
+      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
+      <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0, 5.0.0)" />
+      <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0, 5.0.0)" />
+      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0, 5.0.0)" />
+      <dependency id="MiniProfiler" version="[3.2.0.157, 3.9.999)" />
+      <dependency id="HtmlAgilityPack" version="[1.7.2, 2.0.0)" />
+      <dependency id="Lucene.Net" version="[3.0.3, 4.0.0.0)" />
+      <dependency id="MySql.Data" version="[6.10.6, 7.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.6, 2.0.0)" />
+      <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
+      <dependency id="AutoMapper" version="[6.2.2, 7.0.0)" />
+      <dependency id="LightInject" version="[5.1.2, 6.0.0)" />
+      <dependency id="LightInject.Mvc" version="[2.0.0, 3.0.0)" />
+      <dependency id="LightInject.Web" version="[2.0.0, 3.0.0)" />
+      <dependency id="LightInject.WebApi" version="[2.0.0, 3.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[11.0.2, 12.0.0)" />
+      <dependency id="Examine" version="[1.0.0-beta025, 1.666.666)" />
+      <dependency id="ImageProcessor" version="[2.6.0, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
+      <dependency id="semver" version="[2.0.4, 3.0.0)" />
+      <dependency id="Markdown" version="[2.2.1, 3.0.0)" />
+      <dependency id="log4net" version="[2.0.8, 3.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0, 5.0.0)" />
+      <dependency id="System.ValueTuple" version="[4.4.0, 5.0.0)" />
+      <dependency id="NPoco" version="3.9.0" />
+      <dependency id="NuGet.Core" version="2.14.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
+    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\Umbraco.Web.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\Umbraco.Web.xml" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\Umbraco.Examine.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\Umbraco.Examine.xml" />
+
+    <file src="tools\install.core.ps1" target="tools\install.ps1" />
+
+    <!-- produce symbols package -->
+    <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
+    <file src="$BuildTmp$\..\src\Umbraco.Core\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
+    <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib" />
+    <file src="$BuildTmp$\..\src\Umbraco.Web\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
+    <file src="$BuildTmp$\bin\Umbraco.Web.UI.pdb" target="lib" />
+    <file src="$BuildTmp$\..\src\Umbraco.Web.UI\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
+    <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib" />
+    <file src="$BuildTmp$\..\src\Umbraco.Examine\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Examine" />
+  </files>
+</package>

build/NuSpecs/UmbracoCms.nuspec

@@ -1,53 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="3.4.4">
-    <id>UmbracoCms</id>
-    <version>7.0.0</version>
-    <title>Umbraco Cms</title>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
-    <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
-    <language>en-US</language>
-    <tags>umbraco</tags>
-    <dependencies>
-      <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.10, 4.0.0)" />
-      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
-    </dependencies>
-  </metadata>
-  <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\Web.config" target="UmbracoFiles\Web.config" />
-    <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-    <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
-    <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
-    <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
-    <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
-    <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-    <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
-    <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
-    <file src="tools\install.ps1" target="tools\install.ps1" />
-    <file src="tools\Readme.txt" target="tools\Readme.txt" />
-    <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
-    <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" />
-    <file src="tools\processing.config.install.xdt" target="Content\Config\imageprocessor\processing.config.install.xdt" />
-    <file src="tools\cache.config.install.xdt" target="Content\Config\imageprocessor\cache.config.install.xdt" />
-    <file src="build\**" target="build" />
-  </files>
-</package>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="3.4.4">
+    <id>UmbracoCms</id>
+    <version>8.0.0</version>
+    <title>Umbraco Cms</title>
+    <authors>Umbraco HQ</authors>
+    <owners>Umbraco HQ</owners>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>http://umbraco.com/</projectUrl>
+    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
+    <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
+    <language>en-US</language>
+    <tags>umbraco</tags>
+    <dependencies>
+      <dependency id="UmbracoCms.Core" version="[$version$]" />
+      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.17, 9.0.0)" />
+      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 3.0.0)" />
+    </dependencies>
+  </metadata>
+  <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\Web.config" target="UmbracoFiles\Web.config" />
+    <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
+    <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
+    <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
+    <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+    <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
+    <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
+    <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
+    <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
+
+    <file src="tools\install.ps1" target="tools\install.ps1" />
+    <file src="tools\Readme.txt" target="tools\Readme.txt" />
+    <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
+    <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" />
+
+    <file src="build\**" target="build" />
+  </files>
+</package>

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

@@ -61,7 +61,7 @@
     <httpRuntime xdt:Transform="InsertIfMissing" />
     <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
     <httpRuntime targetFramework="4.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
-
+    
     <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
     <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
     <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
@@ -343,7 +343,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.1.0" newVersion="1.5.1.0" />
       </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />

build/NuSpecs/tools/install.core.ps1

@@ -33,26 +33,16 @@ if ($project) {
 		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
 		
 		# Delete files Umbraco ships with
-		if(Test-Path $umbracoBinFolder\businesslogic.dll) { Remove-Item $umbracoBinFolder\businesslogic.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\cms.dll) { Remove-Item $umbracoBinFolder\cms.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\controls.dll) { Remove-Item $umbracoBinFolder\controls.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\interfaces.dll) { Remove-Item $umbracoBinFolder\interfaces.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\log4net.dll) { Remove-Item $umbracoBinFolder\log4net.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll) { Remove-Item $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\SQLCE4Umbraco.dll) { Remove-Item $umbracoBinFolder\SQLCE4Umbraco.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\TidyNet.dll) { Remove-Item $umbracoBinFolder\TidyNet.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\umbraco.dll) { Remove-Item $umbracoBinFolder\umbraco.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.DataLayer.dll) { Remove-Item $umbracoBinFolder\umbraco.DataLayer.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\umbraco.editorControls.dll) { Remove-Item $umbracoBinFolder\umbraco.editorControls.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\umbraco.MacroEngines.dll) { Remove-Item $umbracoBinFolder\umbraco.MacroEngines.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.providers.dll) { Remove-Item $umbracoBinFolder\umbraco.providers.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\UmbracoExamine.dll) { Remove-Item $umbracoBinFolder\UmbracoExamine.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Examine.dll) { Remove-Item $umbracoBinFolder\Umbraco.Examine.dll -Force -Confirm:$false }
 		
 		# Delete files Umbraco depends upon
 		$amd64Folder = Join-Path $umbracoBinFolder "amd64"
@@ -102,4 +92,4 @@ if ($project) {
 		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/RevertToEmptyInstall.bat

@@ -22,7 +22,7 @@ echo Removing bin files
 del ..\src\Umbraco.Web.UI\bin\*.*
 
 echo Building solution
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
+"%ProgramFiles(x86)%"\MSBuild\14.0\Bin\MSBuild.exe ..\src\umbraco.sln /t:Clean,Build
 
 echo Resetting installedPackages.config
 echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
@@ -86,7 +86,7 @@ echo Removing bin files
  FOR %%A IN (..\src\Umbraco.Web.UI\bin\*.*) DO DEL %%A
 
 echo Building solution
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe ..\src\umbraco.sln /t:Clean,Build
+"%ProgramFiles(x86)%"\MSBuild\14.0\Bin\MSBuild.exe ..\src\umbraco.sln /t:Clean,Build
 
 echo Resetting installedPackages.config
 echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config

build/build-bootstrap.ps1

@@ -0,0 +1,76 @@
+
+  # this script should be dot-sourced into the build.ps1 scripts
+  # right after the parameters declaration
+  # ie
+  # . "$PSScriptRoot\build-bootstrap.ps1"
+
+  # THIS FILE IS DISTRIBUTED AS PART OF UMBRACO.BUILD
+  # DO NOT MODIFY IT - ALWAYS USED THE COMMON VERSION  
+
+  # ################################################################
+  # BOOTSTRAP
+  # ################################################################
+
+  # reset errors
+  $error.Clear()
+
+  # ensure we have temp folder for downloads
+  $scriptRoot = "$PSScriptRoot"
+  $scriptTemp = "$scriptRoot\temp"
+  if (-not (test-path $scriptTemp)) { mkdir $scriptTemp > $null }
+
+  # get NuGet
+  $cache = 4
+  $nuget = "$scriptTemp\nuget.exe"
+  if (-not $local)
+  {
+    $source = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+    if ((test-path $nuget) -and ((ls $nuget).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
+    {
+      Remove-Item $nuget -force -errorAction SilentlyContinue > $null
+    }
+    if (-not (test-path $nuget))
+    {
+      Write-Host "Download NuGet..."
+      Invoke-WebRequest $source -OutFile $nuget
+      if (-not $?) { throw "Failed to download NuGet." }
+    }
+  }
+  elseif (-not (test-path $nuget))
+  {
+    throw "Failed to locate NuGet.exe."
+  }
+
+  # get the build system
+  if (-not $local)
+  {
+    $solutionRoot = "$scriptRoot\.."
+    $nugetConfig = @{$true="$solutionRoot\src\NuGet.config.user";$false="$solutionRoot\src\NuGet.config"}[(test-path "$solutionRoot\src\NuGet.config.user")]
+    &$nuget install Umbraco.Build -OutputDirectory $scriptTemp -Verbosity quiet -PreRelease -ConfigFile $nugetConfig
+    if (-not $?) { throw "Failed to download Umbraco.Build." }
+  }
+
+  # ensure we have the build system
+  $ubuildPath = ls "$scriptTemp\Umbraco.Build.*" | sort -property CreationTime -descending | select -first 1
+  if (-not $ubuildPath)
+  {
+    throw "Failed to locate the build system."
+  }
+
+  # boot the build system
+  # this creates $global:ubuild
+  return &"$ubuildPath\ps\Boot.ps1"
+
+  # at that point the build.ps1 script must boot the build system
+  # eg
+  # $ubuild.Boot($ubuildPath.FullName, [System.IO.Path]::GetFullPath("$scriptRoot\.."), 
+  #   @{ Local = $local; With7Zip = $false; WithNode = $false },
+  #   @{ continue = $continue })
+  # if (-not $?) { throw "Failed to boot the build system." }
+  #
+  # and it's good practice to report
+  # eg
+  # Write-Host "Umbraco.Whatever Build"
+  # Write-Host "Umbraco.Build v$($ubuild.BuildVersion)"
+
+  # eof

build/build.ps1

@@ -1,67 +1,477 @@
-param (
+
+  param (
+    # get, don't execute
     [Parameter(Mandatory=$false)]
-    [string]
-    $version,
+    [Alias("g")]
+    [switch] $get = $false,
 
+    # run local, don't download, assume everything is ready
     [Parameter(Mandatory=$false)]
-    [Alias("mo")]
-    [switch]
-    $moduleOnly = $false
-)
+    [Alias("l")]
+    [Alias("loc")]
+    [switch] $local = $false,
 
-# the script can run either from the solution root,
-# or from the ./build directory - anything else fails
-if ([System.IO.Path]::GetFileName($pwd) -eq "build")
-{
-  $mpath = [System.IO.Path]::GetDirectoryName($pwd) + "\build\Modules\"
-}
-else
-{
-  $mpath = "$pwd\build\Modules\"
-}
+    # keep the build directories, don't clear them
+    [Parameter(Mandatory=$false)]
+    [Alias("c")]
+    [Alias("cont")]
+    [switch] $continue = $false
+  )
 
-# look for the module and throw if not found
-if (-not [System.IO.Directory]::Exists($mpath + "Umbraco.Build"))
-{
-  Write-Error "Could not locate Umbraco build Powershell module."
-  break
-}
+  # ################################################################
+  # BOOTSTRAP
+  # ################################################################
 
-# add the module path (if not already there)
-if (-not $env:PSModulePath.Contains($mpath))
-{
-  $env:PSModulePath = "$mpath;$env:PSModulePath"
-}
+  # create and boot the buildsystem
+  $ubuild = &"$PSScriptRoot\build-bootstrap.ps1"
+  if (-not $?) { return }
+  $ubuild.Boot($PSScriptRoot,
+    @{ Local = $local; },
+    @{ Continue = $continue })
+  if ($ubuild.OnError()) { return }
 
-# force-import (or re-import) the module
-Write-Host "Import Umbraco build Powershell module"
-Import-Module Umbraco.Build -Force -DisableNameChecking
+  Write-Host "Umbraco Cms Build"
+  Write-Host "Umbraco.Build v$($ubuild.BuildVersion)"
 
-# module only?
-if ($moduleOnly)
-{
-  if (-not [string]::IsNullOrWhiteSpace($version))
+  # ################################################################
+  # TASKS
+  # ################################################################
+
+  $ubuild.DefineMethod("SetMoreUmbracoVersion",
   {
-    Write-Host "(module only: ignoring version parameter)"
-  }
-  else
+    param ( $semver )
+
+    $release = "" + $semver.Major + "." + $semver.Minor + "." + $semver.Patch
+
+    Write-Host "Update UmbracoVersion.cs"
+    $this.ReplaceFileText("$($this.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs", `
+      "(\d+)\.(\d+)\.(\d+)(.(\d+))?", `
+      "$release")
+    $this.ReplaceFileText("$($this.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs", `
+      "CurrentComment => `"(.+)`"", `
+      "CurrentComment => `"$($semver.PreRelease)`"")
+
+    Write-Host "Update IIS Express port in csproj"
+    $updater = New-Object "Umbraco.Build.ExpressPortUpdater"
+    $csproj = "$($this.SolutionRoot)\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj"
+    $updater.Update($csproj, $release)
+  })
+
+  $ubuild.DefineMethod("SandboxNode",
   {
-    Write-Host "(module only)"
+    $global:node_path = $env:path
+    $nodePath = $this.BuildEnv.NodePath
+    $gitExe = (Get-Command git).Source
+    $gitPath = [System.IO.Path]::GetDirectoryName($gitExe)
+    $env:path = "$nodePath;$gitPath"
+
+    $global:node_nodepath = $this.ClearEnvVar("NODEPATH")
+    $global:node_npmcache = $this.ClearEnvVar("NPM_CONFIG_CACHE")
+    $global:node_npmprefix = $this.ClearEnvVar("NPM_CONFIG_PREFIX")
+  })
+
+  $ubuild.DefineMethod("RestoreNode",
+  {
+    $env:path = $node_path
+
+    $this.SetEnvVar("NODEPATH", $node_nodepath)
+    $this.SetEnvVar("NPM_CONFIG_CACHE", $node_npmcache)
+    $this.SetEnvVar("NPM_CONFIG_PREFIX", $node_npmprefix)
+  })
+
+  $ubuild.DefineMethod("CompileBelle",
+  {
+    $src = "$($this.SolutionRoot)\src"
+    $log = "$($this.BuildTemp)\belle.log"
+
+    Write-Host "Compile Belle"
+    Write-Host "Logging to $log"
+
+    # get a temp clean node env (will restore)
+    $this.SandboxNode()
+
+    # stupid PS is going to gather all "warnings" in $error
+    # so we have to take care of it else they'll bubble and kill the build
+    if ($error.Count -gt 0) { return }
+
+    Push-Location "$($this.SolutionRoot)\src\Umbraco.Web.UI.Client"
+    Write-Output "" > $log
+
+    Write-Output "### node version is:" > $log
+    &node -v >> $log 2>&1
+    if (-not $?) { throw "Failed to report node version." }
+
+    Write-Output "### npm version is:" >> $log 2>&1
+    &npm -v >> $log 2>&1
+    if (-not $?) { throw "Failed to report npm version." }
+
+    Write-Output "### clean npm cache" >> $log 2>&1
+    &npm cache clean --force >> $log 2>&1
+    $error.Clear() # that one can fail 'cos security bug - ignore
+
+    Write-Output "### npm install" >> $log 2>&1
+    &npm install >> $log 2>&1
+    Write-Output ">> $? $($error.Count)" >> $log 2>&1
+
+    Write-Output "### install bower" >> $log 2>&1
+    &npm install -g bower >> $log 2>&1
+    $error.Clear() # that one fails 'cos bower is deprecated - ignore
+
+    Write-Output "### install gulp" >> $log 2>&1
+    &npm install -g gulp >> $log 2>&1
+    $error.Clear() # that one fails 'cos deprecated stuff - ignore
+
+    Write-Output "### install gulp-cli" >> $log 2>&1
+    &npm install -g gulp-cli --quiet >> $log 2>&1
+    if (-not $?) { throw "Failed to install gulp-cli" } # that one is expected to work
+
+    Write-Output "### gulp build for version $($this.Version.Release)" >> $log 2>&1
+    &gulp build --buildversion=$this.Version.Release >> $log 2>&1
+    if (-not $?) { throw "Failed to build" } # that one is expected to work
+
+    Pop-Location
+
+    # fixme - should we filter the log to find errors?
+    #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
+
+    # restore
+    $this.RestoreNode()
+
+    # setting node_modules folder to hidden
+    # used to prevent VS13 from crashing on it while loading the websites project
+    # also makes sure aspnet compiler does not try to handle rogue files and chokes
+    # in VSO with Microsoft.VisualC.CppCodeProvider -related errors
+    # use get-item -force 'cos it might be hidden already
+    Write-Host "Set hidden attribute on node_modules"
+    $dir = Get-Item -force "$src\Umbraco.Web.UI.Client\node_modules"
+    $dir.Attributes = $dir.Attributes -bor ([System.IO.FileAttributes]::Hidden)
+  })
+
+  $ubuild.DefineMethod("CompileUmbraco",
+  {
+    $buildConfiguration = "Release"
+
+    $src = "$($this.SolutionRoot)\src"
+    $log = "$($this.BuildTemp)\msbuild.umbraco.log"
+
+    if ($this.BuildEnv.VisualStudio -eq $null)
+    {
+      throw "Build environment does not provide VisualStudio."
+    }
+
+    Write-Host "Compile Umbraco"
+    Write-Host "Logging to $log"
+
+    # beware of the weird double \\ at the end of paths
+    # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
+    &$this.BuildEnv.VisualStudio.MsBuild "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
+      /p:WarningLevel=0 `
+      /p:Configuration=$buildConfiguration `
+      /p:Platform=AnyCPU `
+      /p:UseWPP_CopyWebApplication=True `
+      /p:PipelineDependsOnBuild=False `
+      /p:OutDir="$($this.BuildTemp)\bin\\" `
+      /p:WebProjectOutputDir="$($this.BuildTemp)\WebApp\\" `
+      /p:Verbosity=minimal `
+      /t:Clean`;Rebuild `
+      /tv:"$($this.BuildEnv.VisualStudio.ToolsVersion)" `
+      /p:UmbracoBuild=True `
+      > $log
+
+    if (-not $?) { throw "Failed to compile Umbraco.Web.UI." }
+
+    # /p:UmbracoBuild tells the csproj that we are building from PS, not VS
+  })
+
+  $ubuild.DefineMethod("PrepareTests",
+  {
+    Write-Host "Prepare 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"
+
+    # data
+    Write-Host "Copy data files"
+    if (-not (Test-Path -Path "$($this.BuildTemp)\tests\Packaging" ))
+    {
+      Write-Host "Create packaging directory"
+      mkdir "$($this.BuildTemp)\tests\Packaging" > $null
+    }
+    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Tests\Packaging\Packages", "*", "$($this.BuildTemp)\tests\Packaging\Packages")
+
+    # required for package install tests
+    if (-not (Test-Path -Path "$($this.BuildTemp)\tests\bin" ))
+    {
+      Write-Host "Create bin directory"
+      mkdir "$($this.BuildTemp)\tests\bin" > $null
+    }
+  })
+
+  $ubuild.DefineMethod("CompileTests",
+  {
+    $buildConfiguration = "Release"
+    $log = "$($this.BuildTemp)\msbuild.tests.log"
+
+    if ($this.BuildEnv.VisualStudio -eq $null)
+    {
+      throw "Build environment does not provide VisualStudio."
+    }
+
+    Write-Host "Compile Tests"
+    Write-Host "Logging to $log"
+
+    # beware of the weird double \\ at the end of paths
+    # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
+    &$this.BuildEnv.VisualStudio.MsBuild "$($this.SolutionRoot)\src\Umbraco.Tests\Umbraco.Tests.csproj" `
+      /p:WarningLevel=0 `
+      /p:Configuration=$buildConfiguration `
+      /p:Platform=AnyCPU `
+      /p:UseWPP_CopyWebApplication=True `
+      /p:PipelineDependsOnBuild=False `
+      /p:OutDir="$($this.BuildTemp)\tests\\" `
+      /p:Verbosity=minimal `
+      /t:Build `
+      /tv:"$($this.BuildEnv.VisualStudio.ToolsVersion)" `
+      /p:UmbracoBuild=True `
+      /p:NugetPackages="$($this.SolutionRoot)\src\packages" `
+      > $log
+
+    if (-not $?) { throw "Failed to compile tests." }
+
+    # /p:UmbracoBuild tells the csproj that we are building from PS
+  })
+
+  $ubuild.DefineMethod("PreparePackages",
+  {
+    Write-Host "Prepare Packages"
+
+    $src = "$($this.SolutionRoot)\src"
+    $tmp = "$($this.BuildTemp)"
+    $out = "$($this.BuildOutput)"
+
+    $buildConfiguration = "Release"
+
+    # restore web.config
+    $this.TempRestoreFile("$src\Umbraco.Web.UI\web.config")
+
+    # cleanup build
+    Write-Host "Clean build"
+    $this.RemoveFile("$tmp\bin\*.dll.config")
+    $this.RemoveFile("$tmp\WebApp\bin\*.dll.config")
+
+    # cleanup presentation
+    Write-Host "Cleanup presentation"
+    $this.RemoveDirectory("$tmp\WebApp\umbraco.presentation")
+
+    # create directories
+    Write-Host "Create directories"
+    mkdir "$tmp\Configs" > $null
+    mkdir "$tmp\Configs\Lang" > $null
+    mkdir "$tmp\WebApp\App_Data" > $null
+    #mkdir "$tmp\WebApp\Media" > $null
+    #mkdir "$tmp\WebApp\Views" > $null
+
+    # copy various files
+    Write-Host "Copy xml documentation"
+    Copy-Item -force "$tmp\bin\*.xml" "$tmp\WebApp\bin"
+
+    Write-Host "Copy transformed configs and langs"
+    # note: exclude imageprocessor/*.config as imageprocessor pkg installs them
+    $this.CopyFiles("$tmp\WebApp\config", "*.config", "$tmp\Configs", `
+      { -not $_.RelativeName.StartsWith("imageprocessor") })
+    $this.CopyFiles("$tmp\WebApp\config", "*.js", "$tmp\Configs")
+    $this.CopyFiles("$tmp\WebApp\config\lang", "*.xml", "$tmp\Configs\Lang")
+    $this.CopyFile("$tmp\WebApp\web.config", "$tmp\Configs\web.config.transform")
+
+    Write-Host "Copy transformed web.config"
+    $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config")
+
+    # offset the modified timestamps on all umbraco dlls, as WebResources
+    # break if date is in the future, which, due to timezone offsets can happen.
+    Write-Host "Offset dlls timestamps"
+    Get-ChildItem -r "$tmp\*.dll" | ForEach-Object {
+      $_.CreationTime = $_.CreationTime.AddHours(-11)
+      $_.LastWriteTime = $_.LastWriteTime.AddHours(-11)
+    }
+
+    # copy libs
+    Write-Host "Copy SqlCE libraries"
+    $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
+    $this.CopyFiles("$nugetPackages\SqlServerCE\4.0.0.1", "*.*", "$tmp\bin", `
+      { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") })
+    $this.CopyFiles("$nugetPackages\SqlServerCE\4.0.0.1", "*.*", "$tmp\WebApp\bin", `
+      { -not $_.Extension.StartsWith(".nu") -and -not $_.RelativeName.StartsWith("lib\") })
+
+    # copy Belle
+    Write-Host "Copy Belle"
+    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\assets", "*", "$tmp\WebApp\umbraco\assets")
+    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\js", "*", "$tmp\WebApp\umbraco\js")
+    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\lib", "*", "$tmp\WebApp\umbraco\lib")
+    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\views", "*", "$tmp\WebApp\umbraco\views")
+  })
+
+  $ubuild.DefineMethod("PackageZip",
+  {
+    Write-Host "Create Zip packages"
+
+    $src = "$($this.SolutionRoot)\src"
+    $tmp = $this.BuildTemp
+    $out = $this.BuildOutput
+
+    Write-Host "Zip all binaries"
+    &$this.BuildEnv.Zip a -r "$out\UmbracoCms.AllBinaries.$($this.Version.Semver).zip" `
+      "$tmp\bin\*" `
+      "-x!dotless.Core.*" `
+      > $null
+    if (-not $?) { throw "Failed to zip UmbracoCms.AllBinaries." }
+
+    Write-Host "Zip cms"
+    &$this.BuildEnv.Zip a -r "$out\UmbracoCms.$($this.Version.Semver).zip" `
+      "$tmp\WebApp\*" `
+      "-x!dotless.Core.*" "-x!Content_Types.xml" "-x!*.pdb" `
+      > $null
+    if (-not $?) { throw "Failed to zip UmbracoCms." }
+  })
+
+  $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")
+    
+    Write-host "Set environment"
+    $env:UMBRACO_VERSION=$this.Version.Semver.ToString()
+    $env:UMBRACO_RELEASE=$this.Version.Release
+    $env:UMBRACO_COMMENT=$this.Version.Comment
+    $env:UMBRACO_BUILD=$this.Version.Build
+    
+    if ($args -and $args[0] -eq "vso")
+    {
+      Write-host "Set VSO environment"
+      # set environment variable for VSO
+      # https://github.com/Microsoft/vsts-tasks/issues/375
+      # https://github.com/Microsoft/vsts-tasks/blob/master/docs/authoring/commands.md
+      Write-Host ("##vso[task.setvariable variable=UMBRACO_VERSION;]$($this.Version.Semver.ToString())")
+      Write-Host ("##vso[task.setvariable variable=UMBRACO_RELEASE;]$($this.Version.Release)")
+      Write-Host ("##vso[task.setvariable variable=UMBRACO_COMMENT;]$($this.Version.Comment)")
+      Write-Host ("##vso[task.setvariable variable=UMBRACO_BUILD;]$($this.Version.Build)")
+
+      Write-Host ("##vso[task.setvariable variable=UMBRACO_TMP;]$($this.SolutionRoot)\build.tmp")
+    }
+  })
+
+  $ubuild.DefineMethod("PrepareNuGet",
+  {
+    Write-Host "Prepare NuGet"
+
+    # add Web.config transform files to the NuGet package
+    Write-Host "Add web.config transforms to NuGet package"
+    mv "$($this.BuildTemp)\WebApp\Views\Web.config" "$($this.BuildTemp)\WebApp\Views\Web.config.transform"
+
+    # fixme - that one does not exist in .bat build either?
+    #mv "$($this.BuildTemp)\WebApp\Xslt\Web.config" "$($this.BuildTemp)\WebApp\Xslt\Web.config.transform"
+  })
+
+  $ubuild.DefineMethod("RestoreNuGet",
+  {
+    Write-Host "Restore NuGet"
+    Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log"
+    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" -ConfigFile $this.BuildEnv.NuGetConfig > "$($this.BuildTemp)\nuget.restore.log"
+    if (-not $?) { throw "Failed to restore NuGet packages." }
+  })
+
+  $ubuild.DefineMethod("PackageNuGet",
+  {
+    $nuspecs = "$($this.SolutionRoot)\build\NuSpecs"
+
+    Write-Host "Create NuGet packages"
+
+    # see https://docs.microsoft.com/en-us/nuget/schema/nuspec
+    # note - warnings about SqlCE native libs being outside of 'lib' folder,
+    # nothing much we can do about it as it's intentional yet there does not
+    # seem to be a way to disable the warning
+
+    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
+        -Properties BuildTmp="$($this.BuildTemp)" `
+        -Version "$($this.Version.Semver.ToString())" `
+        -Symbols -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
+    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Core." }
+
+    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
+        -Properties BuildTmp="$($this.BuildTemp)" `
+        -Version $this.Version.Semver.ToString() `
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log"
+    if (-not $?) { throw "Failed to pack NuGet UmbracoCms." }
+
+    # run hook
+    if ($this.HasMethod("PostPackageNuGet"))
+    {
+      Write-Host "Run PostPackageNuGet hook"
+      $this.PostPackageNuGet();
+      if (-not $?) { throw "Failed to run hook." }
+    }
+  })
+
+  $ubuild.DefineMethod("VerifyNuGet",
+  {
+    $this.VerifyNuGetConsistency(
+      ("UmbracoCms", "UmbracoCms.Core"),
+      ("Umbraco.Core", "Umbraco.Web", "Umbraco.Web.UI", "Umbraco.Examine"))
+    if ($this.OnError()) { return }
+  })
+
+  $ubuild.DefineMethod("PrepareAzureGallery",
+  {
+    Write-Host "Prepare Azure Gallery"
+    $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
+  })
+
+  $ubuild.DefineMethod("Build",
+  {
+    $this.PrepareBuild()
+    if ($this.OnError()) { return }
+    $this.RestoreNuGet()
+    if ($this.OnError()) { return }
+    $this.CompileBelle()
+    if ($this.OnError()) { return }
+    $this.CompileUmbraco()
+    if ($this.OnError()) { return }
+    $this.PrepareTests()
+    if ($this.OnError()) { return }
+    $this.CompileTests()
+    if ($this.OnError()) { return }
+    # not running tests
+    $this.PreparePackages()
+    if ($this.OnError()) { return }
+    $this.PackageZip()
+    if ($this.OnError()) { return }
+    $this.VerifyNuGet()
+    if ($this.OnError()) { return }
+    $this.PrepareNuGet()
+    if ($this.OnError()) { return }
+    $this.PackageNuGet()
+    if ($this.OnError()) { return }
+    $this.PrepareAzureGallery()
+    if ($this.OnError()) { return }
+  })
+
+  # ################################################################
+  # RUN
+  # ################################################################
+
+  # configure
+  $ubuild.ReleaseBranches = @( "master" )
+
+  # run
+  if (-not $get)
+  {
+    $ubuild.Build()
+    if ($ubuild.OnError()) { return }
   }
-  break
-}
-
-# get build environment
-Write-Host "Setup Umbraco build Environment"
-$uenv = Get-UmbracoBuildEnv
-
-# set the version if any
-if (-not [string]::IsNullOrWhiteSpace($version))
-{
-  Write-Host "Set Umbraco version to $version"
-  Set-UmbracoVersion $version
-}
-
-# full umbraco build
-Write-Host "Build Umbraco"
-Build-Umbraco
+  Write-Host "Done"
+  if ($get) { return $ubuild }

build/setversion.ps1

@@ -1,18 +0,0 @@
-# Usage: powershell .\setversion.ps1 7.6.8
-# Or: powershell .\setversion 7.6.8-beta001
-
-param (
-    [Parameter(Mandatory=$true)]
-    [string]
-    $version
-)
-
-# report
-Write-Host "Setting Umbraco version to $version"
-
-# import Umbraco Build PowerShell module - $pwd is ./build
-$env:PSModulePath = "$pwd\Modules\;$env:PSModulePath"
-Import-Module Umbraco.Build -Force -DisableNameChecking
-
-# run commands
-$version = Set-UmbracoVersion -Version $version

src/NuGet.Config

@@ -3,5 +3,6 @@
   <packageSources>
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
     <add key="umbracocore" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
+    <add key="examineAppVeyor" value="https://ci.appveyor.com/nuget/examine-f73l6qv0oqfh/" />
   </packageSources>
 </configuration>

src/SQLCE4Umbraco/Properties/AssemblyInfo.cs

@@ -1,21 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SqlCE4Umbraco")]
-[assembly: AssemblyDescription("Umbraco specific Sql Ce Provider")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Umbraco CMS")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("04436b0a-1dc6-4ee1-9d96-4c04f1a9f429")]
-
-[assembly: InternalsVisibleTo("Umbraco.Tests")]

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5BA5425F-27A7-4677-865E-82246498AA2E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SQLCE4Umbraco</RootNamespace>
-    <AssemblyName>SQLCE4Umbraco</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\SQLCE4Umbraco.XML</DocumentationFile>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SqlCeApplicationBlock.cs" />
-    <Compile Include="SqlCeContextGuardian.cs" />
-    <Compile Include="SqlCEDataReader.cs" />
-    <Compile Include="SqlCEHelper.cs" />
-    <Compile Include="SqlCEInstaller.cs" />
-    <Compile Include="SqlCEParameter.cs" />
-    <Compile Include="SqlCeProviderException.cs" />
-    <Compile Include="SqlCETableUtility.cs" />
-    <Compile Include="SqlCEUtility.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
-      <Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
-      <Name>umbraco.datalayer</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj.DotSettings

@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String></wpf:ResourceDictionary>

src/SQLCE4Umbraco/SqlCEDataReader.cs

@@ -1,44 +0,0 @@
-/************************************************************************************
- * 
- *  Umbraco Data Layer
- *  MIT Licensed work
- *  ©2008 Ruben Verborgh
- * 
- ***********************************************************************************/
-
-using System.Data.SqlServerCe;
-using umbraco.DataLayer;
-
-namespace SqlCE4Umbraco
-{
-    /// <summary>
-    /// Class that adapts a SqlDataReader.SqlDataReader to a RecordsReaderAdapter.
-    /// </summary>
-    public class SqlCeDataReaderHelper : RecordsReaderAdapter<SqlCeDataReader>
-    {
-        #region Public Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SqlServerDataReader"/> class.
-        /// </summary>
-        /// <param name="dataReader">The data reader.</param>
-        public SqlCeDataReaderHelper(System.Data.SqlServerCe.SqlCeDataReader dataReader) : base(dataReader) { }
-                                                       
-        #endregion
-
-        #region RecordsReaderAdapter Members
-
-        /// <summary>
-        /// Gets a value indicating whether this instance has records.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if this instance has records; otherwise, <c>false</c>.
-        /// </value>
-        public override bool HasRecords
-        {
-            get { return DataReader.HasRows; }
-        }
-
-        #endregion
-    }
-}

src/SQLCE4Umbraco/SqlCEHelper.cs

@@ -1,253 +0,0 @@
-/************************************************************************************
- * 
- *  Umbraco Data Layer
- *  MIT Licensed work
- *  ©2008 Ruben Verborgh
- * 
- ***********************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlServerCe;
-using System.Linq;
-using System.Xml;
-using System.Diagnostics;
-using umbraco.DataLayer;
-using umbraco.DataLayer.SqlHelpers.SqlServer;
-
-namespace SqlCE4Umbraco
-{
-    /// <summary>
-    /// Sql Helper for an SQL Server database.
-    /// </summary>
-    public class SqlCEHelper : SqlHelper<SqlCeParameter>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SqlCEHelper"/> class.
-        /// </summary>
-        /// <param name="connectionString">The connection string.</param>
-        public SqlCEHelper(string connectionString) : base(connectionString)
-        {
-            m_Utility = new SqlCEUtility(this);
-        }
-
-        /// <summary>
-        /// Checks if the actual database exists, if it doesn't then it will create it
-        /// </summary>
-        internal void CreateEmptyDatabase()
-        {
-            var localConnection = new SqlCeConnection(ConnectionString);
-            if (!System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
-            {
-                using (var sqlCeEngine = new SqlCeEngine(ConnectionString))
-                {
-                    sqlCeEngine.CreateDatabase();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Most likely only will be used for unit tests but will remove all tables from the database
-        /// </summary>
-        internal void ClearDatabase()
-        {
-            // drop constraints before tables to avoid exceptions
-            // looping on try/catching exceptions was not really nice
-
-            // http://stackoverflow.com/questions/536350/drop-all-the-tables-stored-procedures-triggers-constriants-and-all-the-depend
-
-            var localConnection = new SqlCeConnection(ConnectionString);
-            if (System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
-            {
-                List<string> tables;
-
-                // drop foreign keys
-                // SQL may need "where constraint_catalog=DB_NAME() and ..."
-                tables = new List<string>();
-                using (var reader = ExecuteReader("select table_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' order by table_name"))
-                {
-                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
-                }
-
-                foreach (var table in tables)
-                {
-                    var constraints = new List<string>();
-                    using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' and table_name = '" + table + "' order by constraint_name"))
-                    {
-                        while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
-                    }
-                    foreach (var constraint in constraints)
-                    {
-                        // SQL may need "[dbo].[table]"
-                        ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
-                    }
-                }
-
-                // drop primary keys
-                // SQL may need "where constraint_catalog=DB_NAME() and ..."
-                tables = new List<string>();
-                using (var reader = ExecuteReader("select table_name from information_schema.table_constraints where constraint_type = 'PRIMARY KEY' order by table_name"))
-                {
-                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
-                }
-
-                foreach (var table in tables)
-                {
-                    var constraints = new List<string>();
-                    using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'PRIMARY KEY' and table_name = '" + table + "' order by constraint_name"))
-                    {
-                        while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
-                    }
-                    foreach (var constraint in constraints)
-                    {
-                        // SQL may need "[dbo].[table]"
-                        ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
-                    }
-                }
-
-                // drop tables
-                tables = new List<string>();
-                using (var reader = ExecuteReader("select table_name from information_schema.tables where table_type <> 'VIEW' order by table_name"))
-                {
-                    while (reader.Read()) tables.Add(reader.GetString("table_name").Trim());
-                }
-
-                foreach (var table in tables)
-                {
-                    ExecuteNonQuery("drop table [" + table + "]");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Drops all foreign keys on a table.
-        /// </summary>
-        /// <param name="table">The name of the table.</param>
-        /// <remarks>To be used in unit tests.</remarks>
-        internal void DropForeignKeys(string table)
-        {
-            var constraints = new List<string>();
-            using (var reader = ExecuteReader("select constraint_name from information_schema.table_constraints where constraint_type = 'FOREIGN KEY' and table_name = '" + table + "' order by constraint_name"))
-            {
-                while (reader.Read()) constraints.Add(reader.GetString("constraint_name").Trim());
-            }
-            foreach (var constraint in constraints)
-            {
-                // SQL may need "[dbo].[table]"
-                ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]");
-            }
-        }
-
-        /// <summary>
-        /// Replaces the data directory with a local path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>A local path with the resolved 'DataDirectory' mapping.</returns>
-        private string ReplaceDataDirectory(string path)
-        {
-            if (!string.IsNullOrWhiteSpace(path) && path.Contains("|DataDirectory|"))
-            {
-                var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory") as string;
-                if (!string.IsNullOrEmpty(dataDirectory))
-                {
-                    path = path.Contains(@"|\") 
-                        ? path.Replace("|DataDirectory|", dataDirectory) 
-                        : path.Replace("|DataDirectory|", dataDirectory + System.IO.Path.DirectorySeparatorChar);
-                }
-            }
-
-            return path;
-        }
-
-        /// <summary>
-        /// Creates a new parameter for use with this specific implementation of ISqlHelper.
-        /// </summary>
-        /// <param name="parameterName">Name of the parameter.</param>
-        /// <param name="value">Value of the parameter.</param>
-        /// <returns>A new parameter of the correct type.</returns>
-        /// <remarks>Abstract factory pattern</remarks>
-        public override IParameter CreateParameter(string parameterName, object value)
-        {
-            return new SqlCEParameter(parameterName, value);
-        }
-
-        /// <summary>
-        /// Executes a command that returns a single value.
-        /// </summary>
-        /// <param name="commandText">The command text.</param>
-        /// <param name="parameters">The parameters.</param>
-        /// <returns>The return value of the command.</returns>
-        protected override object ExecuteScalar(string commandText, SqlCeParameter[] parameters)
-        {
-#if DEBUG && DebugDataLayer
-                // Log Query Execution
-                Trace.TraceInformation(GetType().Name + " SQL ExecuteScalar: " + commandText);
-#endif
-            using (var cc = UseCurrentConnection)
-            {
-                return SqlCeApplicationBlock.ExecuteScalar(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters);
-            }
-        }
-
-        /// <summary>
-        /// Executes a command and returns the number of rows affected.
-        /// </summary>
-        /// <param name="commandText">The command text.</param>
-        /// <param name="parameters">The parameters.</param>
-        /// <returns>
-        /// The number of rows affected by the command.
-        /// </returns>
-        protected override int ExecuteNonQuery(string commandText, SqlCeParameter[] parameters)
-        {
-#if DEBUG && DebugDataLayer
-                // Log Query Execution
-                Trace.TraceInformation(GetType().Name + " SQL ExecuteNonQuery: " + commandText);
-#endif
-
-            using (var cc = UseCurrentConnection)
-            {
-                return SqlCeApplicationBlock.ExecuteNonQuery(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters);
-            }
-        }
-
-        /// <summary>
-        /// Executes a command and returns a records reader containing the results.
-        /// </summary>
-        /// <param name="commandText">The command text.</param>
-        /// <param name="parameters">The parameters.</param>
-        /// <returns>
-        /// A data reader containing the results of the command.
-        /// </returns>
-        protected override IRecordsReader ExecuteReader(string commandText, SqlCeParameter[] parameters)
-        {
-#if DEBUG && DebugDataLayer
-                // Log Query Execution
-                Trace.TraceInformation(GetType().Name + " SQL ExecuteReader: " + commandText);
-#endif
-
-            using (var cc = UseCurrentConnection)
-            {
-                return new SqlCeDataReaderHelper(SqlCeApplicationBlock.ExecuteReader(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters));
-            }
-        }
-
-
-        internal IRecordsReader ExecuteReader(string commandText)
-        {
-            return ExecuteReader(commandText, new SqlCEParameter(string.Empty, string.Empty));
-        }
-
-
-        internal int ExecuteNonQuery(string commandText)
-        {
-            return ExecuteNonQuery(commandText, new SqlCEParameter(string.Empty, string.Empty));
-        }
-    }
-}

src/SQLCE4Umbraco/SqlCEInstaller.cs

@@ -1,141 +0,0 @@
-/************************************************************************************
- * 
- *  Umbraco Data Layer
- *  MIT Licensed work
- *  ©2008 Ruben Verborgh
- * 
- ***********************************************************************************/
-
-using System;
-using System.Resources;
-using SQLCE4Umbraco;
-using umbraco.DataLayer.Utility.Installer;
-using System.Diagnostics;
-
-namespace SqlCE4Umbraco
-{
-    /// <summary>
-    /// Database installer for an SQL Server data source.
-    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
-    public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
-    {
-        #region Private Constants
-
-        /// <summary>The latest database version this installer supports.</summary>
-        private const DatabaseVersion LatestVersionSupported = DatabaseVersion.Version4_8;
-
-        /// <summary>The specifications to determine the database version.</summary>
-        private static readonly VersionSpecs[] m_VersionSpecs = new VersionSpecs[] {
-                    new VersionSpecs("SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS LEFT OUTER JOIN umbracoApp ON appAlias = appAlias WHERE CONSTRAINT_NAME = 'FK_umbracoUser2app_umbracoApp'", 0, DatabaseVersion.Version4_8),
-                    new VersionSpecs("SELECT id FROM umbracoNode WHERE id = -21", 1, DatabaseVersion.Version4_1),
-                    new VersionSpecs("SELECT action FROM umbracoAppTree",DatabaseVersion.Version4),
-                    new VersionSpecs("SELECT description FROM cmsContentType",DatabaseVersion.Version3),
-                    new VersionSpecs("SELECT id FROM sysobjects",DatabaseVersion.None) };
-
-        #endregion
-
-        #region Public Properties
-
-        /// <summary>
-        /// This ensures that the database exists, then runs the base method
-        /// </summary>
-        public override bool CanConnect
-        {
-            get
-            {
-                using (var sqlHelper = SqlHelper)
-                    sqlHelper.CreateEmptyDatabase();
-                return base.CanConnect;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the installer can upgrade the data source.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if the installer can upgrade the data source; otherwise, <c>false</c>.
-        /// </value>
-        /// <remarks>Empty data sources can't be upgraded, just installed.</remarks>
-        public override bool CanUpgrade
-        {
-            get
-            {
-                return CurrentVersion == DatabaseVersion.Version4_1;
-            }
-        }
-
-        #endregion
-
-        #region Protected Properties
-
-        /// <summary>
-        /// Gets the version specification for evaluation by DetermineCurrentVersion.
-        /// Only first matching specification is taken into account.
-        /// </summary>
-        /// <value>The version specifications.</value>
-        protected override VersionSpecs[] VersionSpecs
-        {
-            get { return m_VersionSpecs; }
-        }
-
-        #endregion
-
-        #region Public Constructors
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SqlCEInstaller"/> class.
-        /// </summary>
-        /// <param name="sqlHelper">The SQL helper.</param>
-        public SqlCEInstaller(SqlCEHelper sqlHelper) : base(sqlHelper, LatestVersionSupported)
-        { }
-
-        #endregion
-
-        #region DefaultInstaller Members       
-
-        /// <summary>
-        /// Returns the sql to do a full install
-        /// </summary>
-        protected override string FullInstallSql
-        {
-            get { return string.Empty; }
-        }
-
-
-        /// <summary>
-        /// Returns the sql to do an upgrade
-        /// </summary>
-        protected override string UpgradeSql
-        {
-            get { return string.Empty; }
-        }
-
-        // We need to override this as the default way of detection a db connection checks for systables that doesn't exist
-        // in a CE db
-        protected override DatabaseVersion DetermineCurrentVersion()
-        {
-            DatabaseVersion version = base.DetermineCurrentVersion();
-            if (version != DatabaseVersion.Unavailable)
-            {
-                return version;
-            }
-
-            // verify connection
-            try
-            {
-                using (var sqlHelper = SqlHelper)
-                    if (SqlCeApplicationBlock.VerifyConnection(sqlHelper.ConnectionString))
-                        return DatabaseVersion.None;
-            }
-            catch (Exception e)
-            {
-                Trace.WriteLine(e.ToString());
-            }
-
-            return DatabaseVersion.Unavailable;
-        }
-
-        #endregion
-    }
-}

src/SQLCE4Umbraco/SqlCEParameter.cs

@@ -1,34 +0,0 @@
-/************************************************************************************
- * 
- *  Umbraco Data Layer
- *  MIT Licensed work
- *  ©2008 Ruben Verborgh
- * 
- ***********************************************************************************/
-
-using System;
-using System.Data.SqlServerCe;
-using System.Data.SqlTypes;
-using umbraco.DataLayer;
-
-namespace SqlCE4Umbraco
-{
-    /// <summary>
-    /// Parameter class for the SqlCEHelper.
-    /// </summary>
-    public class SqlCEParameter : SqlParameterAdapter<SqlCeParameter>
-    {
-        #region Public Constructors
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SqlCEParameter"/> class.
-        /// </summary>
-        /// <param name="parameterName">Name of the parameter.</param>
-        /// <param name="value">Value of the parameter.</param>
-        public SqlCEParameter(string parameterName, object value)
-            : base(new SqlCeParameter(parameterName, value))
-        { }
-
-        #endregion
-    }
-}

src/SQLCE4Umbraco/SqlCETableUtility.cs

@@ -1,250 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-using umbraco.DataLayer.Utility.Table;
-using umbraco.DataLayer;
-using umbraco;
-
-namespace SqlCE4Umbraco
-{
-    /// <summary>
-    /// SQL Server implementation of <see cref="DefaultTableUtility&lt;S&gt;"/>.
-    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
-    public class SqlCETableUtility : DefaultTableUtility<SqlCEHelper>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SqlCETableUtility"/> class.
-        /// </summary>
-        /// <param name="sqlHelper">The SQL helper.</param>
-        public SqlCETableUtility(SqlCEHelper sqlHelper)
-            : base(sqlHelper)
-        { }
-
-        #region DefaultTableUtility<SqlCEHelper> members
-
-        /// <summary>
-        /// Gets the table with the specified name.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>The table, or <c>null</c> if no table with that name exists.</returns>
-        public override ITable GetTable(string name)
-        {
-            if (name == null)
-                throw new ArgumentNullException("name");
-
-            ITable table = null;
-
-            // get name in correct casing
-            using (var sqlHelper = SqlHelper)
-                name = sqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
-                                                          sqlHelper.CreateParameter("name", name));
-            if (name != null)
-            {
-                table = new DefaultTable(name);
-
-                using (var sqlHelper = SqlHelper)
-                using (IRecordsReader reader = sqlHelper.ExecuteReader(
-                        @"SELECT c.name AS Name, st.name AS DataType, c.max_length, c.is_nullable, c.is_identity
-                          FROM sys.tables AS t
-                            JOIN sys.columns AS c ON t.object_id = c.object_id
-                            JOIN sys.schemas AS s ON s.schema_id = t.schema_id
-                            JOIN sys.types AS ty ON ty.user_type_id = c.user_type_id
-                            JOIN sys.types st ON ty.system_type_id = st.user_type_id
-                          WHERE t.name = @name
-                          ORDER BY c.column_id", sqlHelper.CreateParameter("name", name)))
-                {
-                    while (reader.Read())
-                    {
-                        table.AddField(table.CreateField(reader.GetString("Name"), GetType(reader)));
-                    }
-                }
-            }
-
-            return table;
-        }
-
-        /// <summary>
-        /// Saves or updates the table.
-        /// </summary>
-        /// <param name="table">The table to be saved.</param>
-        public override void SaveTable(ITable table)
-        {
-            if (table == null)
-                throw new ArgumentNullException("table");
-
-            ITable oldTable = GetTable(table.Name);
-
-            // create the table if it didn't exist, update fields otherwise
-            if (oldTable == null)
-            {
-                CreateTable(table);
-            }
-            else
-            {
-                foreach (IField field in table)
-                {
-                    // create the field if it did't exist in the old table
-                    if (oldTable.FindField(field.Name)==null)
-                    {
-                        CreateColumn(table, field);
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        #region Protected Helper Methods
-
-        /// <summary>
-        /// Creates the table in the data source.
-        /// </summary>
-        /// <param name="table">The table.</param>
-        protected virtual void CreateTable(ITable table)
-        {
-            Debug.Assert(table != null);
-
-            // create enumerator and check for first field
-            IEnumerator<IField> fieldEnumerator = table.GetEnumerator();
-            bool hasNext = fieldEnumerator.MoveNext();
-            if(!hasNext)
-                throw new ArgumentException("The table must contain at least one field.");
-
-            // create query
-            StringBuilder createTableQuery = new StringBuilder();
-            using (var sqlHelper = SqlHelper)
-                createTableQuery.AppendFormat("CREATE TABLE [{0}] (", sqlHelper.EscapeString(table.Name));
-
-            // add fields
-            while (hasNext)
-            {
-                // add field name and type
-                IField field = fieldEnumerator.Current;
-                createTableQuery.Append('[').Append(field.Name).Append(']');
-                createTableQuery.Append(' ').Append(GetDatabaseType(field));
-
-                // append comma if a following field exists
-                hasNext = fieldEnumerator.MoveNext();
-                if (hasNext)
-                {
-                    createTableQuery.Append(',');
-                }
-            }
-
-            // close CREATE TABLE x (...) bracket
-            createTableQuery.Append(')');
-
-            // execute query
-            try
-            {
-                using (var sqlHelper = SqlHelper)
-                    sqlHelper.ExecuteNonQuery(createTableQuery.ToString());
-            }
-            catch (Exception executeException)
-            {
-                throw new UmbracoException(String.Format("Could not create table '{0}'.", table), executeException);
-            }
-        }
-
-        /// <summary>
-        /// Creates a new column in the table.
-        /// </summary>
-        /// <param name="table">The table.</param>
-        /// <param name="field">The field used to create the column.</param>
-        protected virtual void CreateColumn(ITable table, IField field)
-        {
-            Debug.Assert(table != null && field != null);
-
-            StringBuilder addColumnQuery = new StringBuilder();
-            using (var sqlHelper = SqlHelper)
-                addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
-                                        sqlHelper.EscapeString(table.Name),
-                                        sqlHelper.EscapeString(field.Name),
-                                        sqlHelper.EscapeString(GetDatabaseType(field)));
-            try
-            {
-                using (var sqlHelper = SqlHelper)
-                    sqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
-            }
-            catch (Exception executeException)
-            {
-                throw new UmbracoException(String.Format("Could not create column '{0}' in table '{1}'.",
-                                                         field, table.Name), executeException);
-            }
-        }
-
-        /// <summary>
-        /// Gets the .Net type corresponding to the specified database data type.
-        /// </summary>
-        /// <param name="dataTypeReader">The data type reader.</param>
-        /// <returns>The .Net type</returns>
-        protected virtual Type GetType(IRecordsReader dataTypeReader)
-        {
-            string typeName = dataTypeReader.GetString("DataType");
-
-            switch (typeName)
-            {
-                case "bit":                 return typeof(bool);
-                case "tinyint":             return typeof(byte);
-                case "datetime":            return typeof(DateTime);
-                // TODO: return different decimal type according to field precision
-                case "decimal":             return typeof(decimal);
-                case "uniqueidentifier":    return typeof(Guid);
-                case "smallint":            return typeof(Int16);
-                case "int":                 return typeof(Int32);
-                case "bigint":              return typeof(Int64);
-                case "nvarchar":            return typeof(string);
-                default:
-                    throw new ArgumentException(String.Format("Cannot convert database type '{0}' to a .Net type.",
-                                                              typeName));
-            }
-        }
-
-        /// <summary>
-        /// Gets the database type corresponding to the field, complete with field properties.
-        /// </summary>
-        /// <param name="field">The field.</param>
-        /// <returns>The database type.</returns>
-        protected virtual string GetDatabaseType(IField field)
-        {
-            StringBuilder fieldBuilder = new StringBuilder();
-
-            fieldBuilder.Append(GetDatabaseTypeName(field));
-            fieldBuilder.Append(field.HasProperty(FieldProperties.Identity) ? " IDENTITY(1,1)" : String.Empty);
-            fieldBuilder.Append(field.HasProperty(FieldProperties.NotNull) ? " NOT NULL" : " NULL");
-
-            return fieldBuilder.ToString();
-        }
-
-        /// <summary>
-        /// Gets the name of the database type, without field properties.
-        /// </summary>
-        /// <param name="field">The field.</param>
-        /// <returns></returns>
-        protected virtual string GetDatabaseTypeName(IField field)
-        {
-            switch (field.DataType.FullName)
-            {
-                case "System.Boolean":  return "bit";
-                case "System.Byte":     return "tinyint";
-                case "System.DateTime": return "datetime";
-                case "System.Decimal":  return "decimal(28)";
-                case "System.Double":   return "decimal(15)";
-                case "System.Single":   return "decimal(7)";
-                case "System.Guid":     return "uniqueidentifier";
-                case "System.Int16":    return "smallint";
-                case "System.Int32":    return "int";
-                case "System.Int64":    return "bigint";;
-                case "System.String":
-                    string type = "nvarchar";
-                    return field.Size == 0 ? type : String.Format("{0}({1})", type, field.Size);
-                default:
-                    throw new ArgumentException(String.Format("Cannot convert '{0}' to a database type.", field));
-            }
-        }
-
-        #endregion
-    }
-}

src/SQLCE4Umbraco/SqlCEUtility.cs

@@ -1,56 +0,0 @@
-/************************************************************************************
- * 
- *  Umbraco Data Layer
- *  MIT Licensed work
- *  ©2008 Ruben Verborgh
- * 
- ***********************************************************************************/
-
-using System;
-using umbraco.DataLayer.SqlHelpers.SqlServer;
-using umbraco.DataLayer.Utility;
-using umbraco.DataLayer.Utility.Installer;
-using umbraco.DataLayer.Utility.Table;
-
-namespace SqlCE4Umbraco
-{
-    /// <summary>
-    /// Utility for an SQL Server data source.
-    /// </summary>
-    [Obsolete("The legacy installers are no longer used and will be removed from the codebase in the future")]
-    public class SqlCEUtility : DefaultUtility<SqlCEHelper>
-    {
-        #region Public Constructors
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SqlServerUtility"/> class.
-        /// </summary>
-        /// <param name="sqlHelper">The SQL helper.</param>
-        public SqlCEUtility(SqlCEHelper sqlHelper) : base(sqlHelper)
-        { }
-
-        #endregion
-
-        #region DefaultUtility Members
-
-        /// <summary>
-        /// Creates an installer.
-        /// </summary>
-        /// <returns>The SQL Server installer.</returns>
-        public override IInstallerUtility CreateInstaller()
-        {
-            return new SqlCEInstaller(SqlHelper);
-        }
-
-        /// <summary>
-        /// Creates a table utility.
-        /// </summary>
-        /// <returns>The table utility</returns>
-        public override ITableUtility CreateTableUtility()
-        {
-            return new SqlCETableUtility(SqlHelper);
-        }
-
-        #endregion
-    }
-}

src/SQLCE4Umbraco/SqlCeApplicationBlock.cs

@@ -1,270 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data.SqlServerCe;
-using System.Data;
-using System.Diagnostics;
-using SQLCE4Umbraco;
-
-namespace SqlCE4Umbraco
-{
-    public class SqlCeApplicationBlock
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="connectionString"></param>
-        /// <param name="commandType"></param>
-        /// <param name="commandText"></param>
-        /// <param name="commandParameters"></param>
-        /// <returns></returns>
-        public static object ExecuteScalar(
-            string connectionString,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-            )
-        {
-            try
-            {
-                using (var conn = SqlCeContextGuardian.Open(connectionString))
-                {
-                    return ExecuteScalarTry(conn, null, commandText, commandParameters);
-                }
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running Scalar: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee);
-            }
-        }
-
-        public static object ExecuteScalar(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            try
-            {
-                return ExecuteScalarTry(conn, trx, commandText, commandParameters);
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running Scalar: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee);
-            }
-        }
-
-        public static object ExecuteScalar(
-            SqlCeConnection conn,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            return ExecuteScalar(conn, null, commandType, commandText, commandParameters);
-        }
-
-        private static object ExecuteScalarTry(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            object retVal;
-            using (var cmd = trx == null ? new SqlCeCommand(commandText, conn) : new SqlCeCommand(commandText, conn, trx))
-            {
-                AttachParameters(cmd, commandParameters);
-                Debug.WriteLine("---------------------------------SCALAR-------------------------------------");
-                Debug.WriteLine(commandText);
-                Debug.WriteLine("----------------------------------------------------------------------------");
-                retVal = cmd.ExecuteScalar();
-            }
-            return retVal;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="connectionString"></param>
-        /// <param name="commandType"></param>
-        /// <param name="commandText"></param>
-        /// <param name="commandParameters"></param>
-        public static int ExecuteNonQuery(
-            string connectionString,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-            )
-        {
-            try
-            {
-                using (var conn = SqlCeContextGuardian.Open(connectionString))
-                {
-                    return ExecuteNonQueryTry(conn, null, commandText, commandParameters);
-                }
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running NonQuery: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
-            }
-        }
-
-        public static int ExecuteNonQuery(
-            SqlCeConnection conn,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-        )
-        {
-            return ExecuteNonQuery(conn, null, commandType, commandText, commandParameters);
-        }
-
-        public static int ExecuteNonQuery(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-            )
-        {
-            try
-            {
-                return ExecuteNonQueryTry(conn, trx, commandText, commandParameters);
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running NonQuery: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
-            }
-        }
-
-        private static int ExecuteNonQueryTry(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            // this is for multiple queries in the installer
-            if (commandText.Trim().StartsWith("!!!"))
-            {
-                commandText = commandText.Trim().Trim('!');
-                var commands = commandText.Split('|');
-                var currentCmd = string.Empty;
-
-                foreach (var command in commands)
-                {
-                    try
-                    {
-                        currentCmd = command;
-                        if (string.IsNullOrWhiteSpace(command)) continue;
-                        var c = trx == null ? new SqlCeCommand(command, conn) : new SqlCeCommand(command, conn, trx);
-                        c.ExecuteNonQuery();
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.WriteLine("*******************************************************************");
-                        Debug.WriteLine(currentCmd);
-                        Debug.WriteLine(e);
-                        Debug.WriteLine("*******************************************************************");
-                    }
-                }
-                return 1;
-            }
-
-            Debug.WriteLine("----------------------------------------------------------------------------");
-            Debug.WriteLine(commandText);
-            Debug.WriteLine("----------------------------------------------------------------------------");
-            var cmd = new SqlCeCommand(commandText, conn);
-            AttachParameters(cmd, commandParameters);
-            var rowsAffected = cmd.ExecuteNonQuery();
-            return rowsAffected;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="connectionString"></param>
-        /// <param name="commandType"></param>
-        /// <param name="commandText"></param>
-        /// <param name="commandParameters"></param>
-        /// <returns></returns>
-        public static SqlCeDataReader ExecuteReader(
-            string connectionString,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-            )
-        {
-            try
-            {
-                var conn = SqlCeContextGuardian.Open(connectionString);
-                return ExecuteReaderTry(conn, null, commandText, commandParameters);
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running Reader: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
-            }
-        }
-
-        public static SqlCeDataReader ExecuteReader(
-            SqlCeConnection conn,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-        )
-        {
-            return ExecuteReader(conn, commandType, commandText, commandParameters);
-        }
-
-        public static SqlCeDataReader ExecuteReader(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-            )
-        {
-            try
-            {
-                return ExecuteReaderTry(conn, trx, commandText, commandParameters);
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running Reader: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
-            }
-        }
-
-        private static SqlCeDataReader ExecuteReaderTry(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            Debug.WriteLine("---------------------------------READER-------------------------------------");
-            Debug.WriteLine(commandText);
-            Debug.WriteLine("----------------------------------------------------------------------------");
-
-            try
-            {
-                var cmd = trx == null ? new SqlCeCommand(commandText, conn) : new SqlCeCommand(commandText, conn, trx);
-                AttachParameters(cmd, commandParameters);
-                return cmd.ExecuteReader();
-            }
-            catch
-            {
-                conn.Close();
-                throw;
-            }
-        }
-
-        public static bool VerifyConnection(string connectionString)
-        {
-            using (var conn = SqlCeContextGuardian.Open(connectionString))
-            {
-                return conn.State == ConnectionState.Open;
-            }
-        }
-
-        private static void AttachParameters(SqlCeCommand command, IEnumerable<SqlCeParameter> commandParameters)
-        {
-            foreach (var parameter in commandParameters)
-            {
-                if ((parameter.Direction == ParameterDirection.InputOutput) && (parameter.Value == null))
-                    parameter.Value = DBNull.Value;
-                command.Parameters.Add(parameter);
-            }
-        }
-    }
-}

src/SQLCE4Umbraco/SqlCeContextGuardian.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using System.Data.SqlServerCe;
-using System.Linq;
-using System.Text;
-
-namespace SQLCE4Umbraco
-{
-    public static class SqlCeContextGuardian
-    {
-        private static SqlCeConnection _constantOpenConnection;
-        private static readonly object Lock = new object();
-
-        // Awesome SQL CE 4 speed improvement by Erik Ejskov Jensen - SQL CE 4 MVP
-        // It's not an issue with SQL CE 4 that we never close the connection
-        public static SqlCeConnection Open(string connectionString)
-        {
-            var connectionStringBuilder = new DbConnectionStringBuilder();
-            try
-            {
-                connectionStringBuilder.ConnectionString = connectionString;
-            }
-            catch (Exception ex)
-            {
-                throw new ArgumentException("Bad connection string.", "connectionString", ex);
-            }
-            connectionStringBuilder.Remove("datalayer");
-
-            // SQL CE 4 performs better when there's always a connection open in the background
-            EnsureOpenBackgroundConnection(connectionStringBuilder.ConnectionString);
-
-            SqlCeConnection conn = new SqlCeConnection(connectionStringBuilder.ConnectionString);
-            conn.Open();
-
-            return conn;
-
-        }
-
-		/// <summary>
-		/// Sometimes we need to ensure this is closed especially in unit tests
-		/// </summary>
-		internal static void CloseBackgroundConnection()
-		{
-			if (_constantOpenConnection != null)
-				_constantOpenConnection.Close();
-		}
-
-        private static void EnsureOpenBackgroundConnection(string connectionString)
-        {
-            lock (Lock)
-            {
-                if (_constantOpenConnection == null)
-                {
-                    _constantOpenConnection = new SqlCeConnection(connectionString);
-                    _constantOpenConnection.Open();
-                }
-                else if (_constantOpenConnection.State != ConnectionState.Open)
-                    _constantOpenConnection.Open();
-            }
-        }
-    }
-}

src/SQLCE4Umbraco/SqlCeProviderException.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace SqlCE4Umbraco
-{
-    public class SqlCeProviderException : Exception
-    {
-        public SqlCeProviderException() : base()
-        {
-
-        }
-
-        public SqlCeProviderException(string message) : base(message)
-        {
-
-        }
-    }
-}

src/SQLCE4Umbraco/app.config

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>

src/SQLCE4Umbraco/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
-</packages>

src/SolutionInfo.cs

@@ -6,10 +6,15 @@ using System.Resources;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: NeutralResourcesLanguageAttribute("en-US")]
+[assembly: NeutralResourcesLanguage("en-US")]
 
+// versions
+// read https://stackoverflow.com/questions/64602/what-are-differences-between-assemblyversion-assemblyfileversion-and-assemblyin
 
-[assembly: AssemblyVersion("1.0.*")]
+// this is the ONLY ONE the CLR cares about for compatibility
+// should change ONLY when "hard" breaking compatibility (manual change)
+[assembly: AssemblyVersion("8.0.0")]
 
-[assembly: AssemblyFileVersion("7.10.1")]
-[assembly: AssemblyInformationalVersion("7.10.1")]
+// these are FYI and changed automatically
+[assembly: AssemblyFileVersion("8.0.0")]
+[assembly: AssemblyInformationalVersion("8.0.0-alpha.32")]

src/Umbraco.Core/ActionsResolver.cs

@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using Umbraco.Core.Logging;
-using Umbraco.Core.ObjectResolution;
-using umbraco.interfaces;
-
-namespace Umbraco.Core
-{
-	/// <summary>
-	/// A resolver to return all IAction objects
-	/// </summary>
-	public sealed class ActionsResolver : LazyManyObjectsResolverBase<ActionsResolver, IAction>
-	{
-	    /// <summary>
-	    /// Constructor
-	    /// </summary>
-	    /// <param name="serviceProvider"></param>
-	    /// <param name="logger"></param>
-	    /// <param name="packageActions"></param>		
-	    internal ActionsResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> packageActions)
-            : base(serviceProvider, logger, packageActions)
-		{
-
-		}
-
-        /// <summary>
-        /// Gets the <see cref="IAction"/> implementations.
-        /// </summary>
-        public IEnumerable<IAction> Actions
-		{
-			get
-			{
-				return Values;
-			}
-		}
-
-        /// <summary>
-        /// This method will return a list of IAction's based on a string (letter) list. Each character in the list may represent
-        /// an IAction. This will associate any found IActions based on the Letter property of the IAction with the character being referenced.
-        /// </summary>
-        /// <param name="actions"></param>
-        /// <returns>returns a list of actions that have an associated letter found in the action string list</returns>
-        public IEnumerable<IAction> FromActionSymbols(IEnumerable<string> actions)
-	    {
-	        var allActions = Actions.ToArray();
-	        return actions
-                .Select(c => allActions.FirstOrDefault(a => a.Letter.ToString(CultureInfo.InvariantCulture) == c))
-                .WhereNotNull()
-                .ToArray();
-	    }
-
-	    /// <summary>
-	    /// Returns the string (letter) representation of the actions that make up the actions collection
-	    /// </summary>
-	    /// <returns></returns>
-	    public IEnumerable<string> ToActionSymbols(IEnumerable<IAction> actions)
-	    {
-	        return actions.Select(x => x.Letter.ToString(CultureInfo.InvariantCulture)).ToArray();
-	    }
-
-        /// <summary>
-        /// Gets an Action if it exists.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        internal IAction GetAction<T>()
-            where T : IAction
-        {
-            return Actions.SingleOrDefault(x => x.GetType() == typeof (T));
-        }
-
-		protected override IEnumerable<IAction> CreateInstances()
-		{					
-			var actions = new List<IAction>();
-			var foundIActions = InstanceTypes;
-			foreach (var type in foundIActions)
-			{
-				IAction typeInstance;
-				var instance = type.GetProperty("Instance", BindingFlags.Public | BindingFlags.Static);
-				//if the singletone initializer is not found, try simply creating an instance of the IAction if it supports public constructors
-				if (instance == null)
-					typeInstance = ServiceProvider.GetService(type) as IAction;
-				else
-					typeInstance = instance.GetValue(null, null) as IAction;
-
-				if (typeInstance != null)
-				{
-					actions.Add(typeInstance);
-				}
-			}
-			return actions;
-		}
-
-	}
-}

src/Umbraco.Core/ActivatorHelper.cs

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

src/Umbraco.Core/ActivatorServiceProvider.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    internal class ActivatorServiceProvider : IServiceProvider
-    {
-        public object GetService(Type serviceType)
-        {
-            return Activator.CreateInstance(serviceType);
-        }
-    }
-}

src/Umbraco.Core/ApplicationContext.cs

@@ -1,506 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Threading;
-using Semver;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.ObjectResolution;
-using Umbraco.Core.Profiling;
-using Umbraco.Core.Scoping;
-using Umbraco.Core.Services;
-using Umbraco.Core.Sync;
-
-namespace Umbraco.Core
-{
-	/// <summary>
-    /// the Umbraco Application context
-    /// </summary>
-    /// <remarks>
-    /// one per AppDomain, represents the global Umbraco application
-    /// </remarks>
-    public class ApplicationContext : IDisposable
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="dbContext"></param>
-        /// <param name="serviceContext"></param>
-        /// <param name="cache"></param>
-        /// <param name="logger"></param>
-        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, ProfilingLogger logger)
-	    {
-            if (dbContext == null) throw new ArgumentNullException("dbContext");
-            if (serviceContext == null) throw new ArgumentNullException("serviceContext");
-            if (cache == null) throw new ArgumentNullException("cache");
-            if (logger == null) throw new ArgumentNullException("logger");
-            _databaseContext = dbContext;
-            _services = serviceContext;
-            ApplicationCache = cache;
-            ProfilingLogger = logger;
-
-            Init();
-	    }
-
-	    /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="dbContext"></param>
-        /// <param name="serviceContext"></param>
-        /// <param name="cache"></param>
-        [Obsolete("Use the other constructor specifying a ProfilingLogger instead")]
-        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
-            : this(dbContext, serviceContext, cache,
-                new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler))
-        {
-        }
-
-        /// <summary>
-        /// Creates a basic app context
-        /// </summary>
-        /// <param name="cache"></param>
-        [Obsolete("Use the other constructor specifying a ProfilingLogger instead")]
-        public ApplicationContext(CacheHelper cache)
-        {
-            if (cache == null) throw new ArgumentNullException("cache");
-            ApplicationCache = cache;
-            ProfilingLogger = new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);
-            Init();
-        }
-
-	    /// <summary>
-	    /// Creates a basic app context
-	    /// </summary>
-	    /// <param name="cache"></param>
-	    /// <param name="logger"></param>
-	    public ApplicationContext(CacheHelper cache, ProfilingLogger logger)
-        {
-	        if (cache == null) throw new ArgumentNullException("cache");
-	        if (logger == null) throw new ArgumentNullException("logger");
-	        ApplicationCache = cache;
-	        ProfilingLogger = logger;
-            Init();
-        }
-
-	    /// <summary>
-	    /// A method used to set and/or ensure that a global ApplicationContext singleton is created.
-	    /// </summary>
-	    /// <param name="appContext">
-	    /// The instance to set on the global application singleton
-	    /// </param>
-	    /// <param name="replaceContext">If set to true and the singleton is already set, it will be replaced</param>
-	    /// <returns></returns>
-	    /// <remarks>
-	    /// This is NOT thread safe
-	    /// </remarks>
-	    public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
-	    {
-            if (Current != null)
-            {
-                if (!replaceContext)
-                    return Current;
-            }
-            Current = appContext;
-            return Current;
-	    }
-
-	    /// <summary>
-	    /// A method used to create and ensure that a global ApplicationContext singleton is created.
-	    /// </summary>
-	    /// <param name="cache"></param>
-	    /// <param name="replaceContext">
-	    /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app
-	    /// startup if for some reason the boot manager is not the umbraco boot manager.
-	    /// </param>
-	    /// <param name="dbContext"></param>
-	    /// <param name="serviceContext"></param>
-	    /// <returns></returns>
-	    /// <remarks>
-	    /// This is NOT thread safe
-	    /// </remarks>
-        [Obsolete("Use the other method specifying an ProfilingLogger instead")]
-	    public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
-        {
-            if (Current != null)
-            {
-                if (!replaceContext)
-                    return Current;
-            }
-            var ctx = new ApplicationContext(dbContext, serviceContext, cache);
-            Current = ctx;
-            return Current;
-        }
-
-	    /// <summary>
-	    /// A method used to create and ensure that a global ApplicationContext singleton is created.
-	    /// </summary>
-	    /// <param name="cache"></param>
-	    /// <param name="logger"></param>
-	    /// <param name="replaceContext">
-	    /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app
-	    /// startup if for some reason the boot manager is not the umbraco boot manager.
-	    /// </param>
-	    /// <param name="dbContext"></param>
-	    /// <param name="serviceContext"></param>
-	    /// <returns></returns>
-	    /// <remarks>
-	    /// This is NOT thread safe
-	    /// </remarks>
-        public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, ProfilingLogger logger, bool replaceContext)
-        {
-            if (Current != null)
-            {
-                if (!replaceContext)
-                    return Current;
-            }
-            var ctx = new ApplicationContext(dbContext, serviceContext, cache, logger);
-            Current = ctx;
-            return Current;
-        }
-
-	    /// <summary>
-    	/// Singleton accessor
-    	/// </summary>
-    	public static ApplicationContext Current { get; internal set; }
-
-        /// <summary>
-        /// Gets the scope provider.
-        /// </summary>
-        internal IScopeProvider ScopeProvider { get { return _databaseContext == null ? null : _databaseContext.ScopeProvider; } }
-
-		/// <summary>
-		/// Returns the application wide cache accessor
-		/// </summary>
-		/// <remarks>
-		/// Any caching that is done in the application (app wide) should be done through this property
-		/// </remarks>
-		public CacheHelper ApplicationCache { get; private set; }
-
-        /// <summary>
-        /// Exposes the global ProfilingLogger - this should generally not be accessed via the UmbracoContext and should normally just be exposed
-        /// on most base classes or injected with IoC
-        /// </summary>
-        public ProfilingLogger ProfilingLogger { get; private set; }
-
-	    // IsReady is set to true by the boot manager once it has successfully booted
-        // note - the original umbraco module checks on content.Instance in umbraco.dll
-        //   now, the boot task that setup the content store ensures that it is ready
-        bool _isReady = false;
-		readonly ManualResetEventSlim _isReadyEvent = new ManualResetEventSlim(false);
-		private DatabaseContext _databaseContext;
-		private ServiceContext _services;
-
-		public bool IsReady
-        {
-            get
-            {
-                return _isReady;
-            }
-            internal set
-            {
-                AssertIsNotReady();
-                _isReady = value;
-				_isReadyEvent.Set();
-            }
-        }
-
-		public bool WaitForReady(int timeout)
-		{
-			return _isReadyEvent.WaitHandle.WaitOne(timeout);
-		}
-
-
-        // notes
-        //   GlobalSettings.ConfigurationStatus returns the value that's in the web.config, so it's the "configured version"
-        //   GlobalSettings.CurrentVersion returns the hard-coded "current version"
-        //   the system is configured if they match
-        //   if they don't, install runs, updates web.config (presumably) and updates GlobalSettings.ConfiguredStatus
-
-        public bool IsConfigured
-        {
-            get { return _configured.Value; }
-        }
-
-        /// <summary>
-        /// If the db is configured, there is a database context and there is an umbraco schema, but we are not 'configured' , then it means we are upgrading
-        /// </summary>
-	    public bool IsUpgrading
-	    {
-            get
-            {
-                if (IsConfigured == false
-                    && DatabaseContext != null
-                    && DatabaseContext.IsDatabaseConfigured)
-                {
-                    var schemaresult = DatabaseContext.ValidateDatabaseSchema();
-                    if (schemaresult.ValidTables.Count > 0) return true;
-                }
-
-                return false;
-            }
-	    }
-
-	    /// <summary>
-        /// The application url.
-        /// </summary>
-        /// <remarks>
-        /// The application url is the url that should be used by services to talk to the application,
-        /// eg keep alive or scheduled publishing services. It must exist on a global context because
-        /// some of these services may not run within a web context.
-        /// The format of the application url is:
-        /// - has a scheme (http or https)
-        /// - has the SystemDirectories.Umbraco path
-        /// - does not end with a slash
-        /// It is initialized on the first request made to the server, by UmbracoModule.EnsureApplicationUrl:
-        /// - if umbracoSettings:settings/web.routing/@umbracoApplicationUrl is set, use the value (new setting)
-        /// - if umbracoSettings:settings/scheduledTasks/@baseUrl is set, use the value (backward compatibility)
-        /// - otherwise, use the url of the (first) request.
-        /// Not locking, does not matter if several threads write to this.
-        /// See also issues:
-        /// - http://issues.umbraco.org/issue/U4-2059
-        /// - http://issues.umbraco.org/issue/U4-6788
-        /// - http://issues.umbraco.org/issue/U4-5728
-        /// - http://issues.umbraco.org/issue/U4-5391
-        /// </remarks>
-        public string UmbracoApplicationUrl
-        {
-            get
-            {
-                ApplicationUrlHelper.EnsureApplicationUrl(this);
-                return _umbracoApplicationUrl;
-            }
-        }
-
-        /// <summary>
-        /// Resets the url.
-        /// </summary>
-        public void ResetUmbracoApplicationUrl()
-        {
-            _umbracoApplicationUrl = null;
-        }
-
-	    // ReSharper disable once InconsistentNaming
-	    internal string _umbracoApplicationUrl;
-
-        internal List<string> _umbracoApplicationDomains = new List<string>();
-
-        internal string _umbracoApplicationDeploymentId;
-
-        private Lazy<bool> _configured;
-        internal MainDom MainDom { get; private set; }
-
-	    private void Init()
-		{
-            MainDom = new MainDom(ProfilingLogger.Logger);
-            MainDom.Acquire();
-
-            //Create the lazy value to resolve whether or not the application is 'configured'
-            _configured = new Lazy<bool>(() =>
-            {
-                try
-                {
-                    var configStatus = ConfigurationStatus;
-                    var currentVersion = UmbracoVersion.GetSemanticVersion();
-
-                    var ok =
-                        //we are not configured if this is null
-                        string.IsNullOrWhiteSpace(configStatus) == false
-                        //they must match
-                        && configStatus == currentVersion;
-
-                    if (ok)
-                    {
-                        //The versions are the same in config, but are they the same in the database. We can only check this
-                        // if we have a db context available, if we don't then we are not installed anyways
-                        if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.CanConnect)
-                        {
-                            var found = Services.MigrationEntryService.FindEntry(Constants.System.UmbracoMigrationName, UmbracoVersion.GetSemanticVersion());
-                            if (found == null)
-                            {
-                                //we haven't executed this migration in this environment, so even though the config versions match,
-                                // this db has not been updated.
-                                ProfilingLogger.Logger.Debug<ApplicationContext>(string.Format("The migration for version: '{0} has not been executed, there is no record in the database", currentVersion.ToSemanticString()));
-                                ok = false;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        ProfilingLogger.Logger.Debug<ApplicationContext>(string.Format("CurrentVersion different from configStatus: '{0}','{1}'", currentVersion.ToSemanticString(), configStatus));
-                    }
-
-                    return ok;
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.Error<ApplicationContext>("Error determining if application is configured, returning false", ex);
-                    return false;
-                }
-
-            });
-		}
-
-		private string ConfigurationStatus
-		{
-			get
-			{
-				try
-				{
-					return ConfigurationManager.AppSettings["umbracoConfigurationStatus"];
-				}
-				catch
-				{
-					return String.Empty;
-				}
-			}
-		}
-
-        /// <summary>
-        /// Gets the Current Version of the Umbraco Site before an upgrade
-        /// by using the last/most recent Umbraco Migration that has been run
-        /// </summary>
-        /// <returns>A SemVersion of the latest Umbraco DB Migration run</returns>
-        /// <remarks>
-        /// NOTE: This existed in the InstallHelper previously but should really be here so it can be re-used if necessary
-        /// </remarks>
-        internal SemVersion CurrentVersion()
-        {
-            //Set a default version of 0.0.0
-            var version = new SemVersion(0);
-
-            //If we have a db context available, if we don't then we are not installed anyways
-            if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.CanConnect)
-                version = DatabaseContext.ValidateDatabaseSchema().DetermineInstalledVersionByMigrations(Services.MigrationEntryService);
-
-            if (version != new SemVersion(0))
-                return version;
-
-            // If we aren't able to get a result from the umbracoMigrations table then use the version in web.config, if it's available
-            if (string.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus))
-                return version;
-
-            var configuredVersion = GlobalSettings.ConfigurationStatus;
-
-            string currentComment = null;
-
-            var current = configuredVersion.Split('-');
-            if (current.Length > 1)
-                currentComment = current[1];
-
-            Version currentVersion;
-            if (Version.TryParse(current[0], out currentVersion))
-            {
-                version = new SemVersion(
-                    currentVersion.Major,
-                    currentVersion.Minor,
-                    currentVersion.Build,
-                    string.IsNullOrWhiteSpace(currentComment) ? null : currentComment,
-                    currentVersion.Revision > 0 ? currentVersion.Revision.ToString() : null);
-            }
-
-            return version;
-        }
-
-        private void AssertIsNotReady()
-        {
-            if (this.IsReady)
-                throw new Exception("ApplicationContext has already been initialized.");
-        }
-
-		/// <summary>
-		/// Gets the current DatabaseContext
-		/// </summary>
-		/// <remarks>
-		/// Internal set is generally only used for unit tests
-		/// </remarks>
-		public DatabaseContext DatabaseContext
-		{
-			get
-			{
-				if (_databaseContext == null)
-					throw new InvalidOperationException("The DatabaseContext has not been set on the ApplicationContext");
-				return _databaseContext;
-			}
-			internal set { _databaseContext = value; }
-		}
-
-		/// <summary>
-		/// Gets the current ServiceContext
-		/// </summary>
-		/// <remarks>
-		/// Internal set is generally only used for unit tests
-		/// </remarks>
-		public ServiceContext Services
-		{
-			get
-			{
-				if (_services == null)
-					throw new InvalidOperationException("The ServiceContext has not been set on the ApplicationContext");
-				return _services;
-			}
-			internal set { _services = value; }
-		}
-
-	    internal ServerRole GetCurrentServerRole()
-	    {
-	        var registrar = ServerRegistrarResolver.Current.Registrar as IServerRegistrar2;
-            return registrar == null ? ServerRole.Unknown : registrar.GetCurrentServerRole();
-	    }
-
-        private volatile bool _disposed;
-        private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
-
-        /// <summary>
-        /// This will dispose and reset all resources used to run the application
-        /// </summary>
-        /// <remarks>
-        /// IMPORTANT: Never dispose this object if you require the Umbraco application to run, disposing this object
-        /// is generally used for unit testing and when your application is shutting down after you have booted Umbraco.
-        /// </remarks>
-        void IDisposable.Dispose()
-        {
-            // Only operate if we haven't already disposed
-            if (_disposed) return;
-
-            using (new WriteLock(_disposalLocker))
-            {
-                // Check again now we're inside the lock
-                if (_disposed) return;
-
-                //clear the cache
-                if (ApplicationCache != null)
-                {
-                    ApplicationCache.RuntimeCache.ClearAllCache();
-                    ApplicationCache.IsolatedRuntimeCache.ClearAllCaches();
-                }
-                //reset all resolvers
-                ResolverCollection.ResetAll();
-                //reset resolution itself (though this should be taken care of by resetting any of the resolvers above)
-                Resolution.Reset();
-
-                //reset the instance objects
-                this.ApplicationCache = null;
-                if (_databaseContext != null) //need to check the internal field here
-                {
-                    if (_databaseContext.ScopeProvider.AmbientScope != null)
-                    {
-                        var scope = _databaseContext.ScopeProvider.AmbientScope;
-                        scope.Dispose();
-                    }
-                    /*
-                    if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.Database != null)
-                    {
-                        DatabaseContext.Database.Dispose();
-                    }
-                    */
-                }
-                this.DatabaseContext = null;
-                this.Services = null;
-                this._isReady = false; //set the internal field
-
-                // Indicate that the instance has been disposed.
-                _disposed = true;
-            }
-        }
-    }
-}

src/Umbraco.Core/ApplicationEventHandler.cs

@@ -1,119 +0,0 @@
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// A plugin type that allows developers to execute code during the Umbraco bootup process
-    /// </summary>
-    /// <remarks>
-    /// Allows you to override the methods that you would like to execute code for: ApplicationInitialized, ApplicationStarting, ApplicationStarted.
-    /// 
-    /// By default none of these methods will execute if the Umbraco application is not configured or if the Umbraco database is not configured, however
-    /// if you need these methods to execute even if either of these are not configured you can override the properties: 
-    /// ExecuteWhenApplicationNotConfigured and ExecuteWhenDatabaseNotConfigured
-    /// </remarks>
-    public abstract class ApplicationEventHandler : IApplicationEventHandler
-    {
-        public void OnApplicationInitialized(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            if (ShouldExecute(applicationContext))
-            {
-                ApplicationInitialized(umbracoApplication, applicationContext);
-            }
-        }
-
-        public void OnApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            if (ShouldExecute(applicationContext))
-            {
-                ApplicationStarting(umbracoApplication, applicationContext);
-            }
-        }
-
-        public void OnApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            if (ShouldExecute(applicationContext))
-            {
-                ApplicationStarted(umbracoApplication, applicationContext);
-            }
-        }
-
-        /// <summary>
-        /// Overridable method to execute when the ApplicationContext is created and other static objects that require initialization have been setup
-        /// </summary>
-        /// <param name="umbracoApplication"></param>
-        /// <param name="applicationContext"></param>
-        protected virtual void ApplicationInitialized(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            
-        }
-
-        /// <summary>
-        /// Overridable method to execute when All resolvers have been initialized but resolution is not frozen so they can be modified in this method
-        /// </summary>
-        /// <param name="umbracoApplication"></param>
-        /// <param name="applicationContext"></param>
-        protected virtual void ApplicationStarting(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-
-        }
-
-        /// <summary>
-        /// Overridable method to execute when Bootup is completed, this allows you to perform any other bootup logic required for the application.
-        /// Resolution is frozen so now they can be used to resolve instances.
-        /// </summary>
-        /// <param name="umbracoApplication"></param>
-        /// <param name="applicationContext"></param>
-        protected virtual void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-
-        }
-
-        /// <summary>
-        /// Determine if the methods should execute based on the configuration status of the application.
-        /// </summary>
-        /// <param name="applicationContext"></param>
-        /// <returns></returns>
-        private bool ShouldExecute(ApplicationContext applicationContext)
-        {
-            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.IsDatabaseConfigured)
-            {
-                return true;
-            }
-
-            if (!applicationContext.IsConfigured && ExecuteWhenApplicationNotConfigured)
-            {
-                return true;
-            }
-
-            if (!applicationContext.DatabaseContext.IsDatabaseConfigured && ExecuteWhenDatabaseNotConfigured)
-            {
-                return true;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// A flag to determine if the overridable methods for this class will execute even if the 
-        /// Umbraco application is not configured
-        /// </summary>
-        /// <remarks>
-        /// An Umbraco Application is not configured when it requires a new install or upgrade. When the latest version in the
-        /// assembly does not match the version in the config.
-        /// </remarks>
-        protected virtual bool ExecuteWhenApplicationNotConfigured
-        {
-            get { return false; }
-        }
-
-        /// <summary>
-        /// A flag to determine if the overridable methods for this class will execute even if the 
-        /// Umbraco database is not configured
-        /// </summary>
-        /// <remarks>
-        /// The Umbraco database is not configured when we cannot connect to the database or when the database tables are not installed.
-        /// </remarks>
-        protected virtual bool ExecuteWhenDatabaseNotConfigured
-        {
-            get { return false; }
-        }
-    }
-}

src/Umbraco.Core/AssemblyExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -6,20 +6,20 @@ using System.Reflection;
 
 namespace Umbraco.Core
 {
-	internal static class AssemblyExtensions
-	{
-		/// <summary>
-		/// Returns the file used to load the assembly
-		/// </summary>
-		/// <param name="assembly"></param>
-		/// <returns></returns>
-		public static FileInfo GetAssemblyFile(this Assembly assembly)
-		{
-			var codeBase = assembly.CodeBase;
-			var uri = new Uri(codeBase);
-			var path = uri.LocalPath;
-			return new FileInfo(path);
-		}
+    internal static class AssemblyExtensions
+    {
+        /// <summary>
+        /// Returns the file used to load the assembly
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <returns></returns>
+        public static FileInfo GetAssemblyFile(this Assembly assembly)
+        {
+            var codeBase = assembly.CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            return new FileInfo(path);
+        }
 
         /// <summary>
         /// Returns true if the assembly is the App_Code assembly
@@ -49,24 +49,24 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="assembly"></param>
         /// <returns></returns>
-	    public static bool IsGlobalAsaxAssembly(this Assembly assembly)
-	    {
+        public static bool IsGlobalAsaxAssembly(this Assembly assembly)
+        {
             //only way I can figure out how to test is by the name
             return assembly.FullName.StartsWith("App_global.asax");
-	    }
+        }
 
-	    /// <summary>
-		///  Returns the file used to load the assembly
-		/// </summary>
-		/// <param name="assemblyName"></param>
-		/// <returns></returns>
-		public static FileInfo GetAssemblyFile(this AssemblyName assemblyName)
-		{
-			var codeBase = assemblyName.CodeBase;
-			var uri = new Uri(codeBase);
-			var path = uri.LocalPath;
-			return new FileInfo(path);
-		}
+        /// <summary>
+        ///  Returns the file used to load the assembly
+        /// </summary>
+        /// <param name="assemblyName"></param>
+        /// <returns></returns>
+        public static FileInfo GetAssemblyFile(this AssemblyName assemblyName)
+        {
+            var codeBase = assemblyName.CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            return new FileInfo(path);
+        }
 
-	}
-}
+    }
+}

src/Umbraco.Core/AsyncLock.cs

@@ -69,11 +69,11 @@ namespace Umbraco.Core
 
         public Task<IDisposable> LockAsync()
         {
-            var wait = _semaphore != null 
+            var wait = _semaphore != null
                 ? _semaphore.WaitAsync()
                 : _semaphore2.WaitOneAsync();
 
-            return wait.IsCompleted 
+            return wait.IsCompleted
                 ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
                 : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
                     this, CancellationToken.None,
@@ -112,7 +112,7 @@ namespace Umbraco.Core
             return _releaser ?? CreateReleaser(); // anonymous vs named
         }
 
-        // note - before making those classes some structs, read 
+        // note - before making those classes some structs, read
         // about "impure methods" and mutating readonly structs...
 
         private class NamedSemaphoreReleaser : CriticalFinalizerObject, IDisposable
@@ -140,9 +140,9 @@ namespace Umbraco.Core
                 _semaphore.Dispose();
             }
 
-            // we WANT to release the semaphore because it's a system object, ie a critical 
+            // we WANT to release the semaphore because it's a system object, ie a critical
             // non-managed resource - and if it is not released then noone else can acquire
-            // the lock - so we inherit from CriticalFinalizerObject which means that the 
+            // the lock - so we inherit from CriticalFinalizerObject which means that the
             // finalizer "should" run in all situations - there is always a chance that it
             // does not run and the semaphore remains "acquired" but then chances are the
             // whole process (w3wp.exe...) is going down, at which point the semaphore will
@@ -200,4 +200,4 @@ namespace Umbraco.Core
             }
         }
     }
-}
+}

src/Umbraco.Core/Attempt.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Umbraco.Core
 {
@@ -7,160 +7,120 @@ namespace Umbraco.Core
     /// </summary>
     public static class Attempt
     {
+        // note:
+        // 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>
         /// Creates a successful attempt with a result.
         /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
         /// <param name="result">The result of the attempt.</param>
         /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed<T>(T result)
+        public static Attempt<TResult> Succeed<TResult>(TResult result)
         {
-            return Attempt<T>.Succeed(result);
+            return Attempt<TResult>.Succeed(result);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result and a status.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<TResult, TStatus> SucceedWithStatus<TResult, TStatus>(TStatus status, TResult result)
+        {
+            return Attempt<TResult, TStatus>.Succeed(status, result);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult> Fail<TResult>()
+        {
+            return Attempt<TResult>.Fail();
         }
 
         /// <summary>
         /// Creates a failed attempt with a result.
         /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
         /// <param name="result">The result of the attempt.</param>
         /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail<T>(T result)
+        public static Attempt<TResult> Fail<TResult>(TResult result)
         {
-            return Attempt<T>.Fail(result);
+            return Attempt<TResult>.Fail(result);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and a status.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult, TStatus> FailWithStatus<TResult, TStatus>(TStatus status, TResult result)
+        {
+            return Attempt<TResult, TStatus>.Fail(status, result);
         }
 
         /// <summary>
         /// Creates a failed attempt with a result and an exception.
         /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
         /// <param name="result">The result of the attempt.</param>
         /// <param name="exception">The exception causing the failure of the attempt.</param>
         /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail<T>(T result, Exception exception)
+        public static Attempt<TResult> Fail<TResult>(TResult result, Exception exception)
         {
-            return Attempt<T>.Fail(result, exception);
+            return Attempt<TResult>.Fail(result, exception);
+        }
+
+
+        /// <summary>
+        /// Creates a failed attempt with a result, an exception and a status.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult, TStatus> FailWithStatus<TResult, TStatus>(TStatus status, TResult result, Exception exception)
+        {
+            return Attempt<TResult, TStatus>.Fail(status, result, exception);
         }
 
         /// <summary>
         /// Creates a successful or a failed attempt, with a result.
         /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-        /// <param name="success">A value indicating whether the attempt is successful.</param>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
         /// <param name="result">The result of the attempt.</param>
         /// <returns>The attempt.</returns>
-        public static Attempt<T> If<T>(bool success, T result)
+        public static Attempt<TResult> If<TResult>(bool condition, TResult result)
         {
-            return Attempt<T>.SucceedIf(success, result);
-        }
-
-
-        /// <summary>
-        /// Executes an attempt function, with callbacks.
-        /// </summary>
-        /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-        /// <param name="attempt">The attempt returned by the attempt function.</param>
-        /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
-        /// <param name="onFail">An action to execute in case the attempt fails.</param>
-        /// <returns>The outcome of the attempt.</returns>
-        /// <remarks>Runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
-        /// whether the attempt function reports a success or a failure.</remarks>
-        public static Outcome Try<T>(Attempt<T> attempt, Action<T> onSuccess, Action<Exception> onFail = null)
-        {
-            if (attempt.Success)
-            {
-                onSuccess(attempt.Result);
-                return Outcome.Success;
-            }
-
-            if (onFail != null)
-            {
-                onFail(attempt.Exception);
-            }
-
-            return Outcome.Failure;
+            return Attempt<TResult>.If(condition, result);
         }
 
         /// <summary>
-        /// Represents the outcome of an attempt.
+        /// Creates a successful or a failed attempt, with a result.
         /// </summary>
-        /// <remarks>Can be a success or a failure, and allows for attempts chaining.</remarks>
-        public struct Outcome
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="succStatus">The status of the successful attempt.</param>
+        /// <param name="failStatus">The status of the failed attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<TResult, TStatus> IfWithStatus<TResult, TStatus>(bool condition, TStatus succStatus, TStatus failStatus, TResult result)
         {
-            private readonly bool _success;
-
-            /// <summary>
-            /// Gets an outcome representing a success.
-            /// </summary>
-            public static readonly Outcome Success = new Outcome(true);
-
-            /// <summary>
-            /// Gets an outcome representing a failure.
-            /// </summary>
-            public static readonly Outcome Failure = new Outcome(false);
-
-            private Outcome(bool success)
-            {
-                _success = success;
-            }
-
-            /// <summary>
-            /// Executes another attempt function, if the previous one failed, with callbacks.
-            /// </summary>
-            /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-            /// <param name="nextFunction">The attempt function to execute, returning an attempt.</param>
-            /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
-            /// <param name="onFail">An action to execute in case the attempt fails.</param>
-            /// <returns>If it executes, returns the outcome of the attempt, else returns a success outcome.</returns>
-            /// <remarks>
-            /// <para>Executes only if the previous attempt failed, else does not execute and return a success outcome.</para>
-            /// <para>If it executes, then runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
-            /// whether the attempt function reports a success or a failure.</para>
-            /// </remarks>
-            public Outcome OnFailure<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
-            {
-                return _success
-                    ? Success
-                    : ExecuteNextFunction(nextFunction, onSuccess, onFail);
-            }
-
-            /// <summary>
-            /// Executes another attempt function, if the previous one succeeded, with callbacks.
-            /// </summary>
-            /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-            /// <param name="nextFunction">The attempt function to execute, returning an attempt.</param>
-            /// <param name="onSuccess">An action to execute in case the attempt succeeds.</param>
-            /// <param name="onFail">An action to execute in case the attempt fails.</param>
-            /// <returns>If it executes, returns the outcome of the attempt, else returns a failed outcome.</returns>
-            /// <remarks>
-            /// <para>Executes only if the previous attempt succeeded, else does not execute and return a success outcome.</para>
-            /// <para>If it executes, then runs <paramref name="onSuccess"/> or <paramref name="onFail"/> depending on the
-            /// whether the attempt function reports a success or a failure.</para>
-            /// </remarks>
-            public Outcome OnSuccess<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
-            {
-                return _success
-                    ? ExecuteNextFunction(nextFunction, onSuccess, onFail) 
-                    : Failure;
-            }
-
-            private static Outcome ExecuteNextFunction<T>(Func<Attempt<T>> nextFunction, Action<T> onSuccess, Action<Exception> onFail = null)
-            {
-                var attempt = nextFunction();
-
-                if (attempt.Success)
-                {
-                    onSuccess(attempt.Result);
-                    return Success;
-                }
-
-                if (onFail != null)
-                {
-                    onFail(attempt.Exception);
-                }
-
-                return Failure;
-            }
+            return Attempt<TResult, TStatus>.If(condition, succStatus, failStatus, result);
         }
-
     }
-}
+}

src/Umbraco.Core/AttemptOfTResult.cs

@@ -0,0 +1,133 @@
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Represents the result of an operation attempt.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+    [Serializable]
+    public struct Attempt<TResult>
+    {
+        // private - use Succeed() or Fail() methods to create attempts
+        private Attempt(bool success, TResult result, Exception exception)
+        {
+            Success = success;
+            Result = result;
+            Exception = exception;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="Attempt{TResult}"/> was successful.
+        /// </summary>
+        public bool Success { get; }
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        public Exception Exception { get; }
+
+        /// <summary>
+        /// Gets the attempt result.
+        /// </summary>
+        public TResult Result { get; }
+
+        /// <summary>
+        /// Gets the attempt result, if successful, else a default value.
+        /// </summary>
+        public TResult ResultOr(TResult value) => Success ? Result : value;
+
+        // optimize, use a singleton failed attempt
+        private static readonly Attempt<TResult> Failed = new Attempt<TResult>(false, default(TResult), null);
+
+        /// <summary>
+        /// Creates a successful attempt.
+        /// </summary>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<TResult> Succeed()
+        {
+            return new Attempt<TResult>(true, default(TResult), null);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<TResult> Succeed(TResult result)
+        {
+            return new Attempt<TResult>(true, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult> Fail()
+        {
+            return Failed;
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult> Fail(Exception exception)
+        {
+            return new Attempt<TResult>(false, default(TResult), exception);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult> Fail(TResult result)
+        {
+            return new Attempt<TResult>(false, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult> Fail(TResult result, Exception exception)
+        {
+            return new Attempt<TResult>(false, result, exception);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<TResult> If(bool condition)
+        {
+            return condition ? new Attempt<TResult>(true, default(TResult), null) : Failed;
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<TResult> If(bool condition, TResult result)
+        {
+            return new Attempt<TResult>(condition, result, null);
+        }
+
+        /// <summary>
+        /// Implicity operator to check if the attempt was successful without having to access the 'success' property
+        /// </summary>
+        /// <param name="a"></param>
+        /// <returns></returns>
+        public static implicit operator bool(Attempt<TResult> a)
+        {
+            return a.Success;
+        }
+    }
+}

src/Umbraco.Core/AttemptOfTResultTStatus.cs

@@ -0,0 +1,142 @@
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Represents the result of an operation attempt.
+    /// </summary>
+    /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+    /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+    [Serializable]
+    public struct Attempt<TResult, TStatus>
+    {
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="Attempt{TResult,TStatus}"/> was successful.
+        /// </summary>
+        public bool Success { get; }
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        public Exception Exception { get; }
+
+        /// <summary>
+        /// Gets the attempt result.
+        /// </summary>
+        public TResult Result { get; }
+
+        /// <summary>
+        /// Gets the attempt status.
+        /// </summary>
+        public TStatus Status { get; }
+
+        // private - use Succeed() or Fail() methods to create attempts
+        private Attempt(bool success, TResult result, TStatus status, Exception exception)
+        {
+            Success = success;
+            Result = result;
+            Status = status;
+            Exception = exception;
+        }
+
+        /// <summary>
+        /// Creates a successful attempt.
+        /// </summary>
+        /// <param name="status">The status of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<TResult, TStatus> Succeed(TStatus status)
+        {
+            return new Attempt<TResult, TStatus>(true, default(TResult), status, null);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<TResult, TStatus> Succeed(TStatus status, TResult result)
+        {
+            return new Attempt<TResult, TStatus>(true, result, status, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <param name="status">The status of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult, TStatus> Fail(TStatus status)
+        {
+            return new Attempt<TResult, TStatus>(false, default(TResult), status, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with an exception.
+        /// </summary>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult, TStatus> Fail(TStatus status, Exception exception)
+        {
+            return new Attempt<TResult, TStatus>(false, default(TResult), status, exception);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult, TStatus> Fail(TStatus status, TResult result)
+        {
+            return new Attempt<TResult, TStatus>(false, result, status, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult, TStatus> Fail(TStatus status, TResult result, Exception exception)
+        {
+            return new Attempt<TResult, TStatus>(false, result, status, exception);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="succStatus">The status of the successful attempt.</param>
+        /// <param name="failStatus">The status of the failed attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<TResult, TStatus> If(bool condition, TStatus succStatus, TStatus failStatus)
+        {
+            return new Attempt<TResult, TStatus>(condition, default(TResult), condition ? succStatus : failStatus, null);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="succStatus">The status of the successful attempt.</param>
+        /// <param name="failStatus">The status of the failed attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<TResult, TStatus> If(bool condition, TStatus succStatus, TStatus failStatus, TResult result)
+        {
+            return new Attempt<TResult, TStatus>(condition, result, condition ? succStatus : failStatus, null);
+        }
+
+        /// <summary>
+        /// Implicity operator to check if the attempt was successful without having to access the 'success' property
+        /// </summary>
+        /// <param name="a"></param>
+        /// <returns></returns>
+        public static implicit operator bool(Attempt<TResult, TStatus> a)
+        {
+            return a.Success;
+        }
+    }
+}

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

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

src/Umbraco.Core/Auditing/Audit.cs

@@ -1,17 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core.Auditing
-{
-    [Obsolete("Use Umbraco.Core.Services.IAuditService instead")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class Audit
-    {
-        public static void Add(Umbraco.Core.Auditing.AuditTypes type, string comment, int userId, int objectId)
-         {
-             ApplicationContext.Current.Services.AuditService.Add(
-                 Enum<Umbraco.Core.Models.AuditType>.Parse(type.ToString()), 
-                 comment, userId, objectId);
-         }
-    }
-}

src/Umbraco.Core/Auditing/AuditEventHandler.cs

@@ -1,351 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Web;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Security;
-using Umbraco.Core.Services;
-
-namespace Umbraco.Core.Auditing
-{
-    public sealed class AuditEventHandler : ApplicationEventHandler
-    {
-        private IAuditService _auditServiceInstance;
-        private IUserService _userServiceInstance;
-        private IEntityService _entityServiceInstance;
-
-        private IUser CurrentPerformingUser
-        {
-            get
-            {
-                var identity = Thread.CurrentPrincipal?.GetUmbracoIdentity();
-                return identity == null
-                    ? new User { Id = 0, Name = "SYSTEM", Email = "" }
-                    : _userServiceInstance.GetUserById(Convert.ToInt32(identity.Id));
-            }
-        }
-
-        private IUser GetPerformingUser(int userId)
-        {
-            var found = userId >= 0 ? _userServiceInstance.GetUserById(userId) : null;
-            return found ?? new User {Id = 0, Name = "SYSTEM", Email = ""};
-        }
-
-        private string PerformingIp
-        {
-            get
-            {
-                var httpContext = HttpContext.Current == null ? (HttpContextBase) null : new HttpContextWrapper(HttpContext.Current);
-                var ip = httpContext.GetCurrentRequestIpAddress();
-                if (ip.ToLowerInvariant().StartsWith("unknown")) ip = "";
-                return ip;
-            }
-        }
-
-        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {
-            _auditServiceInstance = applicationContext.Services.AuditService;
-            _userServiceInstance = applicationContext.Services.UserService;
-            _entityServiceInstance = applicationContext.Services.EntityService;
-
-            //BackOfficeUserManager.AccountLocked += ;
-            //BackOfficeUserManager.AccountUnlocked += ;
-            BackOfficeUserManager.ForgotPasswordRequested += OnForgotPasswordRequest;
-            BackOfficeUserManager.ForgotPasswordChangedSuccess += OnForgotPasswordChange;
-            BackOfficeUserManager.LoginFailed += OnLoginFailed;
-            //BackOfficeUserManager.LoginRequiresVerification += ;
-            BackOfficeUserManager.LoginSuccess += OnLoginSuccess;
-            BackOfficeUserManager.LogoutSuccess += OnLogoutSuccess;
-            BackOfficeUserManager.PasswordChanged += OnPasswordChanged;
-            BackOfficeUserManager.PasswordReset += OnPasswordReset;
-            //BackOfficeUserManager.ResetAccessFailedCount += ;
-
-            UserService.SavedUserGroup2 += OnSavedUserGroupWithUsers;
-
-            UserService.SavedUser += OnSavedUser;
-            UserService.DeletedUser += OnDeletedUser;
-            UserService.UserGroupPermissionsAssigned += UserGroupPermissionAssigned;
-
-            MemberService.Saved += OnSavedMember;
-            MemberService.Deleted += OnDeletedMember;
-            MemberService.AssignedRoles += OnAssignedRoles;
-            MemberService.RemovedRoles += OnRemovedRoles;
-            MemberService.Exported += OnMemberExported;
-        }
-
-        private string FormatEmail(IMember member)
-        {
-            return member == null ? string.Empty : member.Email.IsNullOrWhiteSpace() ? "" : $"<{member.Email}>";
-        }
-
-        private string FormatEmail(IUser user)
-        {
-            return user == null ? string.Empty : user.Email.IsNullOrWhiteSpace() ? "" : $"<{user.Email}>";
-        }
-
-        private void OnRemovedRoles(IMemberService sender, RolesEventArgs args)
-        {
-            var performingUser = CurrentPerformingUser;
-            var roles = string.Join(", ", args.Roles);
-            var members = sender.GetAllMembers(args.MemberIds).ToDictionary(x => x.Id, x => x);
-            foreach (var id in args.MemberIds)
-            {
-                members.TryGetValue(id, out var member);
-                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                    DateTime.UtcNow,
-                    -1, $"Member {id} \"{member?.Name ?? "(unknown)"}\" {FormatEmail(member)}",
-                    "umbraco/member/roles/removed", $"roles modified, removed {roles}");
-            }
-        }
-
-        private void OnAssignedRoles(IMemberService sender, RolesEventArgs args)
-        {
-            var performingUser = CurrentPerformingUser;
-            var roles = string.Join(", ", args.Roles);
-            var members = sender.GetAllMembers(args.MemberIds).ToDictionary(x => x.Id, x => x);
-            foreach (var id in args.MemberIds)
-            {
-                members.TryGetValue(id, out var member);
-                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                    DateTime.UtcNow,
-                    -1, $"Member {id} \"{member?.Name ?? "(unknown)"}\" {FormatEmail(member)}",
-                    "umbraco/member/roles/assigned", $"roles modified, assigned {roles}");
-            }
-        }
-
-        private void OnMemberExported(IMemberService sender, ExportedMemberEventArgs exportedMemberEventArgs)
-        {
-            var performingUser = CurrentPerformingUser;
-            var member = exportedMemberEventArgs.Member;
-
-            _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                DateTime.UtcNow,
-                -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
-                "umbraco/member/exported", "exported member data");
-        }
-
-        private void OnSavedUserGroupWithUsers(IUserService sender, SaveEventArgs<UserGroupWithUsers> saveEventArgs)
-        {
-            var performingUser = CurrentPerformingUser;
-            foreach (var groupWithUser in saveEventArgs.SavedEntities)
-            {
-                var group = groupWithUser.UserGroup;
-
-                var dp = string.Join(", ", ((UserGroup)group).GetPreviouslyDirtyProperties());
-                var sections = ((UserGroup)group).WasPropertyDirty("AllowedSections")
-                    ? string.Join(", ", group.AllowedSections)
-                    : null;
-                var perms = ((UserGroup)group).WasPropertyDirty("Permissions")
-                    ? string.Join(", ", group.Permissions)
-                    : null;
-
-                var sb = new StringBuilder();
-                sb.Append($"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)};");
-                if (sections != null)
-                    sb.Append($", assigned sections: {sections}");
-                if (perms != null)
-                {
-                    if (sections != null)
-                        sb.Append(", ");
-                    sb.Append($"default perms: {perms}");
-                }
-
-                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                    DateTime.UtcNow,
-                    -1, $"User Group {group.Id} \"{group.Name}\" ({group.Alias})",
-                    "umbraco/user-group/save", $"{sb}");
-
-                // now audit the users that have changed
-
-                foreach (var user in groupWithUser.RemovedUsers)
-                {
-                    _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                        DateTime.UtcNow,
-                        user.Id, $"User \"{user.Name}\" {FormatEmail(user)}",
-                        "umbraco/user-group/save", $"Removed user \"{user.Name}\" {FormatEmail(user)} from group {group.Id} \"{group.Name}\" ({group.Alias})");
-                }
-
-                foreach (var user in groupWithUser.AddedUsers)
-                {
-                    _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                        DateTime.UtcNow,
-                        user.Id, $"User \"{user.Name}\" {FormatEmail(user)}",
-                        "umbraco/user-group/save", $"Added user \"{user.Name}\" {FormatEmail(user)} to group {group.Id} \"{group.Name}\" ({group.Alias})");
-                }
-            }
-        }
-
-        private void UserGroupPermissionAssigned(IUserService sender, SaveEventArgs<EntityPermission> saveEventArgs)
-        {
-            var performingUser = CurrentPerformingUser;
-            var perms = saveEventArgs.SavedEntities;
-            foreach (var perm in perms)
-            {
-                var group = sender.GetUserGroupById(perm.UserGroupId);
-                var assigned = string.Join(", ", perm.AssignedPermissions);
-                var entity = _entityServiceInstance.Get(perm.EntityId);
-
-                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                    DateTime.UtcNow,
-                    -1, $"User Group {group.Id} \"{group.Name}\" ({group.Alias})",
-                    "umbraco/user-group/permissions-change", $"assigning {(string.IsNullOrWhiteSpace(assigned) ? "(nothing)" : assigned)} on id:{perm.EntityId} \"{entity.Name}\"");
-            }
-        }
-
-        private void OnSavedMember(IMemberService sender, SaveEventArgs<IMember> saveEventArgs)
-        {
-            var performingUser = CurrentPerformingUser;
-            var members = saveEventArgs.SavedEntities;
-            foreach (var member in members)
-            {
-                var dp = string.Join(", ", ((Member) member).GetPreviouslyDirtyProperties());
-
-                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                    DateTime.UtcNow,
-                    -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
-                    "umbraco/member/save", $"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)}");
-            }
-        }
-
-        private void OnDeletedMember(IMemberService sender, DeleteEventArgs<IMember> deleteEventArgs)
-        {
-            var performingUser = CurrentPerformingUser;
-            var members = deleteEventArgs.DeletedEntities;
-            foreach (var member in members)
-            {
-                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                    DateTime.UtcNow,
-                    -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
-                    "umbraco/member/delete", $"delete member id:{member.Id} \"{member.Name}\" {FormatEmail(member)}");
-            }
-        }
-
-        private void OnSavedUser(IUserService sender, SaveEventArgs<IUser> saveEventArgs)
-        {
-            var performingUser = CurrentPerformingUser;
-            var affectedUsers = saveEventArgs.SavedEntities;
-            foreach (var affectedUser in affectedUsers)
-            {
-                var groups = affectedUser.WasPropertyDirty("Groups")
-                    ? string.Join(", ", affectedUser.Groups.Select(x => x.Alias))
-                    : null;
-
-                var dp = string.Join(", ", ((User)affectedUser).GetPreviouslyDirtyProperties());
-
-                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                    DateTime.UtcNow,
-                    affectedUser.Id, $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}",
-                    "umbraco/user/save", $"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)}{(groups == null ? "" : "; groups assigned: " + groups)}");
-            }
-        }
-
-        private void OnDeletedUser(IUserService sender, DeleteEventArgs<IUser> deleteEventArgs)
-        {
-            var performingUser = CurrentPerformingUser;
-            var affectedUsers = deleteEventArgs.DeletedEntities;
-            foreach (var affectedUser in affectedUsers)
-                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
-                    DateTime.UtcNow,
-                    affectedUser.Id, $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}",
-                    "umbraco/user/delete", "delete user");
-        }
-
-        private void OnLoginSuccess(object sender, EventArgs args)
-        {
-            if (args is IdentityAuditEventArgs identityArgs)
-            {
-                var performingUser = GetPerformingUser(identityArgs.PerformingUser);
-                WriteAudit(performingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/sign-in/login", "login success");
-            }
-        }
-
-        private void OnLogoutSuccess(object sender, EventArgs args)
-        {
-            if (args is IdentityAuditEventArgs identityArgs)
-            {
-                var performingUser = GetPerformingUser(identityArgs.PerformingUser);
-                WriteAudit(performingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/sign-in/logout", "logout success");
-            }
-        }
-
-        private void OnPasswordReset(object sender, EventArgs args)
-        {
-            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
-            {
-                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/reset", "password reset");
-            }
-        }
-
-        private void OnPasswordChanged(object sender, EventArgs args)
-        {
-            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
-            {
-                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/change", "password change");
-            }
-        }
-
-        private void OnLoginFailed(object sender, EventArgs args)
-        {
-            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
-            {
-                WriteAudit(identityArgs.PerformingUser, 0, identityArgs.IpAddress, "umbraco/user/sign-in/failed", "login failed", affectedDetails: "");
-            }
-        }
-
-        private void OnForgotPasswordChange(object sender, EventArgs args)
-        {
-            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
-            {
-                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/forgot/change", "password forgot/change");
-            }
-        }
-
-        private void OnForgotPasswordRequest(object sender, EventArgs args)
-        {
-            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
-            {
-                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/forgot/request", "password forgot/request");
-            }
-        }
-
-        private void WriteAudit(int performingId, int affectedId, string ipAddress, string eventType, string eventDetails, string affectedDetails = null)
-        {
-            var performingUser = _userServiceInstance.GetUserById(performingId);
-
-            var performingDetails = performingUser == null
-                ? $"User UNKNOWN:{performingId}"
-                : $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}";
-
-            WriteAudit(performingId, performingDetails, affectedId, ipAddress, eventType, eventDetails, affectedDetails);
-        }
-
-        private void WriteAudit(IUser performingUser, int affectedId, string ipAddress, string eventType, string eventDetails)
-        {
-            var performingDetails = performingUser == null
-                ? $"User UNKNOWN"
-                : $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}";
-
-            WriteAudit(performingUser?.Id ?? 0, performingDetails, affectedId, ipAddress, eventType, eventDetails);
-        }
-
-        private void WriteAudit(int performingId, string performingDetails, int affectedId, string ipAddress, string eventType, string eventDetails, string affectedDetails = null)
-        {
-            if (affectedDetails == null)
-            {
-                var affectedUser = _userServiceInstance.GetUserById(affectedId);
-                affectedDetails = affectedUser == null
-                    ? $"User UNKNOWN:{affectedId}"
-                    : $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}";
-            }
-
-            _auditServiceInstance.Write(performingId, performingDetails,
-                ipAddress,
-                DateTime.UtcNow,
-                affectedId, affectedDetails,
-                eventType, eventDetails);
-        }
-    }
-}

src/Umbraco.Core/Auditing/AuditEventsComponent.cs

@@ -0,0 +1,353 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Web;
+using Umbraco.Core.Components;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Security;
+using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
+
+namespace Umbraco.Core.Auditing
+{
+    public sealed class AuditEventsComponent : UmbracoComponentBase, IUmbracoCoreComponent
+    {
+        private IAuditService _auditService;
+        private IUserService _userService;
+        private IEntityService _entityService;
+
+        private IUser CurrentPerformingUser
+        {
+            get
+            {
+                var identity = Thread.CurrentPrincipal?.GetUmbracoIdentity();
+                return identity == null
+                    ? new User { Id = 0, Name = "SYSTEM", Email = "" }
+                    : _userService.GetUserById(Convert.ToInt32(identity.Id));
+            }
+        }
+
+        private IUser GetPerformingUser(int userId)
+        {
+            var found = userId >= 0 ? _userService.GetUserById(userId) : null;
+            return found ?? new User {Id = 0, Name = "SYSTEM", Email = ""};
+        }
+
+        private string PerformingIp
+        {
+            get
+            {
+                var httpContext = HttpContext.Current == null ? (HttpContextBase) null : new HttpContextWrapper(HttpContext.Current);
+                var ip = httpContext.GetCurrentRequestIpAddress();
+                if (ip.ToLowerInvariant().StartsWith("unknown")) ip = "";
+                return ip;
+            }
+        }
+
+        public void Initialize(IAuditService auditService, IUserService userService, IEntityService entityService)
+        {
+            _auditService = auditService;
+            _userService = userService;
+            _entityService = entityService;
+
+            //BackOfficeUserManager.AccountLocked += ;
+            //BackOfficeUserManager.AccountUnlocked += ;
+            BackOfficeUserManager.ForgotPasswordRequested += OnForgotPasswordRequest;
+            BackOfficeUserManager.ForgotPasswordChangedSuccess += OnForgotPasswordChange;
+            BackOfficeUserManager.LoginFailed += OnLoginFailed;
+            //BackOfficeUserManager.LoginRequiresVerification += ;
+            BackOfficeUserManager.LoginSuccess += OnLoginSuccess;
+            BackOfficeUserManager.LogoutSuccess += OnLogoutSuccess;
+            BackOfficeUserManager.PasswordChanged += OnPasswordChanged;
+            BackOfficeUserManager.PasswordReset += OnPasswordReset;
+            //BackOfficeUserManager.ResetAccessFailedCount += ;
+
+            UserService.SavedUserGroup += OnSavedUserGroupWithUsers;
+
+            UserService.SavedUser += OnSavedUser;
+            UserService.DeletedUser += OnDeletedUser;
+            UserService.UserGroupPermissionsAssigned += UserGroupPermissionAssigned;
+
+            MemberService.Saved += OnSavedMember;
+            MemberService.Deleted += OnDeletedMember;
+            MemberService.AssignedRoles += OnAssignedRoles;
+            MemberService.RemovedRoles += OnRemovedRoles;
+            MemberService.Exported += OnMemberExported;
+        }
+
+        private string FormatEmail(IMember member)
+        {
+            return member == null ? string.Empty : member.Email.IsNullOrWhiteSpace() ? "" : $"<{member.Email}>";
+        }
+
+        private string FormatEmail(IUser user)
+        {
+            return user == null ? string.Empty : user.Email.IsNullOrWhiteSpace() ? "" : $"<{user.Email}>";
+        }
+
+        private void OnRemovedRoles(IMemberService sender, RolesEventArgs args)
+        {
+            var performingUser = CurrentPerformingUser;
+            var roles = string.Join(", ", args.Roles);
+            var members = sender.GetAllMembers(args.MemberIds).ToDictionary(x => x.Id, x => x);
+            foreach (var id in args.MemberIds)
+            {
+                members.TryGetValue(id, out var member);
+                _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"Member {id} \"{member?.Name ?? "(unknown)"}\" {FormatEmail(member)}",
+                    "umbraco/member/roles/removed", $"roles modified, removed {roles}");
+            }
+        }
+
+        private void OnAssignedRoles(IMemberService sender, RolesEventArgs args)
+        {
+            var performingUser = CurrentPerformingUser;
+            var roles = string.Join(", ", args.Roles);
+            var members = sender.GetAllMembers(args.MemberIds).ToDictionary(x => x.Id, x => x);
+            foreach (var id in args.MemberIds)
+            {
+                members.TryGetValue(id, out var member);
+                _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"Member {id} \"{member?.Name ?? "(unknown)"}\" {FormatEmail(member)}",
+                    "umbraco/member/roles/assigned", $"roles modified, assigned {roles}");
+            }
+        }
+
+        private void OnMemberExported(IMemberService sender, ExportedMemberEventArgs exportedMemberEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var member = exportedMemberEventArgs.Member;
+
+            _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                DateTime.UtcNow,
+                -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
+                "umbraco/member/exported", "exported member data");
+        }
+
+        private void OnSavedUserGroupWithUsers(IUserService sender, SaveEventArgs<UserGroupWithUsers> saveEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            foreach (var groupWithUser in saveEventArgs.SavedEntities)
+            {
+                var group = groupWithUser.UserGroup;
+
+                var dp = string.Join(", ", ((UserGroup)group).GetWereDirtyProperties());
+                var sections = ((UserGroup)group).WasPropertyDirty("AllowedSections")
+                    ? string.Join(", ", group.AllowedSections)
+                    : null;
+                var perms = ((UserGroup)group).WasPropertyDirty("Permissions")
+                    ? string.Join(", ", group.Permissions)
+                    : null;
+
+                var sb = new StringBuilder();
+                sb.Append($"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)};");
+                if (sections != null)
+                    sb.Append($", assigned sections: {sections}");
+                if (perms != null)
+                {
+                    if (sections != null)
+                        sb.Append(", ");
+                    sb.Append($"default perms: {perms}");
+                }
+
+                _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"User Group {group.Id} \"{group.Name}\" ({group.Alias})",
+                    "umbraco/user-group/save", $"{sb}");
+
+                // now audit the users that have changed
+
+                foreach (var user in groupWithUser.RemovedUsers)
+                {
+                    _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                        DateTime.UtcNow,
+                        user.Id, $"User \"{user.Name}\" {FormatEmail(user)}",
+                        "umbraco/user-group/save", $"Removed user \"{user.Name}\" {FormatEmail(user)} from group {group.Id} \"{group.Name}\" ({group.Alias})");
+                }
+
+                foreach (var user in groupWithUser.AddedUsers)
+                {
+                    _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                        DateTime.UtcNow,
+                        user.Id, $"User \"{user.Name}\" {FormatEmail(user)}",
+                        "umbraco/user-group/save", $"Added user \"{user.Name}\" {FormatEmail(user)} to group {group.Id} \"{group.Name}\" ({group.Alias})");
+                }
+            }
+        }
+
+        private void UserGroupPermissionAssigned(IUserService sender, SaveEventArgs<EntityPermission> saveEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var perms = saveEventArgs.SavedEntities;
+            foreach (var perm in perms)
+            {
+                var group = sender.GetUserGroupById(perm.UserGroupId);
+                var assigned = string.Join(", ", perm.AssignedPermissions);
+                var entity = _entityService.Get(perm.EntityId);
+
+                _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"User Group {group.Id} \"{group.Name}\" ({group.Alias})",
+                    "umbraco/user-group/permissions-change", $"assigning {(string.IsNullOrWhiteSpace(assigned) ? "(nothing)" : assigned)} on id:{perm.EntityId} \"{entity.Name}\"");
+            }
+        }
+
+        private void OnSavedMember(IMemberService sender, SaveEventArgs<IMember> saveEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var members = saveEventArgs.SavedEntities;
+            foreach (var member in members)
+            {
+                var dp = string.Join(", ", ((Member) member).GetWereDirtyProperties());
+
+                _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
+                    "umbraco/member/save", $"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)}");
+            }
+        }
+
+        private void OnDeletedMember(IMemberService sender, DeleteEventArgs<IMember> deleteEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var members = deleteEventArgs.DeletedEntities;
+            foreach (var member in members)
+            {
+                _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
+                    "umbraco/member/delete", $"delete member id:{member.Id} \"{member.Name}\" {FormatEmail(member)}");
+            }
+        }
+
+        private void OnSavedUser(IUserService sender, SaveEventArgs<IUser> saveEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var affectedUsers = saveEventArgs.SavedEntities;
+            foreach (var affectedUser in affectedUsers)
+            {
+                var groups = affectedUser.WasPropertyDirty("Groups")
+                    ? string.Join(", ", affectedUser.Groups.Select(x => x.Alias))
+                    : null;
+
+                var dp = string.Join(", ", ((User)affectedUser).GetWereDirtyProperties());
+
+                _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    affectedUser.Id, $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}",
+                    "umbraco/user/save", $"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)}{(groups == null ? "" : "; groups assigned: " + groups)}");
+            }
+        }
+
+        private void OnDeletedUser(IUserService sender, DeleteEventArgs<IUser> deleteEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var affectedUsers = deleteEventArgs.DeletedEntities;
+            foreach (var affectedUser in affectedUsers)
+                _auditService.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    affectedUser.Id, $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}",
+                    "umbraco/user/delete", "delete user");
+        }
+
+        private void OnLoginSuccess(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs)
+            {
+                var performingUser = GetPerformingUser(identityArgs.PerformingUser);
+                WriteAudit(performingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/sign-in/login", "login success");
+            }
+        }
+
+        private void OnLogoutSuccess(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs)
+            {
+                var performingUser = GetPerformingUser(identityArgs.PerformingUser);
+                WriteAudit(performingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/sign-in/logout", "logout success");
+            }
+        }
+
+        private void OnPasswordReset(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/reset", "password reset");
+            }
+        }
+
+        private void OnPasswordChanged(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/change", "password change");
+            }
+        }
+
+        private void OnLoginFailed(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, 0, identityArgs.IpAddress, "umbraco/user/sign-in/failed", "login failed", affectedDetails: "");
+            }
+        }
+
+        private void OnForgotPasswordChange(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/forgot/change", "password forgot/change");
+            }
+        }
+
+        private void OnForgotPasswordRequest(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/forgot/request", "password forgot/request");
+            }
+        }
+
+        private void WriteAudit(int performingId, int affectedId, string ipAddress, string eventType, string eventDetails, string affectedDetails = null)
+        {
+            var performingUser = _userService.GetUserById(performingId);
+
+            var performingDetails = performingUser == null
+                ? $"User UNKNOWN:{performingId}"
+                : $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}";
+
+            WriteAudit(performingId, performingDetails, affectedId, ipAddress, eventType, eventDetails, affectedDetails);
+        }
+
+        private void WriteAudit(IUser performingUser, int affectedId, string ipAddress, string eventType, string eventDetails)
+        {
+            var performingDetails = performingUser == null
+                ? $"User UNKNOWN"
+                : $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}";
+
+            WriteAudit(performingUser?.Id ?? 0, performingDetails, affectedId, ipAddress, eventType, eventDetails);
+        }
+
+        private void WriteAudit(int performingId, string performingDetails, int affectedId, string ipAddress, string eventType, string eventDetails, string affectedDetails = null)
+        {
+            if (affectedDetails == null)
+            {
+                var affectedUser = _userService.GetUserById(affectedId);
+                affectedDetails = affectedUser == null
+                    ? $"User UNKNOWN:{affectedId}"
+                    : $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}";
+            }
+
+            _auditService.Write(performingId, performingDetails,
+                ipAddress,
+                DateTime.UtcNow,
+                affectedId, affectedDetails,
+                eventType, eventDetails);
+        }
+    }
+}

src/Umbraco.Core/Auditing/AuditTypes.cs

@@ -1,87 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core.Auditing
-{
-    [Obsolete("Use Umbraco.Core.Models.AuditType instead")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public enum AuditTypes
-    {
-        /// <summary>
-        /// Used when new nodes are added
-        /// </summary>
-        New,
-        /// <summary>
-        /// Used when nodes are saved
-        /// </summary>
-        Save,
-        /// <summary>
-        /// Used when nodes are opened
-        /// </summary>
-        Open,
-        /// <summary>
-        /// Used when nodes are deleted
-        /// </summary>
-        Delete,
-        /// <summary>
-        /// Used when nodes are published
-        /// </summary>
-        Publish,
-        /// <summary>
-        /// Used when nodes are send to publishing
-        /// </summary>
-        SendToPublish,
-        /// <summary>
-        /// Used when nodes are unpublished
-        /// </summary>
-        UnPublish,
-        /// <summary>
-        /// Used when nodes are moved
-        /// </summary>
-        Move,
-        /// <summary>
-        /// Used when nodes are copied
-        /// </summary>
-        Copy,
-        /// <summary>
-        /// Used when nodes are assígned a domain
-        /// </summary>
-        AssignDomain,
-        /// <summary>
-        /// Used when public access are changed for a node
-        /// </summary>
-        PublicAccess,
-        /// <summary>
-        /// Used when nodes are sorted
-        /// </summary>
-        Sort,
-        /// <summary>
-        /// Used when a notification are send to a user
-        /// </summary>
-        Notify,
-        /// <summary>
-        /// General system notification
-        /// </summary>
-        System,
-        /// <summary>
-        /// Used when a node's content is rolled back to a previous version
-        /// </summary>
-        RollBack,
-        /// <summary>
-        /// Used when a package is installed
-        /// </summary>
-        PackagerInstall,
-        /// <summary>
-        /// Used when a package is uninstalled
-        /// </summary>
-        PackagerUninstall,
-        /// <summary>
-        /// Used when a node is send to translation
-        /// </summary>
-        SendToTranslate,
-        /// <summary>
-        /// Use this log action for custom log messages that should be shown in the audit trail
-        /// </summary>
-        Custom
-    }
-}

src/Umbraco.Core/BindingRedirects.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Web;
@@ -21,7 +21,7 @@ namespace Umbraco.Core
 
         private static readonly Regex Log4NetAssemblyPattern = new Regex("log4net, Version=([\\d\\.]+?), Culture=neutral, PublicKeyToken=\\w+$", RegexOptions.Compiled);
         private const string Log4NetReplacement = "log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a";
-        
+
         /// <summary>
         /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies
         /// </summary>
@@ -30,12 +30,12 @@ namespace Umbraco.Core
         /// <returns></returns>
         private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
         {
-            //log4net:            
+            //log4net:
             if (Log4NetAssemblyPattern.IsMatch(args.Name) && args.Name != Log4NetReplacement)
             {
                 return Assembly.Load(Log4NetAssemblyPattern.Replace(args.Name, Log4NetReplacement));
             }
-            
+
             //AutoMapper:
             // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
             // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
@@ -43,7 +43,7 @@ namespace Umbraco.Core
                 return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
 
             return null;
-            
+
         }
     }
-}
+}

src/Umbraco.Core/Cache/CacheHelper.cs

@@ -0,0 +1,422 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Web;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Class that is exposed by the ApplicationContext for application wide caching purposes
+    /// </summary>
+    public class CacheHelper
+    {
+        public static CacheHelper NoCache { get; } = new CacheHelper(NullCacheProvider.Instance, NullCacheProvider.Instance, NullCacheProvider.Instance, new IsolatedRuntimeCache(_ => NullCacheProvider.Instance));
+
+        /// <summary>
+        /// Creates a cache helper with disabled caches
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// Good for unit testing
+        /// </remarks>
+        public static CacheHelper CreateDisabledCacheHelper()
+        {
+            // do *not* return NoCache
+            // NoCache is a special instance that is detected by RepositoryBase and disables all cache policies
+            // CreateDisabledCacheHelper is used in tests to use no cache, *but* keep all cache policies
+            return new CacheHelper(NullCacheProvider.Instance, NullCacheProvider.Instance, NullCacheProvider.Instance, new IsolatedRuntimeCache(_ => NullCacheProvider.Instance));
+        }
+
+        /// <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>
+        /// <param name="cache"></param>
+        public CacheHelper(System.Web.Caching.Cache cache)
+            : this(
+                new HttpRuntimeCacheProvider(cache),
+                new StaticCacheProvider(),
+                new HttpRequestCacheProvider(),
+                new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
+        {
+        }
+
+        [Obsolete("Use the constructor the specifies all dependencies")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public CacheHelper(
+            IRuntimeCacheProvider httpCacheProvider,
+            ICacheProvider staticCacheProvider,
+            ICacheProvider requestCacheProvider)
+            : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance based on the provided providers
+        /// </summary>
+        /// <param name="httpCacheProvider"></param>
+        /// <param name="staticCacheProvider"></param>
+        /// <param name="requestCacheProvider"></param>
+        /// <param name="isolatedCacheManager"></param>
+        public CacheHelper(
+            IRuntimeCacheProvider httpCacheProvider,
+            ICacheProvider staticCacheProvider,
+            ICacheProvider requestCacheProvider,
+            IsolatedRuntimeCache isolatedCacheManager)
+        {
+            if (httpCacheProvider == null) throw new ArgumentNullException("httpCacheProvider");
+            if (staticCacheProvider == null) throw new ArgumentNullException("staticCacheProvider");
+            if (requestCacheProvider == null) throw new ArgumentNullException("requestCacheProvider");
+            if (isolatedCacheManager == null) throw new ArgumentNullException("isolatedCacheManager");
+            RuntimeCache = httpCacheProvider;
+            StaticCache = staticCacheProvider;
+            RequestCache = requestCacheProvider;
+            IsolatedRuntimeCache = isolatedCacheManager;
+        }
+
+        /// <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; }
+
+        #region Legacy Runtime/Http Cache accessors
+
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache
+        /// </summary>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearAllCache()
+        {
+            RuntimeCache.ClearAllCache();
+            IsolatedRuntimeCache.ClearAllCaches();
+        }
+
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache with the given key
+        /// </summary>
+        /// <param name="key">Key</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearCacheItem(string key)
+        {
+            RuntimeCache.ClearCacheItem(key);
+        }
+
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type name as the
+        /// input parameter. (using [object].GetType())
+        /// </summary>
+        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        public void ClearCacheObjectTypes(string typeName)
+        {
+            RuntimeCache.ClearCacheObjectTypes(typeName);
+        }
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type specified
+        /// </summary>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearCacheObjectTypes<T>()
+        {
+            RuntimeCache.ClearCacheObjectTypes<T>();
+        }
+
+        /// <summary>
+        /// Clears all cache items that starts with the key passed.
+        /// </summary>
+        /// <param name="keyStartsWith">The start of the key</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            RuntimeCache.ClearCacheByKeySearch(keyStartsWith);
+        }
+
+        /// <summary>
+        /// Clears all cache items that have a key that matches the regular expression
+        /// </summary>
+        /// <param name="regexString"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearCacheByKeyExpression(string regexString)
+        {
+            RuntimeCache.ClearCacheByKeyExpression(regexString);
+        }
+
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            return RuntimeCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
+        }
+
+        /// <summary>
+        /// Returns a cache item by key, does not update the cache if it isn't there.
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey,
+            TimeSpan timeout, Func<TT> getCacheItem)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
+
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemRemovedCallback refreshAction, TimeSpan timeout,
+            Func<TT> getCacheItem)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
+
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
+            Func<TT> getCacheItem)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
+
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority,
+            CacheItemRemovedCallback refreshAction,
+            CacheDependency cacheDependency,
+            TimeSpan timeout,
+            Func<TT> getCacheItem)
+        {
+            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
+            if (cache != null)
+            {
+                var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+                return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
+            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority,
+            CacheDependency cacheDependency,
+            Func<TT> getCacheItem)
+        {
+            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
+            if (cache != null)
+            {
+                var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency);
+                return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
+            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       Func<T> getCacheItem)
+        {
+            RuntimeCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
+
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       TimeSpan timeout,
+                                       Func<T> getCacheItem)
+        {
+            RuntimeCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       CacheDependency cacheDependency,
+                                       TimeSpan timeout,
+                                       Func<T> getCacheItem)
+        {
+            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
+            if (cache != null)
+            {
+                cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency);
+            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       CacheItemRemovedCallback refreshAction,
+                                       CacheDependency cacheDependency,
+                                       TimeSpan? timeout,
+                                       Func<T> getCacheItem)
+        {
+            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
+            if (cache != null)
+            {
+                cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+        }
+        #endregion
+
+        private HttpRuntimeCacheProvider GetHttpRuntimeCacheProvider(IRuntimeCacheProvider runtimeCache)
+        {
+            HttpRuntimeCacheProvider cache;
+            var wrapper = RuntimeCache as IRuntimeCacheProviderWrapper;
+            if (wrapper != null)
+            {
+                cache = wrapper.InnerProvider as HttpRuntimeCacheProvider;
+            }
+            else
+            {
+                cache = RuntimeCache as HttpRuntimeCacheProvider;
+            }
+            return cache;
+        }
+    }
+
+}

src/Umbraco.Core/Cache/CacheKeys.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using Umbraco.Core.CodeAnnotations;
 
@@ -28,10 +28,7 @@ namespace Umbraco.Core.Cache
         [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
         public const string MacroCacheKey = "UmbracoMacroCache";
 
-        public const string MacroHtmlCacheKey = "macroHtml_";
-        public const string MacroControlCacheKey = "macroControl_";
-        public const string MacroHtmlDateAddedCacheKey = "macroHtml_DateAdded_";
-        public const string MacroControlDateAddedCacheKey = "macroControl_DateAdded_";
+        public const string MacroContentCacheKey = "macroContent_"; // for macro contents
 
         [UmbracoWillObsolete("This cache key is only used for legacy 'library' member caching, remove in v8")]
         public const string MemberLibraryCacheKey = "UL_GetMember";
@@ -65,9 +62,8 @@ namespace Umbraco.Core.Cache
 
         [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
         public const string ContentTypePropertiesCacheKey = "ContentType_PropertyTypes_Content:";
-        
+
         [Obsolete("No longer used and will be removed in v8")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public const string PropertyTypeCacheKey = "UmbracoPropertyTypeCache";
 
         [Obsolete("This is no longer used and will be removed from the codebase in the future")]
@@ -94,4 +90,4 @@ namespace Umbraco.Core.Cache
         public const string IdToKeyCacheKey = "UI2K__";
         public const string KeyToIdCacheKey = "UK2I__";
     }
-}
+}

src/Umbraco.Core/Cache/CacheProviderExtensions.cs

@@ -67,4 +67,4 @@ namespace Umbraco.Core.Cache
             return result.TryConvertTo<T>().Result;
         }
     }
-}
+}

src/Umbraco.Core/Cache/CacheRefresherBase.cs

@@ -1,78 +1,120 @@
 using System;
 using Umbraco.Core.Events;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Sync;
-using umbraco.interfaces;
-using Umbraco.Core.Models.EntityBase;
 
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// A base class for cache refreshers to inherit from that ensures the correct events are raised
-    /// when cache refreshing occurs.
+    /// A base class for cache refreshers that handles events.
     /// </summary>
-    /// <typeparam name="TInstanceType">The real cache refresher type, this is used for raising strongly typed events</typeparam>
+    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
+    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
     public abstract class CacheRefresherBase<TInstanceType> : ICacheRefresher
-        where TInstanceType : ICacheRefresher
+        where TInstanceType : class, ICacheRefresher
     {
         /// <summary>
-        /// An event that is raised when cache is updated on an individual server
+        /// Initializes a new instance of the <see cref="CacheRefresherBase{TInstanceType}"/>.
+        /// </summary>
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected CacheRefresherBase(CacheHelper cacheHelper)
+        {
+            CacheHelper = cacheHelper;
+        }
+
+        /// <summary>
+        /// Triggers when the cache is updated on the server.
         /// </summary>
         /// <remarks>
-        /// This event will fire on each server configured for an Umbraco project whenever a cache refresher
-        /// is updated.
+        /// Triggers on each server configured for an Umbraco project whenever a cache refresher is updated.
         /// </remarks>
         public static event TypedEventHandler<TInstanceType, CacheRefresherEventArgs> CacheUpdated;
 
-        /// <summary>
-        /// Raises the event
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        protected static void OnCacheUpdated(TInstanceType sender, CacheRefresherEventArgs args)
-        {
-            if (CacheUpdated != null)
-            {
-                CacheUpdated(sender, args);
-            }
-        }
+        #region Define
 
         /// <summary>
-        /// Returns the real instance of the object ('this') for use  in strongly typed events
+        /// Gets the typed 'this' for events.
         /// </summary>
-        protected abstract TInstanceType Instance { get; }
+        protected abstract TInstanceType This { get; }
 
-        public abstract Guid UniqueIdentifier { get; }
+        /// <summary>
+        /// Gets the unique identifier of the refresher.
+        /// </summary>
+        public abstract Guid RefresherUniqueId { get; }
 
+        /// <summary>
+        /// Gets the name of the refresher.
+        /// </summary>
         public abstract string Name { get; }
 
+        #endregion
+
+        #region Refresher
+
+        /// <summary>
+        /// Refreshes all entities.
+        /// </summary>
         public virtual void RefreshAll()
         {
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(null, MessageType.RefreshAll));
-        }
-
-        public virtual void Refresh(int id)
-        {
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(id, MessageType.RefreshById));
-        }
-
-        public virtual void Remove(int id)
-        {
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(id, MessageType.RemoveById));
-        }
-
-        public virtual void Refresh(Guid id)
-        {
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(id, MessageType.RefreshById));
+            OnCacheUpdated(This, new CacheRefresherEventArgs(null, MessageType.RefreshAll));
         }
 
         /// <summary>
-        /// Clears the cache for all repository entities of this type
+        /// Refreshes an entity.
         /// </summary>
-        /// <typeparam name="TEntity"></typeparam>
-        internal void ClearAllIsolatedCacheByEntityType<TEntity>()
-            where TEntity : class, IAggregateRoot
+        /// <param name="id">The entity's identifier.</param>
+        public virtual void Refresh(int id)
         {
-            ApplicationContext.Current.ApplicationCache.IsolatedRuntimeCache.ClearCache<TEntity>();
+            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RefreshById));
         }
+
+        /// <summary>
+        /// Refreshes an entity.
+        /// </summary>
+        /// <param name="id">The entity's identifier.</param>
+        public virtual void Refresh(Guid id)
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RefreshById));
+        }
+
+        /// <summary>
+        /// Removes an entity.
+        /// </summary>
+        /// <param name="id">The entity's identifier.</param>
+        public virtual void Remove(int id)
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RemoveById));
+        }
+
+        #endregion
+
+        #region Protected
+
+        /// <summary>
+        /// Gets the cache helper.
+        /// </summary>
+        protected CacheHelper CacheHelper { get; }
+
+        /// <summary>
+        /// Clears the cache for all repository entities of a specified type.
+        /// </summary>
+        /// <typeparam name="TEntity">The type of the entities.</typeparam>
+        protected void ClearAllIsolatedCacheByEntityType<TEntity>()
+            where TEntity : class, IEntity
+        {
+            CacheHelper.IsolatedRuntimeCache.ClearCache<TEntity>();
+        }
+
+        /// <summary>
+        /// Raises the CacheUpdated event.
+        /// </summary>
+        /// <param name="sender">The event sender.</param>
+        /// <param name="args">The event arguments.</param>
+        protected static void OnCacheUpdated(TInstanceType sender, CacheRefresherEventArgs args)
+        {
+            CacheUpdated?.Invoke(sender, args);
+        }
+
+        #endregion
     }
-}
+}

src/Umbraco.Core/Cache/CacheRefresherCollection.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Cache
+{
+    public class CacheRefresherCollection : BuilderCollectionBase<ICacheRefresher>
+    {
+        public CacheRefresherCollection(IEnumerable<ICacheRefresher> items)
+            : base(items)
+        { }
+
+        public ICacheRefresher this[Guid id]
+            =>  this.FirstOrDefault(x => x.RefresherUniqueId == id);
+    }
+}

src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using LightInject;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Cache
+{
+    public class CacheRefresherCollectionBuilder : LazyCollectionBuilderBase<CacheRefresherCollectionBuilder, CacheRefresherCollection, ICacheRefresher>
+    {
+        public CacheRefresherCollectionBuilder(IServiceContainer container)
+            : base(container)
+        { }
+
+        protected override CacheRefresherCollectionBuilder This => this;
+    }
+}

src/Umbraco.Core/Cache/CacheRefresherEventArgs.cs

@@ -16,4 +16,4 @@ namespace Umbraco.Core.Cache
         public object MessageObject { get; private set; }
         public MessageType MessageType { get; private set; }
     }
-}
+}

src/Umbraco.Core/Cache/DeepCloneRuntimeCacheProvider.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Caching;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Cache
 {
@@ -16,23 +16,26 @@ namespace Umbraco.Core.Cache
     }
 
     /// <summary>
-    /// A wrapper for any IRuntimeCacheProvider that ensures that all inserts and returns 
+    /// 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; private set; }
+        public IRuntimeCacheProvider InnerProvider { get; }
 
         public DeepCloneRuntimeCacheProvider(IRuntimeCacheProvider innerProvider)
         {
-            if (innerProvider.GetType() == typeof(DeepCloneRuntimeCacheProvider))
-                throw new InvalidOperationException("A " + typeof(DeepCloneRuntimeCacheProvider) + " cannot wrap another instance of " + typeof(DeepCloneRuntimeCacheProvider));
+            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();
@@ -66,7 +69,8 @@ namespace Umbraco.Core.Cache
         public void ClearCacheByKeyExpression(string regexString)
         {
             InnerProvider.ClearCacheByKeyExpression(regexString);
-        } 
+        }
+
         #endregion
 
         public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
@@ -80,7 +84,7 @@ namespace Umbraco.Core.Cache
             return InnerProvider.GetCacheItemsByKeyExpression(regexString)
                 .Select(CheckCloneableAndTracksChanges);
         }
-        
+
         public object GetCacheItem(string cacheKey)
         {
             var item = InnerProvider.GetCacheItem(cacheKey);
@@ -108,11 +112,11 @@ namespace Umbraco.Core.Cache
                 var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                 if (value == null) return null; // do not store null values (backward compat)
 
-                //Clone/reset to go into the cache
+                // clone / reset to go into the cache
                 return CheckCloneableAndTracksChanges(value);
             }, timeout, isSliding, priority, removedCallback, dependentFiles);
 
-            //Clone/reset to go out of the cache
+            // clone / reset to go into the cache
             return CheckCloneableAndTracksChanges(cached);
         }
 
@@ -124,8 +128,9 @@ namespace Umbraco.Core.Cache
                 var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
                 if (value == null) return null; // do not store null values (backward compat)
 
+                // clone / reset to go into the cache
                 return CheckCloneableAndTracksChanges(value);
-            }, timeout, isSliding, priority, removedCallback, dependentFiles);   
+            }, timeout, isSliding, priority, removedCallback, dependentFiles);
         }
 
         private static object CheckCloneableAndTracksChanges(object input)
@@ -133,11 +138,10 @@ namespace Umbraco.Core.Cache
             var cloneable = input as IDeepCloneable;
             if (cloneable != null)
             {
-                input = cloneable.DeepClone();    
+                input = cloneable.DeepClone();
             }
 
-            //on initial construction we don't want to have dirty properties tracked
-            // http://issues.umbraco.org/issue/U4-1946
+            // reset dirty initial properties (U4-1946)
             var tracksChanges = input as IRememberBeingDirty;
             if (tracksChanges != null)
             {
@@ -148,4 +152,4 @@ namespace Umbraco.Core.Cache
             return input;
         }
     }
-}
+}

src/Umbraco.Core/Cache/DefaultRepositoryCachePolicy.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Cache
@@ -18,32 +18,26 @@ namespace Umbraco.Core.Cache
     /// <para>If options.GetAllCacheValidateCount then we check against the db when getting many entities.</para>
     /// </remarks>
     internal class DefaultRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
-        where TEntity : class, IAggregateRoot
+        where TEntity : class, IEntity
     {
         private static readonly TEntity[] EmptyEntities = new TEntity[0]; // const
         private readonly RepositoryCachePolicyOptions _options;
 
-        public DefaultRepositoryCachePolicy(IRuntimeCacheProvider cache, RepositoryCachePolicyOptions options)
-            : base(cache)
+        public DefaultRepositoryCachePolicy(IRuntimeCacheProvider cache, IScopeAccessor scopeAccessor, RepositoryCachePolicyOptions options)
+            : base(cache, scopeAccessor)
         {
-            if (options == null) throw new ArgumentNullException("options");
-            _options = options;
-        }
-
-        public override IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
-        {
-            return new ScopedRepositoryCachePolicy<TEntity, TId>(this, runtimeCache, scope);
+            _options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
         protected string GetEntityCacheKey(object id)
         {
-            if (id == null) throw new ArgumentNullException("id");
+            if (id == null) throw new ArgumentNullException(nameof(id));
             return GetEntityTypeCacheKey() + id;
         }
 
         protected string GetEntityTypeCacheKey()
         {
-            return string.Format("uRepo_{0}_", typeof(TEntity).Name);
+            return $"uRepo_{typeof (TEntity).Name}_";
         }
 
         protected virtual void InsertEntity(string cacheKey, TEntity entity)
@@ -74,7 +68,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public override void Create(TEntity entity, Action<TEntity> persistNew)
         {
-            if (entity == null) throw new ArgumentNullException("entity");
+            if (entity == null) throw new ArgumentNullException(nameof(entity));
 
             try
             {
@@ -106,7 +100,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public override void Update(TEntity entity, Action<TEntity> persistUpdated)
         {
-            if (entity == null) throw new ArgumentNullException("entity");
+            if (entity == null) throw new ArgumentNullException(nameof(entity));
 
             try
             {
@@ -138,7 +132,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public override void Delete(TEntity entity, Action<TEntity> persistDeleted)
         {
-            if (entity == null) throw new ArgumentNullException("entity");
+            if (entity == null) throw new ArgumentNullException(nameof(entity));
 
             try
             {
@@ -244,7 +238,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public override void ClearAll()
         {
-            Cache.ClearAllCache();
+            Cache.ClearCacheByKeySearch(GetEntityTypeCacheKey());
         }
     }
-}
+}

src/Umbraco.Core/Cache/DictionaryCacheProvider.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Cache
+{
+    internal class DictionaryCacheProvider : ICacheProvider
+    {
+        private readonly ConcurrentDictionary<string, Lazy<object>> _items
+            = new ConcurrentDictionary<string, Lazy<object>>();
+
+        // for tests
+        internal ConcurrentDictionary<string, Lazy<object>> Items => _items;
+
+        public void ClearAllCache()
+        {
+            _items.Clear();
+        }
+
+        public void ClearCacheItem(string key)
+        {
+            _items.TryRemove(key, out _);
+        }
+
+        public void ClearCacheObjectTypes(string typeName)
+        {
+            var type = TypeFinder.GetTypeByName(typeName);
+            if (type == null) return;
+            var isInterface = type.IsInterface;
+
+            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 = 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 _);
+        }
+
+        public void ClearCacheObjectTypes<T>()
+        {
+            var typeOfT = typeof(T);
+            var isInterface = typeOfT.IsInterface;
+
+            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 = 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 _);
+        }
+
+        public void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            var typeOfT = typeof(T);
+            var isInterface = typeOfT.IsInterface;
+
+            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 = DictionaryCacheProviderBase.GetSafeLazyValue(x.Value, true);
+                    if (value == null) return true;
+
+                    // if T is an interface remove anything that implements that interface
+                    // otherwise remove exact types (not inherited types)
+                    return (isInterface ? (value is T) : (value.GetType() == typeOfT))
+                            // run predicate on the 'public key' part only, ie without prefix
+                            && predicate(x.Key, (T)value);
+                }))
+                _items.TryRemove(kvp.Key, out _);
+        }
+
+        public void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            foreach (var ikvp in _items
+                .Where(kvp => kvp.Key.InvariantStartsWith(keyStartsWith)))
+                _items.TryRemove(ikvp.Key, out _);
+        }
+
+        public void ClearCacheByKeyExpression(string regexString)
+        {
+            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

@@ -2,7 +2,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.ExceptionServices;
 using System.Text.RegularExpressions;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Cache
 {
@@ -44,7 +46,7 @@ namespace Umbraco.Core.Cache
                 }
                 catch (Exception e)
                 {
-                    return new ExceptionHolder(e);
+                    return new ExceptionHolder(ExceptionDispatchInfo.Capture(e));
                 }
             });
         }
@@ -74,12 +76,12 @@ namespace Umbraco.Core.Cache
 
         internal class ExceptionHolder
         {
-            public ExceptionHolder(Exception e)
+            public ExceptionHolder(ExceptionDispatchInfo e)
             {
                 Exception = e;
             }
 
-            public Exception Exception { get; private set; }
+            public ExceptionDispatchInfo Exception { get; }
         }
 
         #region Clear
@@ -252,4 +254,4 @@ namespace Umbraco.Core.Cache
 
         #endregion
     }
-}
+}

src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Collections;
-using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Cache
@@ -19,28 +19,23 @@ namespace Umbraco.Core.Cache
     /// keep as a whole in memory.</para>
     /// </remarks>
     internal class FullDataSetRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
-        where TEntity : class, IAggregateRoot
+        where TEntity : class, IEntity
     {
         private readonly Func<TEntity, TId> _entityGetId;
         private readonly bool _expires;
 
-        public FullDataSetRepositoryCachePolicy(IRuntimeCacheProvider cache, Func<TEntity, TId> entityGetId, bool expires)
-            : base(cache)
+        public FullDataSetRepositoryCachePolicy(IRuntimeCacheProvider cache, IScopeAccessor scopeAccessor, Func<TEntity, TId> entityGetId, bool expires)
+            : base(cache, scopeAccessor)
         {
             _entityGetId = entityGetId;
             _expires = expires;
         }
 
-        public override IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
-        {
-            return new ScopedRepositoryCachePolicy<TEntity, TId>(this, runtimeCache, scope);
-        }
-
         protected static readonly TId[] EmptyIds = new TId[0]; // const
 
         protected string GetEntityTypeCacheKey()
         {
-            return string.Format("uRepo_{0}_", typeof(TEntity).Name);
+            return $"uRepo_{typeof (TEntity).Name}_";
         }
 
         protected void InsertEntities(TEntity[] entities)
@@ -56,20 +51,22 @@ namespace Umbraco.Core.Cache
             // set to ListCloneBehavior.CloneOnce ie it will clone *once* when inserting,
             // and then will *not* clone when retrieving.
 
+            var key = GetEntityTypeCacheKey();
+
             if (_expires)
             {
-                Cache.InsertCacheItem(GetEntityTypeCacheKey(), () => new DeepCloneableList<TEntity>(entities), TimeSpan.FromMinutes(5), true);
+                Cache.InsertCacheItem(key, () => new DeepCloneableList<TEntity>(entities), TimeSpan.FromMinutes(5), true);
             }
             else
             {
-                Cache.InsertCacheItem(GetEntityTypeCacheKey(), () => new DeepCloneableList<TEntity>(entities));
+                Cache.InsertCacheItem(key, () => new DeepCloneableList<TEntity>(entities));
             }
         }
 
         /// <inheritdoc />
         public override void Create(TEntity entity, Action<TEntity> persistNew)
         {
-            if (entity == null) throw new ArgumentNullException("entity");
+            if (entity == null) throw new ArgumentNullException(nameof(entity));
 
             try
             {
@@ -84,7 +81,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public override void Update(TEntity entity, Action<TEntity> persistUpdated)
         {
-            if (entity == null) throw new ArgumentNullException("entity");
+            if (entity == null) throw new ArgumentNullException(nameof(entity));
 
             try
             {
@@ -99,7 +96,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public override void Delete(TEntity entity, Action<TEntity> persistDeleted)
         {
-            if (entity == null) throw new ArgumentNullException("entity");
+            if (entity == null) throw new ArgumentNullException(nameof(entity));
 
             try
             {
@@ -120,7 +117,7 @@ namespace Umbraco.Core.Cache
 
             // see note in InsertEntities - what we get here is the original
             // cached entity, not a clone, so we need to manually ensure it is deep-cloned.
-            return entity == null ? null : (TEntity) entity.DeepClone();
+            return (TEntity)entity?.DeepClone();
         }
 
         /// <inheritdoc />
@@ -128,11 +125,11 @@ namespace Umbraco.Core.Cache
         {
             // get all from the cache -- and only the cache, then look for the entity
             var all = Cache.GetCacheItem<DeepCloneableList<TEntity>>(GetEntityTypeCacheKey());
-            var entity = all == null ? null : all.FirstOrDefault(x => _entityGetId(x).Equals(id));
+            var entity = all?.FirstOrDefault(x => _entityGetId(x).Equals(id));
 
             // see note in InsertEntities - what we get here is the original
             // cached entity, not a clone, so we need to manually ensure it is deep-cloned.
-            return entity == null ? null : (TEntity)entity.DeepClone();
+            return (TEntity) entity?.DeepClone();
         }
 
         /// <inheritdoc />
@@ -177,4 +174,4 @@ namespace Umbraco.Core.Cache
             Cache.ClearCacheItem(GetEntityTypeCacheKey());
         }
     }
-}
+}

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -94,8 +94,8 @@ namespace Umbraco.Core.Cache
 
             get
             {
-                return HasContextItems 
-                    ? (IDisposable) new MonitorLock(ContextItems.SyncRoot) 
+                return HasContextItems
+                    ? (IDisposable) new MonitorLock(ContextItems.SyncRoot)
                     : new NoopLocker();
             }
         }
@@ -136,8 +136,7 @@ namespace Umbraco.Core.Cache
             //return result.Value;
 
             var value = result.Value; // will not throw (safe lazy)
-            var eh = value as ExceptionHolder;
-            if (eh != null) throw eh.Exception; // throw once!
+            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
             return value;
         }
 
@@ -152,4 +151,4 @@ namespace Umbraco.Core.Cache
             { }
         }
     }
-}
+}

src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs

@@ -98,7 +98,7 @@ namespace Umbraco.Core.Cache
             // on the Lazy lock to ensure that getCacheItem runs once and everybody waits on it, while the global
             // application lock has been released.
 
-            // NOTE 
+            // NOTE
             //   The Lazy value creation may produce a null value.
             //   Must make sure (for backward compatibility) that we pretend they are not in the cache.
             //   So if we find an entry in the cache that already has its value created and is null,
@@ -153,8 +153,7 @@ namespace Umbraco.Core.Cache
             //return result.Value;
 
             value = result.Value; // will not throw (safe lazy)
-            var eh = value as ExceptionHolder;
-            if (eh != null) throw new Exception("Exception while creating a value.", eh.Exception); // throw once!
+            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
             return value;
         }
 
@@ -215,4 +214,4 @@ namespace Umbraco.Core.Cache
 
         #endregion
     }
-}
+}

src/Umbraco.Core/Cache/ICacheProvider.cs

@@ -55,7 +55,7 @@ namespace Umbraco.Core.Cache
 
         IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
         IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
-        
+
         /// <summary>
         /// Returns an item with a given key
         /// </summary>

src/Umbraco.Core/Cache/ICacheRefresher.cs

@@ -1,18 +1,33 @@
-using umbraco.interfaces;
+using System;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Cache
 {
+    /// <summary>
+    /// The IcacheRefresher Interface is used for loadbalancing.
+    ///
+    /// </summary>
+    public interface ICacheRefresher : IDiscoverable
+    {
+        Guid RefresherUniqueId { get; }
+        string Name { get; }
+        void RefreshAll();
+        void Refresh(int id);
+        void Remove(int id);
+        void Refresh(Guid id);
+    }
+
     /// <summary>
     /// Strongly type cache refresher that is able to refresh cache of real instances of objects as well as IDs
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <remarks>
     /// This is much better for performance when we're not running in a load balanced environment so we can refresh the cache
-    /// against a already resolved object instead of looking the object back up by id. 
+    /// against a already resolved object instead of looking the object back up by id.
     /// </remarks>
     interface ICacheRefresher<T> : ICacheRefresher
     {
         void Refresh(T instance);
         void Remove(T instance);
     }
-}
+}

src/Umbraco.Core/Cache/IJsonCacheRefresher.cs

@@ -1,6 +1,4 @@
-using umbraco.interfaces;
-
-namespace Umbraco.Core.Cache
+namespace Umbraco.Core.Cache
 {
     /// <summary>
     /// A cache refresher that supports refreshing or removing cache based on a custom Json payload
@@ -10,7 +8,7 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Refreshes, clears, etc... any cache based on the information provided in the json
         /// </summary>
-        /// <param name="jsonPayload"></param>
-        void Refresh(string jsonPayload);
+        /// <param name="json"></param>
+        void Refresh(string json);
     }
-}
+}

src/Umbraco.Core/Cache/IPayloadCacheRefresher.cs

@@ -1,16 +1,14 @@
-using umbraco.interfaces;
-
-namespace Umbraco.Core.Cache
+namespace Umbraco.Core.Cache
 {
     /// <summary>
     /// A cache refresher that supports refreshing cache based on a custom payload
     /// </summary>
-    interface IPayloadCacheRefresher : IJsonCacheRefresher
+    interface IPayloadCacheRefresher<TPayload> : IJsonCacheRefresher
     {
         /// <summary>
         /// Refreshes, clears, etc... any cache based on the information provided in the payload
         /// </summary>
-        /// <param name="payload"></param>
-        void Refresh(object payload);
+        /// <param name="payloads"></param>
+        void Refresh(TPayload[] payloads);
     }
 }

src/Umbraco.Core/Cache/IRepositoryCachePolicy.cs

@@ -1,33 +1,13 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Cache
 {
     internal interface IRepositoryCachePolicy<TEntity, TId>
-        where TEntity : class, IAggregateRoot
+        where TEntity : class, IEntity
     {
-        // note:
-        // at the moment each repository instance creates its corresponding cache policy instance
-        // we could reduce allocations by using static cache policy instances but then we would need
-        // to modify all methods here to pass the repository and cache eg:
-        //
-        // TEntity Get(TRepository repository, IRuntimeCacheProvider cache, TId id);
-        //
-        // it is not *that* complicated but then RepositoryBase needs to have a TRepository generic
-        // type parameter and it all becomes convoluted - keeping it simple for the time being.
-
-        /// <summary>
-        /// Creates a scoped version of this cache policy.
-        /// </summary>
-        /// <param name="runtimeCache">The global isolated runtime cache for this policy.</param>
-        /// <param name="scope">The scope.</param>
-        /// <remarks>When a policy is scoped, it means that it has been created with a scoped
-        /// isolated runtime cache, and now it needs to be wrapped into something that can apply
-        /// changes to the global isolated runtime cache.</remarks>
-        IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope);
-
         /// <summary>
         /// Gets an entity from the cache, else from the repository.
         /// </summary>
@@ -94,4 +74,4 @@ namespace Umbraco.Core.Cache
         /// </summary>
         void ClearAll();
     }
-}
+}

src/Umbraco.Core/Cache/IRuntimeCacheProvider.cs

@@ -14,8 +14,8 @@ namespace Umbraco.Core.Cache
     public interface IRuntimeCacheProvider : ICacheProvider
     {
         object GetCacheItem(
-            string cacheKey, 
-            Func<object> getCacheItem, 
+            string cacheKey,
+            Func<object> getCacheItem,
             TimeSpan? timeout,
             bool isSliding = false,
             CacheItemPriority priority = CacheItemPriority.Normal,

src/Umbraco.Core/Cache/IsolatedRuntimeCache.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 
 namespace Umbraco.Core.Cache
@@ -7,7 +7,7 @@ namespace Umbraco.Core.Cache
     /// 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 
+    /// 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
@@ -29,7 +29,7 @@ namespace Umbraco.Core.Cache
         /// Returns an isolated runtime cache for a given type
         /// </summary>
         /// <typeparam name="T"></typeparam>
-        /// <returns></returns>        
+        /// <returns></returns>
         public IRuntimeCacheProvider GetOrCreateCache<T>()
         {
             return _isolatedCache.GetOrAdd(typeof(T), type => CacheFactory(type));
@@ -38,7 +38,7 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Returns an isolated runtime cache for a given type
         /// </summary>
-        /// <returns></returns>        
+        /// <returns></returns>
         public IRuntimeCacheProvider GetOrCreateCache(Type type)
         {
             return _isolatedCache.GetOrAdd(type, t => CacheFactory(t));
@@ -88,4 +88,4 @@ namespace Umbraco.Core.Cache
             }
         }
     }
-}
+}

src/Umbraco.Core/Cache/JsonCacheRefresherBase.cs

@@ -1,19 +1,29 @@
 using Umbraco.Core.Sync;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// Provides a base class for "json" cache refreshers.
+    /// A base class for "json" cache refreshers.
     /// </summary>
-    /// <typeparam name="TInstance">The actual cache refresher type.</typeparam>
-    /// <remarks>Ensures that the correct events are raised when cache refreshing occurs.</remarks>
-    public abstract class JsonCacheRefresherBase<TInstance> : CacheRefresherBase<TInstance>, IJsonCacheRefresher
-        where TInstance : ICacheRefresher
-    {        
+    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
+    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
+    public abstract class JsonCacheRefresherBase<TInstanceType> : CacheRefresherBase<TInstanceType>, IJsonCacheRefresher
+        where TInstanceType : class, ICacheRefresher
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonCacheRefresherBase{TInstanceType}"/>.
+        /// </summary>
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected JsonCacheRefresherBase(CacheHelper cacheHelper) : base(cacheHelper)
+        { }
+
+        /// <summary>
+        /// Refreshes as specified by a json payload.
+        /// </summary>
+        /// <param name="json">The json payload.</param>
         public virtual void Refresh(string json)
-        {            
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(json, MessageType.RefreshByJson));
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(json, MessageType.RefreshByJson));
         }
     }
-}
+}

src/Umbraco.Core/Cache/NoCacheRepositoryCachePolicy.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Scoping;
+
+namespace Umbraco.Core.Cache
+{
+    internal class NoCacheRepositoryCachePolicy<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
+        where TEntity : class, IEntity
+    {
+        private NoCacheRepositoryCachePolicy() { }
+
+        public static NoCacheRepositoryCachePolicy<TEntity, TId> Instance { get; } = new NoCacheRepositoryCachePolicy<TEntity, TId>();
+
+        public IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
+        {
+            throw new NotImplementedException();
+        }
+
+        public TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            return performGet(id);
+        }
+
+        public TEntity GetCached(TId id)
+        {
+            return null;
+        }
+
+        public bool Exists(TId id, Func<TId, bool> performExists, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            return performExists(id);
+        }
+
+        public void Create(TEntity entity, Action<TEntity> persistNew)
+        {
+            persistNew(entity);
+        }
+
+        public void Update(TEntity entity, Action<TEntity> persistUpdated)
+        {
+            persistUpdated(entity);
+        }
+
+        public void Delete(TEntity entity, Action<TEntity> persistDeleted)
+        {
+            persistDeleted(entity);
+        }
+
+        public TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> performGetAll)
+        {
+            return performGetAll(ids).ToArray();
+        }
+
+        public void ClearAll()
+        { }
+    }
+}

src/Umbraco.Core/Cache/NoRepositoryCachePolicy.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Scoping;
-
-namespace Umbraco.Core.Cache
-{
-    internal class NoRepositoryCachePolicy<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId> 
-        where TEntity : class, IAggregateRoot
-    {
-        private static readonly NoRepositoryCachePolicy<TEntity, TId> StaticInstance = new NoRepositoryCachePolicy<TEntity, TId>();
-
-        private NoRepositoryCachePolicy()
-        { }
-
-        public static NoRepositoryCachePolicy<TEntity, TId> Instance { get { return StaticInstance; } }
-
-        public IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope)
-        {
-            throw new NotImplementedException();
-        }
-
-        public TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll)
-        {
-            return performGet(id);
-        }
-
-        public TEntity GetCached(TId id)
-        {
-            return null;
-        }
-
-        public bool Exists(TId id, Func<TId, bool> performExists, Func<TId[], IEnumerable<TEntity>> performGetAll)
-        {
-            return performExists(id);
-        }
-
-        public void Create(TEntity entity, Action<TEntity> persistNew)
-        {
-            persistNew(entity);
-        }
-
-        public void Update(TEntity entity, Action<TEntity> persistUpdated)
-        {
-            persistUpdated(entity);
-        }
-
-        public void Delete(TEntity entity, Action<TEntity> persistDeleted)
-        {
-            persistDeleted(entity);
-        }
-
-        public TEntity[] GetAll(TId[] ids, Func<TId[], IEnumerable<TEntity>> performGetAll)
-        {
-            return performGetAll(ids).ToArray();
-        }
-
-        public void ClearAll()
-        { }
-    }
-}

src/Umbraco.Core/Cache/NullCacheProvider.cs

@@ -10,6 +10,10 @@ namespace Umbraco.Core.Cache
     /// </summary>
     public class NullCacheProvider : IRuntimeCacheProvider
     {
+        private NullCacheProvider() { }
+
+        public static NullCacheProvider Instance { get; } = new NullCacheProvider();
+
         public virtual void ClearAllCache()
         { }
 
@@ -59,4 +63,4 @@ namespace Umbraco.Core.Cache
         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

@@ -5,6 +5,7 @@ using System.Runtime.Caching;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Web.Caching;
+using Umbraco.Core.Composing;
 using CacheItemPriority = System.Web.Caching.CacheItemPriority;
 
 namespace Umbraco.Core.Cache
@@ -224,8 +225,7 @@ namespace Umbraco.Core.Cache
             //return result.Value;
 
             var value = result.Value; // will not throw (safe lazy)
-            var eh = value as DictionaryCacheProviderBase.ExceptionHolder;
-            if (eh != null) throw eh.Exception; // throw once!
+            if (value is DictionaryCacheProviderBase.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
             return value;
         }
 
@@ -296,4 +296,4 @@ namespace Umbraco.Core.Cache
             return policy;
         }
     }
-}
+}

src/Umbraco.Core/Cache/PayloadCacheRefresherBase.cs

@@ -1,17 +1,39 @@
-using Umbraco.Core.Sync;
-using umbraco.interfaces;
+using Newtonsoft.Json;
+using Umbraco.Core.Sync;
 
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// Provides a base class for "payload" cache refreshers.
+    /// A base class for "payload" class refreshers.
     /// </summary>
-    /// <typeparam name="TInstance">The actual cache refresher type.</typeparam>
-    /// <remarks>Ensures that the correct events are raised when cache refreshing occurs.</remarks>
-    public abstract class PayloadCacheRefresherBase<TInstance> : JsonCacheRefresherBase<TInstance>, IPayloadCacheRefresher
-        where TInstance : ICacheRefresher
+    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
+    /// <typeparam name="TPayload">The payload type.</typeparam>
+    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
+    public abstract class PayloadCacheRefresherBase<TInstanceType, TPayload> : JsonCacheRefresherBase<TInstanceType>, IPayloadCacheRefresher<TPayload>
+        where TInstanceType : class, ICacheRefresher
     {
-        protected abstract object Deserialize(string json);
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PayloadCacheRefresherBase{TInstanceType, TPayload}"/>.
+        /// </summary>
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected PayloadCacheRefresherBase(CacheHelper cacheHelper) : base(cacheHelper)
+        { }
+
+        #region Json
+
+        /// <summary>
+        /// Deserializes a json payload into an object payload.
+        /// </summary>
+        /// <param name="json">The json payload.</param>
+        /// <returns>The deserialized object payload.</returns>
+        protected virtual TPayload[] Deserialize(string json)
+        {
+            return JsonConvert.DeserializeObject<TPayload[]>(json);
+        }
+
+        #endregion
+
+        #region Refresher
 
         public override void Refresh(string json)
         {
@@ -19,9 +41,15 @@ namespace Umbraco.Core.Cache
             Refresh(payload);
         }
 
-        public virtual void Refresh(object payload)
+        /// <summary>
+        /// Refreshes as specified by a payload.
+        /// </summary>
+        /// <param name="payloads">The payload.</param>
+        public virtual void Refresh(TPayload[] payloads)
         {
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(payload, MessageType.RefreshByPayload));
+            OnCacheUpdated(This, new CacheRefresherEventArgs(payloads, MessageType.RefreshByPayload));
         }
+
+        #endregion
     }
 }

src/Umbraco.Core/Cache/RepositoryCachePolicyBase.cs

@@ -1,6 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
-using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Cache
@@ -11,17 +11,35 @@ namespace Umbraco.Core.Cache
     /// <typeparam name="TEntity">The type of the entity.</typeparam>
     /// <typeparam name="TId">The type of the identifier.</typeparam>
     internal abstract class RepositoryCachePolicyBase<TEntity, TId> : IRepositoryCachePolicy<TEntity, TId>
-        where TEntity : class, IAggregateRoot
+        where TEntity : class, IEntity
     {
-        protected RepositoryCachePolicyBase(IRuntimeCacheProvider cache)
+        private readonly IRuntimeCacheProvider _globalCache;
+        private readonly IScopeAccessor _scopeAccessor;
+
+        protected RepositoryCachePolicyBase(IRuntimeCacheProvider globalCache, IScopeAccessor scopeAccessor)
         {
-            if (cache == null) throw new ArgumentNullException("cache");            
-            Cache = cache;
+            _globalCache = globalCache ?? throw new ArgumentNullException(nameof(globalCache));
+            _scopeAccessor = scopeAccessor ?? throw new ArgumentNullException(nameof(scopeAccessor));
         }
 
-        public abstract IRepositoryCachePolicy<TEntity, TId> Scoped(IRuntimeCacheProvider runtimeCache, IScope scope);
-
-        protected IRuntimeCacheProvider Cache { get; private set; }
+        protected IRuntimeCacheProvider Cache
+        {
+            get
+            {
+                var ambientScope = _scopeAccessor.AmbientScope;
+                switch (ambientScope.RepositoryCacheMode)
+                {
+                    case RepositoryCacheMode.Default:
+                        return _globalCache;
+                    case RepositoryCacheMode.Scoped:
+                        return ambientScope.IsolatedRuntimeCache.GetOrCreateCache<TEntity>();
+                    case RepositoryCacheMode.None:
+                        return NullCacheProvider.Instance;
+                    default:
+                        throw new NotSupportedException($"Repository cache mode {ambientScope.RepositoryCacheMode} is not supported.");
+                }
+            }
+        }
 
         /// <inheritdoc />
         public abstract TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll);
@@ -46,6 +64,5 @@ namespace Umbraco.Core.Cache
 
         /// <inheritdoc />
         public abstract void ClearAll();
-
     }
-}
+}

src/Umbraco.Core/Cache/RepositoryCachePolicyOptions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Umbraco.Core.Cache
 {
@@ -30,22 +30,22 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Callback required to get count for GetAllCacheValidateCount
         /// </summary>
-        public Func<int> PerformCount { get; private set; }
+        public Func<int> PerformCount { get; set; }
 
         /// <summary>
         /// True/false as to validate the total item count when all items are returned from cache, the default is true but this
-        /// means that a db lookup will occur - though that lookup will probably be significantly less expensive than the normal 
-        /// GetAll method. 
+        /// means that a db lookup will occur - though that lookup will probably be significantly less expensive than the normal
+        /// GetAll method.
         /// </summary>
         /// <remarks>
         /// setting this to return false will improve performance of GetAll cache with no params but should only be used
         /// for specific circumstances
         /// </remarks>
-        public bool GetAllCacheValidateCount { get; private set; }
+        public bool GetAllCacheValidateCount { get; set; }
 
         /// <summary>
         /// True if the GetAll method will cache that there are zero results so that the db is not hit when there are no results found
         /// </summary>
         public bool GetAllCacheAllowZeroCount { get; set; }
     }
-}
+}

src/Umbraco.Core/Cache/ScopedRepositoryCachePolicy.cs

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

src/Umbraco.Core/Cache/SingleItemsOnlyRepositoryCachePolicy.cs

@@ -1,4 +1,5 @@
-using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Cache
 {
@@ -13,10 +14,10 @@ namespace Umbraco.Core.Cache
     /// <para>Used by DictionaryRepository.</para>
     /// </remarks>
     internal class SingleItemsOnlyRepositoryCachePolicy<TEntity, TId> : DefaultRepositoryCachePolicy<TEntity, TId>
-        where TEntity : class, IAggregateRoot
+        where TEntity : class, IEntity
     {
-        public SingleItemsOnlyRepositoryCachePolicy(IRuntimeCacheProvider cache, RepositoryCachePolicyOptions options)
-            : base(cache, options)
+        public SingleItemsOnlyRepositoryCachePolicy(IRuntimeCacheProvider cache, IScopeAccessor scopeAccessor, RepositoryCachePolicyOptions options)
+            : base(cache, scopeAccessor, options)
         { }
 
         protected override void InsertEntities(TId[] ids, TEntity[] entities)
@@ -24,4 +25,4 @@ namespace Umbraco.Core.Cache
             // nop
         }
     }
-}
+}

src/Umbraco.Core/Cache/StaticCacheProvider.cs

@@ -48,7 +48,7 @@ namespace Umbraco.Core.Cache
 
         public virtual void ClearCacheByKeyExpression(string regexString)
         {
-            StaticCache.RemoveAll(kvp => Regex.IsMatch(kvp.Key, regexString)); 
+            StaticCache.RemoveAll(kvp => Regex.IsMatch(kvp.Key, regexString));
         }
 
         public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
@@ -61,7 +61,7 @@ namespace Umbraco.Core.Cache
         public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
         {
             return (from KeyValuePair<string, object> c in StaticCache
-                    where Regex.IsMatch(c.Key, regexString) 
+                    where Regex.IsMatch(c.Key, regexString)
                     select c.Value).ToList();
         }
 
@@ -74,6 +74,6 @@ namespace Umbraco.Core.Cache
         public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
         {
             return StaticCache.GetOrAdd(cacheKey, key => getCacheItem());
-        }        
+        }
     }
-}
+}

src/Umbraco.Core/Cache/TypedCacheRefresherBase.cs

@@ -1,25 +1,36 @@
 using Umbraco.Core.Sync;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// A base class for cache refreshers to inherit from that ensures the correct events are raised
-    /// when cache refreshing occurs.
+    /// A base class for "typed" cache refreshers.
     /// </summary>
-    /// <typeparam name="TInstanceType">The real cache refresher type, this is used for raising strongly typed events</typeparam>
-    /// <typeparam name="TEntityType">The entity type that this refresher can update cache for</typeparam>
+    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
+    /// <typeparam name="TEntityType">The entity type.</typeparam>
+    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
     public abstract class TypedCacheRefresherBase<TInstanceType, TEntityType> : CacheRefresherBase<TInstanceType>, ICacheRefresher<TEntityType>
-        where TInstanceType : ICacheRefresher
+        where TInstanceType : class, ICacheRefresher
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TypedCacheRefresherBase{TInstanceType, TEntityType}"/>.
+        /// </summary>
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected TypedCacheRefresherBase(CacheHelper cacheHelper)
+            : base(cacheHelper)
+        { }
+
+        #region Refresher
+
         public virtual void Refresh(TEntityType instance)
         {
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(instance, MessageType.RefreshByInstance));
+            OnCacheUpdated(This, new CacheRefresherEventArgs(instance, MessageType.RefreshByInstance));
         }
 
         public virtual void Remove(TEntityType instance)
         {
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(instance, MessageType.RemoveByInstance));
+            OnCacheUpdated(This, new CacheRefresherEventArgs(instance, MessageType.RemoveByInstance));
         }
+
+        #endregion
     }
-}
+}

src/Umbraco.Core/CacheHelper.cs

@@ -1,435 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Web;
-using System.Web.Caching;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core
-{
-	/// <summary>
-	/// Class that is exposed by the ApplicationContext for application wide caching purposes
-	/// </summary>
-    public class CacheHelper
-	{
-        private static readonly ICacheProvider NullRequestCache = new NullCacheProvider();
-        private static readonly ICacheProvider NullStaticCache = new NullCacheProvider();
-        private static readonly IRuntimeCacheProvider NullRuntimeCache = new NullCacheProvider();
-        private static readonly IsolatedRuntimeCache NullIsolatedCache = new IsolatedRuntimeCache(_ => NullRuntimeCache);
-        private static readonly CacheHelper NullCache = new CacheHelper(NullRuntimeCache, NullStaticCache, NullRequestCache, NullIsolatedCache);
-
-        public static CacheHelper NoCache { get { return NullCache; } }
-        
-        /// <summary>
-        /// Creates a cache helper with disabled caches
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// Good for unit testing
-        /// </remarks>
-        public static CacheHelper CreateDisabledCacheHelper()
-        {
-            // do *not* return NoCache
-            // NoCache is a special instance that is detected by RepositoryBase and disables all cache policies
-            // CreateDisabledCacheHelper is used in tests to use no cache, *but* keep all cache policies
-            return new CacheHelper(NullRuntimeCache, NullStaticCache, NullRequestCache, NullIsolatedCache);
-        }
-
-	    /// <summary>
-	    /// 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>
-	    /// <param name="cache"></param>
-	    public CacheHelper(System.Web.Caching.Cache cache)
-	        : this(
-	            new HttpRuntimeCacheProvider(cache),
-	            new StaticCacheProvider(),
-                new HttpRequestCacheProvider(),
-                new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
-	    {
-	    }
-
-	    [Obsolete("Use the constructor the specifies all dependencies")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public CacheHelper(
-            IRuntimeCacheProvider httpCacheProvider, 
-            ICacheProvider staticCacheProvider, 
-            ICacheProvider requestCacheProvider)
-            : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
-        {            
-        }
-
-	    /// <summary>
-	    /// Initializes a new instance based on the provided providers
-	    /// </summary>
-	    /// <param name="httpCacheProvider"></param>
-	    /// <param name="staticCacheProvider"></param>
-	    /// <param name="requestCacheProvider"></param>
-	    /// <param name="isolatedCacheManager"></param>
-	    public CacheHelper(
-            IRuntimeCacheProvider httpCacheProvider,
-            ICacheProvider staticCacheProvider,
-            ICacheProvider requestCacheProvider,
-            IsolatedRuntimeCache isolatedCacheManager)            
-        {
-	        if (httpCacheProvider == null) throw new ArgumentNullException("httpCacheProvider");
-	        if (staticCacheProvider == null) throw new ArgumentNullException("staticCacheProvider");
-	        if (requestCacheProvider == null) throw new ArgumentNullException("requestCacheProvider");
-	        if (isolatedCacheManager == null) throw new ArgumentNullException("isolatedCacheManager");
-	        RuntimeCache = httpCacheProvider;
-            StaticCache = staticCacheProvider;
-            RequestCache = requestCacheProvider;
-            IsolatedRuntimeCache = isolatedCacheManager;
-        }
-
-        /// <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; }
-
-        #region Legacy Runtime/Http Cache accessors
-
-        /// <summary>
-        /// Clears the item in umbraco's runtime cache
-        /// </summary>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public void ClearAllCache()
-        {
-            RuntimeCache.ClearAllCache();
-            IsolatedRuntimeCache.ClearAllCaches();
-        }
-
-        /// <summary>
-        /// Clears the item in umbraco's runtime cache with the given key 
-        /// </summary>
-        /// <param name="key">Key</param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public void ClearCacheItem(string key)
-        {
-            RuntimeCache.ClearCacheItem(key);
-        }
-
-
-        /// <summary>
-        /// Clears all objects in the System.Web.Cache with the System.Type name as the
-        /// input parameter. (using [object].GetType())
-        /// </summary>
-        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        public void ClearCacheObjectTypes(string typeName)
-        {
-            RuntimeCache.ClearCacheObjectTypes(typeName);
-        }
-
-        /// <summary>
-        /// Clears all objects in the System.Web.Cache with the System.Type specified
-        /// </summary>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public void ClearCacheObjectTypes<T>()
-        {
-            RuntimeCache.ClearCacheObjectTypes<T>();
-        }
-
-        /// <summary>
-        /// Clears all cache items that starts with the key passed.
-        /// </summary>
-        /// <param name="keyStartsWith">The start of the key</param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            RuntimeCache.ClearCacheByKeySearch(keyStartsWith);
-        }
-
-        /// <summary>
-        /// Clears all cache items that have a key that matches the regular expression
-        /// </summary>
-        /// <param name="regexString"></param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public void ClearCacheByKeyExpression(string regexString)
-        {
-            RuntimeCache.ClearCacheByKeyExpression(regexString);
-        }
-
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
-        {
-            return RuntimeCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
-        }
-
-        /// <summary>
-        /// Returns a cache item by key, does not update the cache if it isn't there.
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public TT GetCacheItem<TT>(string cacheKey)
-        {
-            return RuntimeCache.GetCacheItem<TT>(cacheKey);
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
-        {
-            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem);
-
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public TT GetCacheItem<TT>(string cacheKey,
-            TimeSpan timeout, Func<TT> getCacheItem)
-        {
-            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
-
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public TT GetCacheItem<TT>(string cacheKey,
-            CacheItemRemovedCallback refreshAction, TimeSpan timeout,
-            Func<TT> getCacheItem)
-        {
-            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
-
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public TT GetCacheItem<TT>(string cacheKey,
-            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
-            Func<TT> getCacheItem)
-        {
-            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
-
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
-        public TT GetCacheItem<TT>(string cacheKey,
-            CacheItemPriority priority,
-            CacheItemRemovedCallback refreshAction,
-            CacheDependency cacheDependency,
-            TimeSpan timeout,
-            Func<TT> getCacheItem)
-        {
-            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
-            if (cache != null)
-            {
-                var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
-                return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
-            }
-            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
-        }
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache
-        /// </summary>
-        /// <typeparam name="TT"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
-        public TT GetCacheItem<TT>(string cacheKey,
-            CacheItemPriority priority,
-            CacheDependency cacheDependency,
-            Func<TT> getCacheItem)
-        {
-            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
-            if (cache != null)
-            {
-                var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency);
-                return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
-            }
-            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="getCacheItem"></param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public void InsertCacheItem<T>(string cacheKey,
-                                       CacheItemPriority priority,
-                                       Func<T> getCacheItem)
-        {
-            RuntimeCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
-
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public void InsertCacheItem<T>(string cacheKey,
-                                       CacheItemPriority priority,
-                                       TimeSpan timeout,
-                                       Func<T> getCacheItem)
-        {
-            RuntimeCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
-        public void InsertCacheItem<T>(string cacheKey,
-                                       CacheItemPriority priority,
-                                       CacheDependency cacheDependency,
-                                       TimeSpan timeout,
-                                       Func<T> getCacheItem)
-        {
-            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
-            if (cache != null)
-            {
-                cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency);
-            }
-            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
-        }
-
-        /// <summary>
-        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="cacheKey"></param>
-        /// <param name="priority"></param>
-        /// <param name="refreshAction"></param>
-        /// <param name="cacheDependency"></param>
-        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
-        /// <param name="getCacheItem"></param>
-        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
-        public void InsertCacheItem<T>(string cacheKey,
-                                       CacheItemPriority priority,
-                                       CacheItemRemovedCallback refreshAction,
-                                       CacheDependency cacheDependency,
-                                       TimeSpan? timeout,
-                                       Func<T> getCacheItem)
-        {
-            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
-            if (cache != null)
-            {
-                cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
-            }
-            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
-        } 
-        #endregion
-
-	    private HttpRuntimeCacheProvider GetHttpRuntimeCacheProvider(IRuntimeCacheProvider runtimeCache)
-	    {
-	        HttpRuntimeCacheProvider cache;
-            var wrapper = RuntimeCache as IRuntimeCacheProviderWrapper;
-	        if (wrapper != null)
-	        {
-	            cache = wrapper.InnerProvider as HttpRuntimeCacheProvider;
-	        }
-	        else
-	        {
-                cache = RuntimeCache as HttpRuntimeCacheProvider;
-            }
-	        return cache;
-	    }
-    }
-
-}

src/Umbraco.Core/CacheRefreshersResolver.cs

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

src/Umbraco.Core/CodeAnnotations/ActionMetadataAttribute.cs

@@ -1,12 +1,13 @@
-using System;
+using System;
+using Umbraco.Core.Exceptions;
 
 namespace Umbraco.Core.CodeAnnotations
 {
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
     internal class ActionMetadataAttribute : Attribute
     {
-        public string Category { get; private set; }
-        public string Name { get; private set; }
+        public string Category { get; }
+        public string Name { get; }
 
         /// <summary>
         /// Constructor used to assign a Category, since no name is assigned it will try to be translated from the language files based on the action's alias
@@ -14,7 +15,7 @@ namespace Umbraco.Core.CodeAnnotations
         /// <param name="category"></param>
         public ActionMetadataAttribute(string category)
         {
-            if (string.IsNullOrWhiteSpace(category)) throw new ArgumentException("Value cannot be null or whitespace.", "category");
+            if (string.IsNullOrWhiteSpace(category)) throw new ArgumentNullOrEmptyException(nameof(category));
             Category = category;
         }
 
@@ -25,10 +26,10 @@ namespace Umbraco.Core.CodeAnnotations
         /// <param name="name"></param>
         public ActionMetadataAttribute(string category, string name)
         {
-            if (string.IsNullOrWhiteSpace(category)) throw new ArgumentException("Value cannot be null or whitespace.", "category");
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", "name");
+            if (string.IsNullOrWhiteSpace(category)) throw new ArgumentNullOrEmptyException(nameof(category));
+            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
             Category = category;
             Name = name;
         }
     }
-}
+}

src/Umbraco.Core/CodeAnnotations/FriendlyNameAttribute.cs

@@ -32,4 +32,4 @@ namespace Umbraco.Core.CodeAnnotations
             return this._friendlyName;
         }
     }
-}
+}

src/Umbraco.Core/CodeAnnotations/UmbracoExperimentalFeatureAttribute.cs

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

src/Umbraco.Core/CodeAnnotations/UmbracoObjectTypeAttribute.cs

@@ -23,4 +23,4 @@ namespace Umbraco.Core.CodeAnnotations
 
         public Type ModelType { get; private set; }
     }
-}
+}

src/Umbraco.Core/CodeAnnotations/UmbracoProposedPublicAttribute.cs

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

src/Umbraco.Core/CodeAnnotations/UmbracoUdiTypeAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Umbraco.Core.CodeAnnotations
 {
@@ -12,4 +12,4 @@ namespace Umbraco.Core.CodeAnnotations
             UdiType = udiType;
         }
     }
-}
+}

src/Umbraco.Core/CodeAnnotations/UmbracoWillObsoleteAttribute.cs

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

src/Umbraco.Core/Collections/CompositeIntStringKey.cs

@@ -0,0 +1,43 @@
+using System;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Represents a composite key of (int, string) for fast dictionaries.
+    /// </summary>
+    /// <remarks>
+    /// <para>The integer part of the key must be greater than, or equal to, zero.</para>
+    /// <para>The string part of the key is case-insensitive.</para>
+    /// <para>Null is a valid value for both parts.</para>
+    /// </remarks>
+    public struct CompositeIntStringKey : IEquatable<CompositeIntStringKey>
+    {
+        private readonly int _key1;
+        private readonly string _key2;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CompositeIntStringKey"/> struct.
+        /// </summary>
+        public CompositeIntStringKey(int? key1, string key2)
+        {
+            if (key1 < 0) throw new ArgumentOutOfRangeException(nameof(key1));
+            _key1 = key1 ?? -1;
+            _key2 = key2?.ToLowerInvariant() ?? "NULL";
+        }
+
+        public bool Equals(CompositeIntStringKey other)
+            => _key2 == other._key2 && _key1 == other._key1;
+
+        public override bool Equals(object obj)
+            => obj is CompositeIntStringKey other && _key2 == other._key2 && _key1 == other._key1;
+
+        public override int GetHashCode()
+            => _key2.GetHashCode() * 31 + _key1;
+
+        public static bool operator ==(CompositeIntStringKey key1, CompositeIntStringKey key2)
+            => key1._key2 == key2._key2 && key1._key1 == key2._key1;
+
+        public static bool operator !=(CompositeIntStringKey key1, CompositeIntStringKey key2)
+            => key1._key2 != key2._key2 || key1._key1 != key2._key1;
+    }
+}

src/Umbraco.Core/Collections/CompositeTypeTypeKey.cs

@@ -10,7 +10,8 @@ namespace Umbraco.Core.Collections
         /// <summary>
         /// Initializes a new instance of the <see cref="CompositeTypeTypeKey"/> struct.
         /// </summary>
-        public CompositeTypeTypeKey(Type type1, Type type2) : this()
+        public CompositeTypeTypeKey(Type type1, Type type2)
+            : this()
         {
             Type1 = type1;
             Type2 = type2;
@@ -19,12 +20,12 @@ namespace Umbraco.Core.Collections
         /// <summary>
         /// Gets the first type.
         /// </summary>
-        public Type Type1 { get; private set; }
+        public Type Type1 { get; }
 
         /// <summary>
         /// Gets the second type.
         /// </summary>
-        public Type Type2 { get; private set; }
+        public Type Type2 { get; }
 
         /// <inheritdoc/>
         public bool Equals(CompositeTypeTypeKey other)
@@ -35,7 +36,7 @@ namespace Umbraco.Core.Collections
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            var other = obj is CompositeTypeTypeKey ? (CompositeTypeTypeKey)obj : default(CompositeTypeTypeKey);
+            var other = obj is CompositeTypeTypeKey key ? key : default;
             return Type1 == other.Type1 && Type2 == other.Type2;
         }