Merge pull request #2423 from umbraco/temp-u4-10897

temp U4-10897

.editorconfig

@@ -1,10 +1,16 @@
-root=true
+# editorconfig.org
 
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
 [*]
-end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace = true
 
-[*.{cs,cshtml,csx,vb,vbx,vbhtml,fs,fsx,txt,ps1,sql}]
-indent_size = 4
+# Trim trailing whitespace, limited support.
+# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
+trim_trailing_whitespace = true

.gitattributes

@@ -0,0 +1,49 @@
+*.doc  diff=astextplain
+*.DOC	diff=astextplain
+*.docx	diff=astextplain
+*.DOCX	diff=astextplain
+*.dot	diff=astextplain
+*.DOT	diff=astextplain
+*.pdf	diff=astextplain
+*.PDF	diff=astextplain
+*.rtf	diff=astextplain
+*.RTF	diff=astextplain
+
+*.jpg  	binary
+*.png 	binary
+*.gif 	binary
+
+*.cs text=auto diff=csharp 
+*.vb text=auto
+*.c text=auto
+*.cpp text=auto
+*.cxx text=auto
+*.h text=auto
+*.hxx text=auto
+*.py text=auto
+*.rb text=auto
+*.java text=auto
+*.html text=auto
+*.htm text=auto
+*.css text=auto
+*.scss text=auto
+*.sass text=auto
+*.less text=auto
+*.js text=auto
+*.lisp text=auto
+*.clj text=auto
+*.sql text=auto
+*.php text=auto
+*.lua text=auto
+*.m text=auto
+*.asm text=auto
+*.erl text=auto
+*.fs text=auto
+*.fsx text=auto
+*.hs text=auto
+
+*.csproj text=auto merge=union 
+*.vbproj text=auto merge=union 
+*.fsproj text=auto merge=union 
+*.dbproj text=auto merge=union 
+*.sln text=auto eol=crlf merge=union 

BUILD.md

@@ -14,6 +14,43 @@ By default, this builds the current version. It is possible to specify a differe
 
 Valid version strings are defined in the `Set-UmbracoVersion` documentation below.
 
+## PowerShell Quirks
+
+There is a good chance that running `build.ps1` ends up in error, with messages such as
+
+>The file ...\build\build.ps1 is not digitally signed. You cannot run this script on the current system. For more information about running scripts and setting execution policy, see about_Execution_Policies.
+
+PowerShell has *Execution Policies* that may prevent the script from running. You can check the current policies with:
+
+    PS> Get-ExecutionPolicy -List
+    
+            Scope ExecutionPolicy
+            ----- ---------------
+    MachinePolicy       Undefined
+       UserPolicy       Undefined
+          Process       Undefined
+      CurrentUser       Undefined
+     LocalMachine    RemoteSigned
+
+Policies can be `Restricted`, `AllSigned`, `RemoteSigned`, `Unrestricted` and `Bypass`. Scopes can be `MachinePolicy`, `UserPolicy`, `Process`, `CurrentUser`, `LocalMachine`. You need the current policy to be `RemoteSigned`—as long as it is `Undefined`, the script cannot run. You can change the current user policy with:
+
+    PS> Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy RemoteSigned
+
+Alternatively, you can do it at machine level, from within an elevated PowerShell session:
+
+    PS> Set-ExecutionPolicy -Scope LocalMachine -ExecutionPolicy RemoteSigned
+
+And *then* the script should run. It *might* however still complain about executing scripts, with messages such as:
+
+>Security warning - Run only scripts that you trust. While scripts from the internet can be useful, this script can potentially harm your computer. If you trust this script, use the Unblock-File cmdlet to allow the script to run without this warning message. Do you want to run ...\build\build.ps1?
+[D] Do not run  [R] Run once  [S] Suspend  [?] Help (default is "D"):
+
+This is usually caused by the scripts being *blocked*. And that usually happens when the source code has been downloaded as a Zip file. When Windows downloads Zip files, they are marked as *blocked* (technically, they have a Zone.Identifier alternate data stream, with a value of "3" to indicate that they were downloaded from the Internet). And when such a Zip file is un-zipped, each and every single file is also marked as blocked.
+
+The best solution is to unblock the Zip file before un-zipping: right-click the files, open *Properties*, and there should be a *Unblock* checkbox at the bottom of the dialog. If, however, the Zip file has already been un-zipped, it is possible to recursively unblock all files from PowerShell with:
+
+    PS> Get-ChildItem -Recurse *.* | Unblock-File
+
 ## Notes
 
 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).

README.md

@@ -1,8 +1,8 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/ikpgqxiw9v8opltv/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-hs8dx/branch/dev-v7)
+[![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 390,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
+The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
 
 [![ScreenShot](vimeo.png)](https://vimeo.com/172382998/)
 
@@ -12,7 +12,7 @@ Umbraco is a free open source Content Management System built on the ASP.NET pla
 
 ## Building Umbraco from source ##
 
-The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`.
+The easiest way to get started is to run `build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`.  See [this page](BUILD.md) for more details.
 
 Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
 
@@ -26,7 +26,7 @@ For the first time on the Microsoft platform, there is a free user and developer
 
 Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
 
-Used by more than 350,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 200,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
+Used by more than 443,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 220,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
 
 To view more examples, please visit [https://umbraco.com/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
 

build.bat

@@ -10,6 +10,5 @@ IF ERRORLEVEL 1 (
 :error
 ECHO.
 ECHO Can not run build\build.ps1.
-ECHO If this is due to a SecurityError then make sure to run the following command from an administrator command prompt:
+ECHO If this is due to a SecurityError then please refer to BUILD.md for help!
 ECHO.
-ECHO powershell Set-ExecutionPolicy -ExecutionPolicy RemoteSigned

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

@@ -7,48 +7,40 @@ function Build-UmbracoDocs
   $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
-
-  # create Belle build folder, so that we don't cause a Belle rebuild
-  $belleBuildDir = "$src\Umbraco.Web.UI.Client\build"
-  if (-not (Test-Path $belleBuildDir)) 
-  {
-      mkdir $belleBuildDir > $null
-  }
-
-  Write-Host "Build UI documentation"
-
   # 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.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 "building docs using gulp" >> $tmp\belle.log 2>&1
-  &gulp docs >> $tmp\belle.log 2>&1
+  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"

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

@@ -40,6 +40,7 @@ function Get-UmbracoBuildEnv
     &$nuget install 7-Zip.CommandLine -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
   }

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

@@ -51,13 +51,19 @@ function Prepare-Build
 
   if (-not $keep)
   {
-    Remove-Directory "$tmp"
-    mkdir "$tmp" > $null
-    
-    Remove-Directory "$out"
-    mkdir "$out" > $null
+	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
@@ -233,18 +239,18 @@ function Prepare-Tests
   
   # data
   Write-Host "Copy data files"
-  if( -Not (Test-Path -Path "$tmp\tests\Packaging" ) )
+  if (-Not (Test-Path -Path "$tmp\tests\Packaging" ) )
   {
     Write-Host "Create packaging directory"
-    New-Item -ItemType directory -Path "$tmp\tests\Packaging"
+    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" ) )
+  if (-Not (Test-Path -Path "$tmp\tests\bin" ) )
   {
     Write-Host "Create bin directory"
-    New-Item -ItemType directory -Path "$tmp\tests\bin"
+    mkdir "$tmp\tests\bin" > $null
   }
 }
 
@@ -371,14 +377,6 @@ function Prepare-Packages
   Copy-Files "$src\Umbraco.Web.UI\umbraco\lib" "*" "$tmp\WebApp\umbraco\lib"
   Copy-Files "$src\Umbraco.Web.UI\umbraco\views" "*" "$tmp\WebApp\umbraco\views"
   Copy-Files "$src\Umbraco.Web.UI\umbraco\preview" "*" "$tmp\WebApp\umbraco\preview"
-
-  # prepare WebPI
-  Write-Host "Prepare WebPI"
-  Remove-Directory "$tmp\WebPi"
-  mkdir "$tmp\WebPi" > $null
-  mkdir "$tmp\WebPi\umbraco" > $null
-  Copy-Files "$tmp\WebApp" "*" "$tmp\WebPi\umbraco"
-  Copy-Files "$src\WebPi" "*" "$tmp\WebPi"     
 }
 
 #
@@ -407,17 +405,6 @@ function Package-Zip
     "$tmp\WebApp\*" `
     "-x!dotless.Core.*" "-x!Content_Types.xml" "-x!*.pdb"`
     > $null
-
-  Write-Host "Zip WebPI"  
-  &$uenv.Zip a -r "$out\UmbracoCms.WebPI.$($version.Semver).zip" "-x!*.pdb"`
-    "$tmp\WebPi\*" `
-    "-x!dotless.Core.*" `
-    > $null
-  
-    # hash the webpi file
-  Write-Host "Hash WebPI"
-  $hash = Get-FileHash "$out\UmbracoCms.WebPI.$($version.Semver).zip"
-  Write $hash | out-file "$out\webpihash.txt" -encoding ascii
 }
 
 #
@@ -461,6 +448,24 @@ function Restore-NuGet
   &$uenv.NuGet restore "$src\Umbraco.sln" > "$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
 #
@@ -570,6 +575,10 @@ function Build-Umbraco
   {
     Compile-Belle $uenv $version
   }
+  elseif ($target -eq "prepare-azuregallery")
+  {
+    Prepare-AzureGallery $uenv
+  }
   elseif ($target -eq "all")
   {
     Prepare-Build $uenv
@@ -584,6 +593,7 @@ function Build-Umbraco
     Verify-NuGet $uenv
     Prepare-NuGet $uenv
     Package-NuGet $uenv $version
+	Prepare-AzureGallery $uenv
   }
   else
   {

build/Modules/Umbraco.Build/Utilities.ps1

@@ -1,28 +1,3 @@
-# returns a string containing the hash of $file
-function Get-FileHash($file) 
-{
-  try 
-  {
-    $crypto = new-object System.Security.Cryptography.SHA1CryptoServiceProvider
-    $stream = [System.IO.File]::OpenRead($file)
-    $hash = $crypto.ComputeHash($stream)
-    $text = ""
-    $hash | foreach `
-    {
-      $text = $text + $_.ToString("x2")
-    }
-    return $text
-  }
-  finally
-  {
-    if ($stream)
-    {
-      $stream.Dispose()
-    }
-    $crypto.Dispose()
-  }
-}
-
 # returns the full path if $file is relative to $pwd
 function Get-FullPath($file)
 {

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -29,18 +29,17 @@
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
       <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
       <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
+      <dependency id="ClientDependency" 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.85, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.3, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.3, 5.0.0)" />
+      <dependency id="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.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
     </dependencies>
   </metadata>
   <files>

build/NuSpecs/UmbracoCms.nuspec

@@ -17,9 +17,9 @@
     <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.7, 4.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.0, 3.0.0)" />
+	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
     </dependencies>
   </metadata>
   <files>

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

@@ -43,7 +43,7 @@
        xdt:Locator="Match(application,alias)"
        xdt:Transform="InsertIfMissing"  />
   
-  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
+  <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
   <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" 

build/azuregalleryrelease.ps1

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

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -49,11 +49,9 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.7.0")]
-[assembly: AssemblyInformationalVersion("7.7.0")]
+[assembly: AssemblyFileVersion("7.7.10")]
+[assembly: AssemblyInformationalVersion("7.7.10")]

src/Umbraco.Core/ApplicationContext.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Threading;
 using Umbraco.Core.Configuration;
@@ -260,7 +261,7 @@ namespace Umbraco.Core
         /// - http://issues.umbraco.org/issue/U4-5728
         /// - http://issues.umbraco.org/issue/U4-5391
         /// </remarks>
-        internal string UmbracoApplicationUrl
+        public string UmbracoApplicationUrl
         {
             get
             {
@@ -268,9 +269,21 @@ namespace Umbraco.Core
                 return _umbracoApplicationUrl;
             }
         }
+
+        /// <summary>
+        /// Resets the url.
+        /// </summary>
+        public void ResetUmbracoApplicationUrl()
+        {
+            _umbracoApplicationUrl = null;
+        }
 
 	    // ReSharper disable once InconsistentNaming
-	    internal string _umbracoApplicationUrl;
+	    internal string _umbracoApplicationUrl;
+
+        internal List<string> _umbracoApplicationDomains = new List<string>();
+
+        internal string _umbracoApplicationDeploymentId;
 
         private Lazy<bool> _configured;
         internal MainDom MainDom { get; private set; }

src/Umbraco.Core/Collections/CompositeTypeTypeKey.cs

@@ -0,0 +1,61 @@
+using System;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Represents a composite key of (Type, Type) for fast dictionaries.
+    /// </summary>
+    internal struct CompositeTypeTypeKey : IEquatable<CompositeTypeTypeKey>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CompositeTypeTypeKey"/> struct.
+        /// </summary>
+        public CompositeTypeTypeKey(Type type1, Type type2) : this()
+        {
+            Type1 = type1;
+            Type2 = type2;
+        }
+
+        /// <summary>
+        /// Gets the first type.
+        /// </summary>
+        public Type Type1 { get; private set; }
+
+        /// <summary>
+        /// Gets the second type.
+        /// </summary>
+        public Type Type2 { get; private set; }
+
+        /// <inheritdoc/>
+        public bool Equals(CompositeTypeTypeKey other)
+        {
+            return Type1 == other.Type1 && Type2 == other.Type2;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object obj)
+        {
+            var other = obj is CompositeTypeTypeKey ? (CompositeTypeTypeKey)obj : default(CompositeTypeTypeKey);
+            return Type1 == other.Type1 && Type2 == other.Type2;
+        }
+
+        public static bool operator ==(CompositeTypeTypeKey key1, CompositeTypeTypeKey key2)
+        {
+            return key1.Type1 == key2.Type1 && key1.Type2 == key2.Type2;
+        }
+
+        public static bool operator !=(CompositeTypeTypeKey key1, CompositeTypeTypeKey key2)
+        {
+            return key1.Type1 != key2.Type1 || key1.Type2 != key2.Type2;
+        }
+
+        /// <inheritdoc/>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Type1.GetHashCode() * 397) ^ Type2.GetHashCode();
+            }
+        }
+    }
+}

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -538,24 +538,41 @@ namespace Umbraco.Core.Configuration
 
         internal static bool ContentCacheXmlStoredInCodeGen
         {
-            get { return ContentCacheXmlStorageLocation == ContentXmlStorage.AspNetTemp; }
+            get { return LocalTempStorageLocation == LocalTempStorage.AspNetTemp; }
         }
-
-        internal static ContentXmlStorage ContentCacheXmlStorageLocation
+
+        /// <summary>
+        /// This is the location type to store temporary files such as cache files or other localized files for a given machine
+        /// </summary>
+        /// <remarks>
+        /// Currently used for the xml cache file and the plugin cache files
+        /// </remarks>
+        internal static LocalTempStorage LocalTempStorageLocation
         {
             get
-            {
+            {
+                //there's a bunch of backwards compat config checks here....
+
+                //This is the current one
+                if (ConfigurationManager.AppSettings.ContainsKey("umbracoLocalTempStorage"))
+                {
+                    return Enum<LocalTempStorage>.Parse(ConfigurationManager.AppSettings["umbracoLocalTempStorage"]);
+                }
+
+                //This one is old
                 if (ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLStorage"))
                 {
-                    return Enum<ContentXmlStorage>.Parse(ConfigurationManager.AppSettings["umbracoContentXMLStorage"]);
-                }
+                    return Enum<LocalTempStorage>.Parse(ConfigurationManager.AppSettings["umbracoContentXMLStorage"]);
+                }
+
+                //This one is older
                 if (ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLUseLocalTemp"))
                 {
                     return bool.Parse(ConfigurationManager.AppSettings["umbracoContentXMLUseLocalTemp"]) 
-                        ? ContentXmlStorage.AspNetTemp 
-                        : ContentXmlStorage.Default;
+                        ? LocalTempStorage.AspNetTemp 
+                        : LocalTempStorage.Default;
                 }
-                return ContentXmlStorage.Default;
+                return LocalTempStorage.Default;
             }
         }
 

src/Umbraco.Core/Configuration/LocalTempStorage.cs

@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration
 {
-    internal enum ContentXmlStorage
+    internal enum LocalTempStorage
     {
         Default,
         AspNetTemp,

src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs

@@ -357,6 +357,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         string IContentSection.LoginBackgroundImage
         {
             get { return LoginBackgroundImage; }
-        }
+        }
+        
     }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs

@@ -74,6 +74,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
         bool EnablePropertyValueConverters { get; }
 
-        string LoginBackgroundImage { get; }
+        string LoginBackgroundImage { get; }
+        
     }
 }

src/Umbraco.Core/Configuration/UmbracoVersion.cs

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

src/Umbraco.Core/DateTimeExtensions.cs

@@ -21,9 +21,9 @@ namespace Umbraco.Core
         public static DateTime TruncateTo(this DateTime dt, DateTruncate truncateTo)
         {
             if (truncateTo == DateTruncate.Year)
-                return new DateTime(dt.Year, 0, 0);
+                return new DateTime(dt.Year, 1, 1);
             if (truncateTo == DateTruncate.Month)
-                return new DateTime(dt.Year, dt.Month, 0);
+                return new DateTime(dt.Year, dt.Month, 1);
             if (truncateTo == DateTruncate.Day)
                 return new DateTime(dt.Year, dt.Month, dt.Day);
             if (truncateTo == DateTruncate.Hour)
@@ -41,43 +41,43 @@ namespace Umbraco.Core
             Hour,
             Minute,
             Second
-        }
-
+        }
+
         /// <summary>
-        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
+        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
         /// date time is before the time, calculate onto next day)
         /// </summary>
         /// <param name="fromDateTime">Date to start from</param>
         /// <param name="scheduledTime">Time to compare against (in Hmm form, e.g. 330, 2200)</param>
-        /// <returns></returns>
-        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
-        {
-            // Ensure time provided is 4 digits long
-            if (scheduledTime.Length == 3)
-            {
-                scheduledTime = "0" + scheduledTime;
-            }
-
-            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
-            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
-
-            DateTime scheduledDateTime;
-            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
-            {
-                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
-            }
-            else
-            {
-                var nextDay = fromDateTime.AddDays(1);
-                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
-            }
-
-            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
-        }
-
-        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
-        {
-            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
+        /// <returns></returns>
+        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
+        {
+            // Ensure time provided is 4 digits long
+            if (scheduledTime.Length == 3)
+            {
+                scheduledTime = "0" + scheduledTime;
+            }
+
+            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
+            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
+
+            DateTime scheduledDateTime;
+            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
+            {
+                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
+            }
+            else
+            {
+                var nextDay = fromDateTime.AddDays(1);
+                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
+            }
+
+            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
+        }
+
+        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
+        {
+            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
         }
     }
 }

src/Umbraco.Core/Events/ImportPackageEventArgs.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Packaging.Models;
 
 namespace Umbraco.Core.Events
@@ -7,18 +8,27 @@ namespace Umbraco.Core.Events
     public class ImportPackageEventArgs<TEntity> : CancellableEnumerableObjectEventArgs<TEntity>, IEquatable<ImportPackageEventArgs<TEntity>>
     {
         private readonly MetaData _packageMetaData;
-
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying packageMetaData instead")]
         public ImportPackageEventArgs(TEntity eventObject, bool canCancel)
             : base(new[] { eventObject }, canCancel)
         {
         }
 
-        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
-            : base(new[] { eventObject })
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData, bool canCancel)
+            : base(new[] { eventObject }, canCancel)
         {
+            if (packageMetaData == null) throw new ArgumentNullException("packageMetaData");
             _packageMetaData = packageMetaData;
         }
 
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
+            : this(eventObject, packageMetaData, true)
+        {
+            
+        }
+
         public MetaData PackageMetaData
         {
             get { return _packageMetaData; }

src/Umbraco.Core/Events/ScopeEventDispatcherBase.cs

@@ -76,260 +76,257 @@ namespace Umbraco.Core.Events
         {
             if (_events == null)
                 return Enumerable.Empty<IEventDefinition>();
-            
+
+            IReadOnlyList<IEventDefinition> events;
             switch (filter)
             {
                 case EventDefinitionFilter.All:
-                    return FilterSupersededAndUpdateToLatestEntity(_events);
+                    events = _events;
+                    break;
                 case EventDefinitionFilter.FirstIn:
                     var l1 = new OrderedHashSet<IEventDefinition>();
                     foreach (var e in _events)
-                    {
                         l1.Add(e);
-                    }
-                    return FilterSupersededAndUpdateToLatestEntity(l1);
+                    events = l1;
+                    break;
                 case EventDefinitionFilter.LastIn:
                     var l2 = new OrderedHashSet<IEventDefinition>(keepOldest: false);
                     foreach (var e in _events)
-                    {
                         l2.Add(e);
-                    }
-                    return FilterSupersededAndUpdateToLatestEntity(l2);
+                    events = l2;
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException("filter", filter, null);
             }
+
+            return FilterSupersededAndUpdateToLatestEntity(events);
         }
-        
-        private class EventDefinitionTypeData
+
+        private class EventDefinitionInfos
         {
             public IEventDefinition EventDefinition { get; set; }
-            public Type EventArgType { get; set; }
-            public SupersedeEventAttribute[] SupersedeAttributes { get; set; }
+            public Type[] SupersedeTypes { get; set; }
         }
-        
-        /// <summary>
-        /// This will iterate over the events (latest first) and filter out any events or entities in event args that are included 
-        /// in more recent events that Supersede previous ones. For example, If an Entity has been Saved and then Deleted, we don't want
-        /// to raise the Saved event (well actually we just don't want to include it in the args for that saved event)
-        /// </summary>
-        /// <param name="events"></param>
-        /// <returns></returns>
-        private static IEnumerable<IEventDefinition> FilterSupersededAndUpdateToLatestEntity(IReadOnlyList<IEventDefinition> events)
+
+        // fixme
+        // this is way too convoluted, the superceede attribute is used only on DeleteEventargs to specify
+        // that it superceeds save, publish, move and copy - BUT - publish event args is also used for
+        // unpublishing and should NOT be superceeded - so really it should not be managed at event args
+        // level but at event level
+        //
+        // what we want is:
+        // if an entity is deleted, then all Saved, Moved, Copied, Published events prior to this should
+        // not trigger for the entity - and even though, does it make any sense? making a copy of an entity
+        // should ... trigger?
+        //
+        // not going to refactor it all - we probably want to *always* trigger event but tell people that
+        // due to scopes, they should not expected eg a saved entity to still be around - however, now,
+        // going to write a ugly condition to deal with U4-10764
+
+        // iterates over the events (latest first) and filter out any events or entities in event args that are included
+        // in more recent events that Supersede previous ones. For example, If an Entity has been Saved and then Deleted, we don't want
+        // to raise the Saved event (well actually we just don't want to include it in the args for that saved event)
+        internal static IEnumerable<IEventDefinition> FilterSupersededAndUpdateToLatestEntity(IReadOnlyList<IEventDefinition> events)
         {
-            //used to keep the 'latest' entity and associated event definition data
-            var allEntities = new List<Tuple<IEntity, EventDefinitionTypeData>>();
-
-            //tracks all CancellableObjectEventArgs instances in the events which is the only type of args we can work with
-            var cancelableArgs = new List<CancellableObjectEventArgs>();
+            // keeps the 'latest' entity and associated event data
+            var entities = new List<Tuple<IEntity, EventDefinitionInfos>>();
 
+            // collects the event definitions
+            // collects the arguments in result, that require their entities to be updated
             var result = new List<IEventDefinition>();
+            var resultArgs = new List<CancellableObjectEventArgs>();
 
-            //This will eagerly load all of the event arg types and their attributes so we don't have to continuously look this data up
-            var allArgTypesWithAttributes = events.Select(x => x.Args.GetType())
+            // eagerly fetch superceeded arg types for each arg type
+            var argTypeSuperceeding = events.Select(x => x.Args.GetType())
                 .Distinct()
-                .ToDictionary(x => x, x => x.GetCustomAttributes<SupersedeEventAttribute>(false).ToArray());
-               
-            //Iterate all events and collect the actual entities in them and relates them to their corresponding EventDefinitionTypeData
-            //we'll process the list in reverse because events are added in the order they are raised and we want to filter out
-            //any entities from event args that are not longer relevant 
-            //(i.e. if an item is Deleted after it's Saved, we won't include the item in the Saved args)
+                .ToDictionary(x => x, x => x.GetCustomAttributes<SupersedeEventAttribute>(false).Select(y => y.SupersededEventArgsType).ToArray());
+
+            // iterate over all events and filter
+            //
+            // process the list in reverse, because events are added in the order they are raised and we want to keep
+            // the latest (most recent) entities and filter out what is not relevant anymore (too old), eg if an entity
+            // is Deleted after being Saved, we want to filter out the Saved event
             for (var index = events.Count - 1; index >= 0; index--)
             {
-                var eventDefinition = events[index];
+                var def = events[index];
 
-                var argType = eventDefinition.Args.GetType();
-                var attributes = allArgTypesWithAttributes[eventDefinition.Args.GetType()];
-
-                var meta = new EventDefinitionTypeData
+                var infos = new EventDefinitionInfos
                 {
-                    EventDefinition = eventDefinition,
-                    EventArgType = argType,
-                    SupersedeAttributes = attributes
+                    EventDefinition = def,
+                    SupersedeTypes = argTypeSuperceeding[def.Args.GetType()]
                 };
 
-                var args = eventDefinition.Args as CancellableObjectEventArgs;
-                if (args != null)
+                var args = def.Args as CancellableObjectEventArgs;
+                if (args == null)
                 {
-                    var list = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
-
-                    if (list == null)
+                    // not a cancellable event arg, include event definition in result
+                    result.Add(def);
+                }
+                else
+                {
+                    // event object can either be a single object or an enumerable of objects
+                    // try to get as an enumerable, get null if it's not
+                    var eventObjects = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
+                    if (eventObjects == null)
                     {
-                        //extract the event object
-                        var obj = args.EventObject as IEntity;
-                        if (obj != null)
+                        // single object, cast as an IEntity
+                        // if cannot cast, cannot filter, nothing - just include event definition in result
+                        var eventEntity = args.EventObject as IEntity;
+                        if (eventEntity == null)
                         {
-                            //Now check if this entity already exists in other event args that supersede this current event arg type
-                            if (IsFiltered(obj, meta, allEntities) == false)
-                            {
-                                //if it's not filtered we can adde these args to the response
-                                cancelableArgs.Add(args);
-                                result.Add(eventDefinition);
-                                //track the entity
-                                allEntities.Add(Tuple.Create(obj, meta));
-                            }
+                            result.Add(def);
+                            continue;
                         }
-                        else
+
+                        // look for this entity in superceding event args
+                        // found = must be removed (ie not added), else track
+                        if (IsSuperceeded(eventEntity, infos, entities) == false)
                         {
-                            //Can't retrieve the entity so cant' filter or inspect, just add to the output
-                            result.Add(eventDefinition);                            
+                            // track
+                            entities.Add(Tuple.Create(eventEntity, infos));
+
+                            // track result arguments
+                            // include event definition in result
+                            resultArgs.Add(args);
+                            result.Add(def);
                         }
                     }
                     else
                     {
+                        // enumerable of objects
                         var toRemove = new List<IEntity>();
-                        foreach (var entity in list)
+                        foreach (var eventObject in eventObjects)
                         {
-                            //extract the event object
-                            var obj = entity as IEntity;
-                            if (obj != null)
-                            {
-                                //Now check if this entity already exists in other event args that supersede this current event arg type
-                                if (IsFiltered(obj, meta, allEntities))
-                                {
-                                    //track it to be removed
-                                    toRemove.Add(obj);
-                                }
-                                else
-                                {
-                                    //track the entity, it's not filtered
-                                    allEntities.Add(Tuple.Create(obj, meta));
-                                }
-                            }
+                            // extract the event object, cast as an IEntity
+                            // if cannot cast, cannot filter, nothing to do - just leave it in the list & continue
+                            var eventEntity = eventObject as IEntity;
+                            if (eventEntity == null)
+                                continue;
+
+                            // look for this entity in superceding event args
+                            // found = must be removed, else track
+                            if (IsSuperceeded(eventEntity, infos, entities))
+                                toRemove.Add(eventEntity);
                             else
-                            {
-                                //we don't need to do anything here, we can't cast to IEntity so we cannot filter, so it will just remain in the list
-                            }
+                                entities.Add(Tuple.Create(eventEntity, infos));
                         }
 
-                        //remove anything that has been filtered
+                        // remove superceded entities
                         foreach (var entity in toRemove)
-                        {
-                            list.Remove(entity);
-                        }
+                            eventObjects.Remove(entity);
 
-                        //track the event and include in the response if there's still entities remaining in the list
-                        if (list.Count > 0)
+                        // if there are still entities in the list, keep the event definition
+                        if (eventObjects.Count > 0)
                         {
                             if (toRemove.Count > 0)
                             {
-                                //re-assign if the items have changed
-                                args.EventObject = list;
+                                // re-assign if changed
+                                args.EventObject = eventObjects;
                             }
-                            cancelableArgs.Add(args);
-                            result.Add(eventDefinition);
+
+                            // track result arguments
+                            // include event definition in result
+                            resultArgs.Add(args);
+                            result.Add(def);
                         }
                     }
                 }
-                else
-                {
-                    //it's not a cancelable event arg so we just include it in the result
-                    result.Add(eventDefinition);
-                }
             }
 
-            //Now we'll deal with ensuring that only the latest(non stale) entities are used throughout all event args
-            UpdateToLatestEntities(allEntities, cancelableArgs);
+            // go over all args in result, and update them with the latest instanceof each entity
+            UpdateToLatestEntities(entities, resultArgs);
 
-            //we need to reverse the result since we've been adding by latest added events first!
+            // reverse, since we processed the list in reverse
             result.Reverse();
 
             return result;
         }
 
-        private static void UpdateToLatestEntities(IEnumerable<Tuple<IEntity, EventDefinitionTypeData>> allEntities, IEnumerable<CancellableObjectEventArgs> cancelableArgs)
+        // edits event args to use the latest instance of each entity
+        private static void UpdateToLatestEntities(IEnumerable<Tuple<IEntity, EventDefinitionInfos>> entities, IEnumerable<CancellableObjectEventArgs> args)
         {
-            //Now we'll deal with ensuring that only the latest(non stale) entities are used throughout all event args
-
+            // get the latest entities
+            // ordered hash set + keepOldest will keep the latest inserted entity (in case of duplicates)
             var latestEntities = new OrderedHashSet<IEntity>(keepOldest: true);
-            foreach (var entity in allEntities.OrderByDescending(entity => entity.Item1.UpdateDate))
-            {
+            foreach (var entity in entities.OrderByDescending(entity => entity.Item1.UpdateDate))
                 latestEntities.Add(entity.Item1);
-            }
 
-            foreach (var args in cancelableArgs)
+            foreach (var arg in args)
             {
-                var list = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
-                if (list == null)
+                // event object can either be a single object or an enumerable of objects
+                // try to get as an enumerable, get null if it's not
+                var eventObjects = TypeHelper.CreateGenericEnumerableFromObject(arg.EventObject);
+                if (eventObjects == null)
                 {
-                    //try to find the args entity in the latest entity - based on the equality operators, this will 
-                    //match by Id since that is the default equality checker for IEntity. If one is found, than it is 
-                    //the most recent entity instance so update the args with that instance so we don't emit a stale instance.
-                    var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, args.EventObject));
+                    // single object
+                    // look for a more recent entity for that object, and replace if any
+                    // works by "equalling" entities ie the more recent one "equals" this one (though different object)
+                    var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, arg.EventObject));
                     if (foundEntity != null)
-                    {
-                        args.EventObject = foundEntity;
-                    }
+                        arg.EventObject = foundEntity;
                 }
                 else
                 {
+                    // enumerable of objects
+                    // same as above but for each object
                     var updated = false;
-
-                    for (int i = 0; i < list.Count; i++)
+                    for (var i = 0; i < eventObjects.Count; i++)
                     {
-                        //try to find the args entity in the latest entity - based on the equality operators, this will 
-                        //match by Id since that is the default equality checker for IEntity. If one is found, than it is 
-                        //the most recent entity instance so update the args with that instance so we don't emit a stale instance.
-                        var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, list[i]));
-                        if (foundEntity != null)
-                        {
-                            list[i] = foundEntity;
-                            updated = true;
-                        }
+                        var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, eventObjects[i]));
+                        if (foundEntity == null) continue;
+                        eventObjects[i] = foundEntity;
+                        updated = true;
                     }
 
                     if (updated)
-                    {
-                        args.EventObject = list;
-                    }
+                        arg.EventObject = eventObjects;
                 }
             }
         }
 
-        /// <summary>
-        /// This will check against all of the processed entity/events (allEntities) to see if this entity already exists in 
-        /// event args that supersede the event args being passed in and if so returns true.
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="eventDef"></param>
-        /// <param name="allEntities"></param>
-        /// <returns></returns>
-        private static bool IsFiltered(
-            IEntity entity,
-            EventDefinitionTypeData eventDef,
-            List<Tuple<IEntity, EventDefinitionTypeData>> allEntities)
+        // determines if a given entity, appearing in a given event definition, should be filtered out,
+        // considering the entities that have already been visited - an entity is filtered out if it
+        // appears in another even definition, which superceedes this event definition.
+        private static bool IsSuperceeded(IEntity entity, EventDefinitionInfos infos, List<Tuple<IEntity, EventDefinitionInfos>> entities)
         {
-            var argType = eventDef.EventDefinition.Args.GetType();
+            //var argType = meta.EventArgsType;
+            var argType = infos.EventDefinition.Args.GetType();
 
-            //check if the entity is found in any processed event data that could possible supersede this one
-            var foundByEntity = allEntities
-                .Where(x => x.Item2.SupersedeAttributes.Length > 0
-                            //if it's the same arg type than it cannot supersede                
-                            && x.Item2.EventArgType != argType
-                            && Equals(x.Item1, entity))
+            // look for other instances of the same entity, coming from an event args that supercedes other event args,
+            // ie is marked with the attribute, and is not this event args (cannot supersede itself)
+            var superceeding = entities
+                .Where(x => x.Item2.SupersedeTypes.Length > 0 // has the attribute
+                    && x.Item2.EventDefinition.Args.GetType() != argType // is not the same
+                    && Equals(x.Item1, entity)) // same entity
                 .ToArray();
 
-            //no args have been processed with this entity so it should not be filtered
-            if (foundByEntity.Length == 0)
+            // first time we see this entity = not filtered
+            if (superceeding.Length == 0)
                 return false;
 
+            // fixme see notes above
+            // delete event args does NOT superceedes 'unpublished' event
+            if (argType.IsGenericType && argType.GetGenericTypeDefinition() == typeof(PublishEventArgs<>) && infos.EventDefinition.EventName == "UnPublished")
+                return false;
+
+            // found occurences, need to determine if this event args is superceded
             if (argType.IsGenericType)
             {
-                var supercededBy = foundByEntity
-                    .FirstOrDefault(x =>
-                        x.Item2.SupersedeAttributes.Any(y =>
-                            //if the attribute type is a generic type def then compare with the generic type def of the event arg
-                                (y.SupersededEventArgsType.IsGenericTypeDefinition && y.SupersededEventArgsType == argType.GetGenericTypeDefinition())
-                                //if the attribute type is not a generic type def then compare with the normal type of the event arg
-                                || (y.SupersededEventArgsType.IsGenericTypeDefinition == false && y.SupersededEventArgsType == argType)));
+                // generic, must compare type arguments
+                var supercededBy = superceeding.FirstOrDefault(x =>
+                    x.Item2.SupersedeTypes.Any(y =>
+                        // superceeding a generic type which has the same generic type definition
+                        // fixme no matter the generic type parameters? could be different?
+                        y.IsGenericTypeDefinition && y == argType.GetGenericTypeDefinition()
+                        // or superceeding a non-generic type which is ... fixme how is this ever possible? argType *is* generic?
+                        || y.IsGenericTypeDefinition == false && y == argType));
                 return supercededBy != null;
             }
             else
             {
-                var supercededBy = foundByEntity
-                    .FirstOrDefault(x =>
-                        x.Item2.SupersedeAttributes.Any(y =>
-                            //since the event arg type is not a generic type, then we just compare type 1:1
-                                y.SupersededEventArgsType == argType));
+                // non-generic, can compare types 1:1
+                var supercededBy = superceeding.FirstOrDefault(x =>
+                    x.Item2.SupersedeTypes.Any(y => y == argType));
                 return supercededBy != null;
             }
         }

src/Umbraco.Core/IO/IOHelper.cs

@@ -13,11 +13,28 @@ using Umbraco.Core.Configuration;
 namespace Umbraco.Core.IO
 {
 	public static class IOHelper
-    {
+	{
+        /// <summary>
+        /// Gets or sets a value forcing Umbraco to consider it is non-hosted.
+        /// </summary>
+        /// <remarks>This should always be false, unless unit testing.</remarks>
+	    public static bool ForceNotHosted { get; set; }
+
         private static string _rootDir = "";
 
         // static compiled regex for faster performance
         private readonly static Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+
+        /// <summary>
+        /// Gets a value indicating whether Umbraco is hosted.
+        /// </summary>
+	    public static bool IsHosted
+	    {
+	        get
+	        {
+	            return ForceNotHosted == false && (HttpContext.Current != null || HostingEnvironment.IsHosted);
+            }
+	    }
 
         public static char DirSepChar
         {
@@ -72,14 +89,14 @@ namespace Umbraco.Core.IO
         internal static string ResolveUrlsFromTextString(string text)
         {
             if (UmbracoConfig.For.UmbracoSettings().Content.ResolveUrlsFromTextString)
-            {				
+            {
 				using (DisposableTimer.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete"))
 				{
 					// find all relative urls (ie. urls that contain ~)
 					var tags = ResolveUrlPattern.Matches(text);
-					
+
 					foreach (Match tag in tags)
-					{						
+					{
 						string url = "";
 						if (tag.Groups[1].Success)
 							url = tag.Groups[1].Value;
@@ -97,7 +114,8 @@ namespace Umbraco.Core.IO
 
         public static string MapPath(string path, bool useHttpContext)
         {
-            if (path == null) throw new ArgumentNullException("path");
+            if (path == null) throw new ArgumentNullException("path");
+            useHttpContext = useHttpContext && IsHosted;
 
             // Check if the path is already mapped
             if ((path.Length >= 2 && path[1] == Path.VolumeSeparatorChar)
@@ -303,7 +321,7 @@ namespace Umbraco.Core.IO
             var debugFolder = Path.Combine(binFolder, "debug");
             if (Directory.Exists(debugFolder))
                 return debugFolder;
-#endif   
+#endif
             var releaseFolder = Path.Combine(binFolder, "release");
             if (Directory.Exists(releaseFolder))
                 return releaseFolder;

src/Umbraco.Core/IO/SystemFiles.cs

@@ -73,19 +73,19 @@ namespace Umbraco.Core.IO
         {
             get
             {
-                switch (GlobalSettings.ContentCacheXmlStorageLocation)
+                switch (GlobalSettings.LocalTempStorageLocation)
                 {                    
-                    case ContentXmlStorage.AspNetTemp:
+                    case LocalTempStorage.AspNetTemp:
                         return Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco.config");
-                    case ContentXmlStorage.EnvironmentTemp:
+                    case LocalTempStorage.EnvironmentTemp:
                         var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
-                        var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoXml",
-                            //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
-                            // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
-                            // utilizing an old path
+                        var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                            //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                            // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                            // utilizing an old path
                             appDomainHash);
                         return Path.Combine(cachePath, "umbraco.config");
-                    case ContentXmlStorage.Default:
+                    case LocalTempStorage.Default:
                         return IOHelper.ReturnPath("umbracoContentXML", "~/App_Data/umbraco.config");
                     default:
                         throw new ArgumentOutOfRangeException();

src/Umbraco.Core/Logging/RollingFileCleanupAppender.cs

@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+using log4net.Appender;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+    /// <summary>
+    /// This class will do the exact same thing as the RollingFileAppender that comes from log4net
+    /// With the extension, that it is able to do automatic cleanup of the logfiles in the directory where logging happens
+    /// 
+    /// By specifying the properties MaxLogFileDays and BaseFilePattern, the files will automaticly get deleted when
+    /// the logger is configured(typically when the app starts). To utilize this appender swap out the type of the rollingFile appender
+    /// that ships with Umbraco, to be Umbraco.Core.Logging.RollingFileCleanupAppender, and add the maxLogFileDays and baseFilePattern elements 
+    /// to the configuration i.e.:
+    /// 
+    /// <example>
+    ///  <appender name="rollingFile" type="Log4netAwesomeness.CustomRollingFileAppender, Log4netAwesomeness">
+    ///	  <file type="log4net.Util.PatternString" value="App_Data\Logs\UmbracoTraceLog.%property{log4net:HostName}.txt" />
+    ///    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    ///    <appendToFile value="true" />
+    ///    <rollingStyle value="Date" />
+    ///    <maximumFileSize value="5MB" />
+    ///    <maxLogFileDays value="5"/>
+    ///    <basefilePattern value="UmbracoTraceLog.*.txt.*"/>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <encoding value="utf-8" />
+    ///  </appender>
+    /// </example>
+    /// </summary>
+    public class RollingFileCleanupAppender : RollingFileAppender
+    {
+        public int MaxLogFileDays { get; set; }
+        public string BaseFilePattern { get; set; }
+
+        /// <summary>
+        /// This override will delete logs older than the specified amount of days
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="append"></param>
+        protected override void OpenFile(string fileName, bool append)
+        {
+            bool cleanup = true;
+            // Validate settings and input
+            if (MaxLogFileDays <= 0)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'MaxLogFileDays' needs to be a positive integer, aborting cleanup");
+                cleanup = false;
+            }
+
+            if (string.IsNullOrWhiteSpace(BaseFilePattern))
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'BaseFilePattern' is empty, aborting cleanup");
+                cleanup = false;
+            }
+            // grab the directory we are logging to, as this is were we will search for older logfiles
+            var logFolder = Path.GetDirectoryName(fileName);
+            if (Directory.Exists(logFolder) == false)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), string.Format("Directory '{0}' for logfiles does not exist, aborting cleanup", logFolder));
+                cleanup = false;
+            }
+            // If everything is validated, we can do the actual cleanup
+            if (cleanup)
+            {
+                Cleanup(logFolder);
+            }
+
+            base.OpenFile(fileName, append);
+        }
+
+        private void Cleanup(string directoryPath)
+        {
+            // only take files that matches the pattern we are using i.e. UmbracoTraceLog.*.txt.*
+            string[] logFiles = Directory.GetFiles(directoryPath, BaseFilePattern);
+            LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Found {0} files that matches the baseFilePattern: '{1}'", logFiles.Length, BaseFilePattern));
+
+            foreach (var logFile in logFiles)
+            {
+                DateTime lastAccessTime = System.IO.File.GetLastWriteTimeUtc(logFile);
+                // take the value from the config file
+                if (lastAccessTime < DateTime.Now.AddDays(-MaxLogFileDays))
+                {
+                    LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Deleting file {0} as its lastAccessTime is older than {1} days speficied by MaxLogFileDays", logFile, MaxLogFileDays));
+                    base.DeleteFile(logFile);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Models/ContentType.cs

@@ -95,8 +95,10 @@ namespace Umbraco.Core.Models
             get { return _allowedTemplates; }
             set
             {
-                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector,
-                   Ps.Value.TemplateComparer);
+                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector, Ps.Value.TemplateComparer);
+
+                if (_allowedTemplates.Any(x => x.Id == _defaultTemplate) == false)
+                    DefaultTemplateId = 0;
             }
         }
 

src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs

@@ -42,6 +42,14 @@ namespace Umbraco.Core.Models.Identity
 
         private BackOfficeIdentityUser()
         {
+            _startMediaIds = new int[] { };
+            _startContentIds = new int[] { };
+            _groups = new IReadOnlyUserGroup[] { };
+            _allowedSections = new string[] { };
+            _culture = Configuration.GlobalSettings.DefaultUILanguage;
+            _groups = new IReadOnlyUserGroup[0];
+            _roles = new ObservableCollection<IdentityUserRole<string>>();
+            _roles.CollectionChanged += _roles_CollectionChanged;
         }
 
         /// <summary>

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

@@ -17,7 +17,30 @@ namespace Umbraco.Core.Models.Membership
         }
 
         /// <summary>
-        /// Returns the aggregate permissions in the permission set
+        /// Returns the aggregate permissions in the permission set for a single node
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// This value is only calculated once per node
+        /// </remarks>
+        public IEnumerable<string> GetAllPermissions(int entityId)
+        {
+            if (_aggregateNodePermissions == null)
+                _aggregateNodePermissions = new Dictionary<int, string[]>();
+
+            string[] entityPermissions;
+            if (_aggregateNodePermissions.TryGetValue(entityId, out entityPermissions) == false)
+            {
+                entityPermissions = this.Where(x => x.EntityId == entityId).SelectMany(x => x.AssignedPermissions).Distinct().ToArray();
+                _aggregateNodePermissions[entityId] = entityPermissions;
+            }
+            return entityPermissions;
+        }
+
+        private Dictionary<int, string[]> _aggregateNodePermissions;
+
+        /// <summary>
+        /// Returns the aggregate permissions in the permission set for all nodes
         /// </summary>
         /// <returns></returns>
         /// <remarks>

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

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Models.Membership
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    internal class UserGroup : Entity, IUserGroup, IReadOnlyUserGroup
+    public class UserGroup : Entity, IUserGroup, IReadOnlyUserGroup
     {
         private int? _startContentId;
         private int? _startMediaId;

src/Umbraco.Core/Models/UmbracoObjectTypes.cs

@@ -188,7 +188,7 @@ namespace Umbraco.Core.Models
         Language,
 
         /// <summary>
-        /// Document
+        /// Document Blueprint
         /// </summary>
         [UmbracoObjectType(Constants.ObjectTypes.DocumentBlueprint, typeof(IContent))]
         [FriendlyName("DocumentBlueprint")]

src/Umbraco.Core/Persistence/LocalDb.cs

@@ -24,6 +24,7 @@ namespace Umbraco.Core.Persistence
     {
         private int _version;
         private bool _hasVersion;
+        private string _exe;
 
         #region Availability & Version
 
@@ -84,16 +85,31 @@ namespace Umbraco.Core.Persistence
         {
             _hasVersion = true;
             _version = -1;
+            _exe = null;
 
             var programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
-            if (programFiles == null) return;
+
+            // MS SQL Server installs in e.g. "C:\Program Files\Microsoft SQL Server", so
+            // we want to detect it in "%ProgramFiles%\Microsoft SQL Server" - however, if
+            // Umbraco runs as a 32bits process (e.g. IISExpress configured as 32bits)
+            // on a 64bits system, %ProgramFiles% will point to "C:\Program Files (x86)"
+            // and SQL Server cannot be found. But then, %ProgramW6432% will point to
+            // the original "C:\Program Files". Using it to fix the path.
+            // see also: MSDN doc for WOW64 implementation
+            //
+            var programW6432 = Environment.GetEnvironmentVariable("ProgramW6432");
+            if (string.IsNullOrWhiteSpace(programW6432) == false && programW6432 != programFiles)
+                programFiles = programW6432;
+
+            if (string.IsNullOrWhiteSpace(programFiles)) return;
 
             // detect 14, 13, 12, 11
             for (var i = 14; i > 10; i--)
             {
-                var path = Path.Combine(programFiles, string.Format(@"Microsoft SQL Server\{0}0\Tools\Binn\SqlLocalDB.exe", i));
-                if (File.Exists(path) == false) continue;
+                var exe = Path.Combine(programFiles, string.Format(@"Microsoft SQL Server\{0}0\Tools\Binn\SqlLocalDB.exe", i));
+                if (File.Exists(exe) == false) continue;
                 _version = i;
+                _exe = exe;
                 break;
             }
         }
@@ -897,16 +913,13 @@ namespace Umbraco.Core.Persistence
         /// </remarks>
         private int ExecuteSqlLocalDb(string args, out string output, out string error)
         {
-            var programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
-            if (programFiles == null)
+            if (_exe == null) // should never happen - we should not execute if not available
             {
                 output = string.Empty;
                 error = "SqlLocalDB.exe not found";
                 return -1;
             }
 
-            var path = Path.Combine(programFiles, string.Format(@"Microsoft SQL Server\{0}0\Tools\Binn\SqlLocalDB.exe", _version));
-
             var p = new Process
             {
                 StartInfo =
@@ -914,7 +927,7 @@ namespace Umbraco.Core.Persistence
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
-                    FileName = path,
+                    FileName = _exe,
                     Arguments = args,
                     CreateNoWindow = true,
                     WindowStyle = ProcessWindowStyle.Hidden
@@ -929,7 +942,7 @@ namespace Umbraco.Core.Persistence
         }
 
         /// <summary>
-        /// Returns a Unicode string with the delimiters added to make the input string a valid SQL Server delimited identifier. 
+        /// Returns a Unicode string with the delimiters added to make the input string a valid SQL Server delimited identifier.
         /// </summary>
         /// <param name="name">The name to quote.</param>
         /// <param name="quote">A quote character.</param>

src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs

@@ -134,7 +134,9 @@ namespace Umbraco.Core.Persistence.Repositories
                 .InnerJoin<ContentDto>(SqlSyntax)
                 .On<ContentVersionDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                 .InnerJoin<NodeDto>(SqlSyntax)
-                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId);
+                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentTypeDto>()
+                .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId);
             //TODO: IF we want to enable querying on content type information this will need to be joined
             //.InnerJoin<ContentTypeDto>(SqlSyntax)
             //.On<ContentDto, ContentTypeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId, SqlSyntax);
@@ -833,11 +835,21 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
 
         }
 
-        public int CountPublished()
-        {
-            var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
-                .Where<DocumentDto>(x => x.Published == true);
-            return Database.ExecuteScalar<int>(sql);
+        public int CountPublished(string contentTypeAlias = null)
+        {
+            if (contentTypeAlias.IsNullOrWhiteSpace())
+            {
+                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
+                .Where<DocumentDto>(x => x.Published == true);
+                return Database.ExecuteScalar<int>(sql);
+            }
+            else
+            {
+                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
+                .Where<DocumentDto>(x => x.Published == true)
+                .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+                return Database.ExecuteScalar<int>(sql);
+            }
         }
 
         public void ReplaceContentPermissions(EntityPermissionSet permissionSet)

src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs

@@ -26,7 +26,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <remarks>
         /// We require this on the repo because the IQuery{IContent} cannot supply the 'newest' parameter
         /// </remarks>
-        int CountPublished();
+        int CountPublished(string contentTypeAlias = null);
 
         /// <summary>
         /// Used to bulk update the permissions set for a content item. This will replace all permissions

src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs

@@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories
         public IMemberGroup GetByName(string name)
         {
             return IsolatedCache.GetCacheItem<IMemberGroup>(
-                string.Format("{0}.{1}", typeof (IMemberGroup).FullName, name),
+                string.Format("{0}.{1}", typeof(IMemberGroup).FullName, name),
                 () =>
                 {
                     var qry = new Query<IMemberGroup>().Where(group => group.Name.Equals(name));
@@ -140,7 +140,7 @@ namespace Umbraco.Core.Persistence.Repositories
                     return result.FirstOrDefault();
                 },
                 //cache for 5 mins since that is the default in the RuntimeCacheProvider
-                TimeSpan.FromMinutes(5), 
+                TimeSpan.FromMinutes(5),
                 //sliding is true
                 true);
         }
@@ -183,17 +183,17 @@ namespace Umbraco.Core.Persistence.Repositories
         }
 
         public IEnumerable<IMemberGroup> GetMemberGroupsForMember(string username)
-        {
-            var sql = new Sql()
+        {
+            var sql = new Sql()
                 .Select("un.*")
                 .From("umbracoNode AS un")
                 .InnerJoin("cmsMember2MemberGroup")
-                .On("un.id = cmsMember2MemberGroup.MemberGroup")
-                .LeftJoin("(SELECT umbracoNode.id, cmsMember.LoginName FROM umbracoNode INNER JOIN cmsMember ON umbracoNode.id = cmsMember.nodeId) AS member")
-                .On("member.id = cmsMember2MemberGroup.Member")
-                .Where("un.nodeObjectType=@objectType", new {objectType = NodeObjectTypeId })
-                .Where("member.LoginName=@loginName", new {loginName = username});
-            
+                .On("cmsMember2MemberGroup.MemberGroup = un.id")
+                .InnerJoin("cmsMember")
+                .On("cmsMember.nodeId = cmsMember2MemberGroup.Member")
+                .Where("un.nodeObjectType=@objectType", new { objectType = NodeObjectTypeId })
+                .Where("cmsMember.LoginName=@loginName", new { loginName = username });
+            
             return Database.Fetch<NodeDto>(sql)
                 .DistinctBy(dto => dto.NodeId)
                 .Select(x => _modelFactory.BuildEntity(x));
@@ -337,4 +337,4 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         internal static event TypedEventHandler<IMemberGroupRepository, SaveEventArgs<IMemberGroup>> SavedMemberGroup;
     }
-}
+}

src/Umbraco.Core/Persistence/Repositories/SimilarNodeName.cs

@@ -20,6 +20,12 @@ namespace Umbraco.Core.Persistence.Repositories
 
                 var name = Name;
 
+				// cater for instances where node has no name.
+				if(string.IsNullOrWhiteSpace(name))
+				{
+					return _numPos;
+ 				}
+
                 if (name[name.Length - 1] != ')')
                     return _numPos = -1;
 
@@ -106,7 +112,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 }
             }
 
-            return uniqueing ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
+            return uniqueing || string.IsNullOrWhiteSpace(nodeName) ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
         }
     }
 }

src/Umbraco.Core/Persistence/Repositories/UserRepository.cs

@@ -191,11 +191,11 @@ ORDER BY colName";
 
             return new Dictionary<UserState, int>
             {
-                {UserState.All, result[0].num},
-                {UserState.Active, result[1].num},
-                {UserState.Disabled, result[2].num},
-                {UserState.LockedOut, result[3].num},
-                {UserState.Invited, result[4].num}
+                {UserState.All, (int)result[0].num},
+                {UserState.Active, (int)result[1].num},
+                {UserState.Disabled, (int)result[2].num},
+                {UserState.LockedOut, (int)result[3].num},
+                {UserState.Invited, (int)result[4].num}
             };
         }
 

src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs

@@ -687,8 +687,8 @@ ORDER BY contentNodeId, versionId, propertytypeid
                 case "NAME":
                     return "umbracoNode.text";
                 case "PUBLISHED":
-                case "OWNER":
                     return "cmsDocument.published";
+                case "OWNER":
                     //TODO: This isn't going to work very nicely because it's going to order by ID, not by letter
                     return "umbracoNode.nodeUser";
                 // Members only

src/Umbraco.Core/PluginManager.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading;
+using System.Web;
 using System.Web.Compilation;
 using Umbraco.Core.Cache;
 using Umbraco.Core.IO;
@@ -15,6 +16,7 @@ using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.PropertyEditors;
 using umbraco.interfaces;
+using Umbraco.Core.Configuration;
 using File = System.IO.File;
 
 namespace Umbraco.Core
@@ -39,7 +41,8 @@ namespace Umbraco.Core
         private readonly IServiceProvider _serviceProvider;
         private readonly IRuntimeCacheProvider _runtimeCache;
         private readonly ProfilingLogger _logger;
-        private readonly string _tempFolder;
+        private readonly Lazy<string> _pluginListFilePath = new Lazy<string>(GetPluginListFilePath);
+        private readonly Lazy<string> _pluginHashFilePath = new Lazy<string>(GetPluginHashFilePath);
 
         private readonly object _typesLock = new object();
         private readonly Dictionary<TypeListKey, TypeList> _types = new Dictionary<TypeListKey, TypeList>();
@@ -65,14 +68,7 @@ namespace Umbraco.Core
             _serviceProvider = serviceProvider;
             _runtimeCache = runtimeCache;
             _logger = logger;
-
-            // the temp folder where the cache file lives
-            _tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
-            if (Directory.Exists(_tempFolder) == false)
-                Directory.CreateDirectory(_tempFolder);
-
-            var pluginListFile = GetPluginListFilePath();
-
+            
             if (detectChanges)
             {
                 //first check if the cached hash is string.Empty, if it is then we need
@@ -84,7 +80,8 @@ namespace Umbraco.Core
                     // if the hash has changed, clear out the persisted list no matter what, this will force
                     // rescanning of all plugin types including lazy ones.
                     // http://issues.umbraco.org/issue/U4-4789
-                    File.Delete(pluginListFile);
+                    if(File.Exists(_pluginListFilePath.Value))
+                        File.Delete(_pluginListFilePath.Value);
 
                     WriteCachePluginsHash();
                 }
@@ -94,7 +91,8 @@ namespace Umbraco.Core
                 // if the hash has changed, clear out the persisted list no matter what, this will force
                 // rescanning of all plugin types including lazy ones.
                 // http://issues.umbraco.org/issue/U4-4789
-                File.Delete(pluginListFile);
+                if (File.Exists(_pluginListFilePath.Value))
+                    File.Delete(_pluginListFilePath.Value);
 
                 // always set to true if we're not detecting (generally only for testing)
                 RequiresRescanning = true;
@@ -187,11 +185,10 @@ namespace Umbraco.Core
             {
                 if (_cachedAssembliesHash != null)
                     return _cachedAssembliesHash;
+                
+                if (File.Exists(_pluginHashFilePath.Value) == false) return string.Empty;
 
-                var filePath = GetPluginHashFilePath();
-                if (File.Exists(filePath) == false) return string.Empty;
-
-                var hash = File.ReadAllText(filePath, Encoding.UTF8);
+                var hash = File.ReadAllText(_pluginHashFilePath.Value, Encoding.UTF8);
 
                 _cachedAssembliesHash = hash;
                 return _cachedAssembliesHash;
@@ -210,7 +207,7 @@ namespace Umbraco.Core
                     return _currentAssembliesHash;
 
                 _currentAssembliesHash = GetFileHash(new List<Tuple<FileSystemInfo, bool>>
-					{
+                    {
 						// the bin folder and everything in it
 						new Tuple<FileSystemInfo, bool>(new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Bin)), false),
 						// the app code folder and everything in it
@@ -219,7 +216,7 @@ namespace Umbraco.Core
 						new Tuple<FileSystemInfo, bool>(new FileInfo(IOHelper.MapPath("~/global.asax")), false),
                         // trees.config - use the contents to create the hash since this gets resaved on every app startup!
                         new Tuple<FileSystemInfo, bool>(new FileInfo(IOHelper.MapPath(SystemDirectories.Config + "/trees.config")), true)
-					}, _logger);
+                    }, _logger);
 
                 return _currentAssembliesHash;
             }
@@ -229,9 +226,8 @@ namespace Umbraco.Core
         /// Writes the assembly hash file.
         /// </summary>
         private void WriteCachePluginsHash()
-        {
-            var filePath = GetPluginHashFilePath();
-            File.WriteAllText(filePath, CurrentAssembliesHash.ToString(), Encoding.UTF8);
+        {        
+            File.WriteAllText(_pluginHashFilePath.Value, CurrentAssembliesHash, Encoding.UTF8);
         }
 
         /// <summary>
@@ -274,7 +270,7 @@ namespace Umbraco.Core
                             }
                         }
                     }
-                    return generator.GenerateHash();
+                    return generator.GenerateHash();
                 }
             }
         }
@@ -314,7 +310,7 @@ namespace Umbraco.Core
                         uniqInfos.Add(fileOrFolder.FullName);
                         generator.AddFileSystemItem(fileOrFolder);
                     }
-                    return generator.GenerateHash();
+                    return generator.GenerateHash();
                 }
             }
         }
@@ -347,12 +343,11 @@ namespace Umbraco.Core
             {
                 return ReadCache();
             }
-            catch
+            catch (Exception ex)
             {
                 try
                 {
-                    var filePath = GetPluginListFilePath();
-                    File.Delete(filePath);
+                    File.Delete(_pluginListFilePath.Value);
                 }
                 catch
                 {
@@ -366,12 +361,11 @@ namespace Umbraco.Core
         internal Dictionary<Tuple<string, string>, IEnumerable<string>> ReadCache()
         {
             var cache = new Dictionary<Tuple<string, string>, IEnumerable<string>>();
-
-            var filePath = GetPluginListFilePath();
-            if (File.Exists(filePath) == false)
+            
+            if (File.Exists(_pluginListFilePath.Value) == false)
                 return cache;
 
-            using (var stream = GetFileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read, ListFileOpenReadTimeout))
+            using (var stream = GetFileStream(_pluginListFilePath.Value, FileMode.Open, FileAccess.Read, FileShare.Read, ListFileOpenReadTimeout))
             using (var reader = new StreamReader(stream))
             {
                 while (true)
@@ -414,38 +408,86 @@ namespace Umbraco.Core
         /// <remarks>Generally only used for resetting cache, for example during the install process.</remarks>
         public void ClearPluginCache()
         {
-            var path = GetPluginListFilePath();
-            if (File.Exists(path))
-                File.Delete(path);
-
-            path = GetPluginHashFilePath();
-            if (File.Exists(path))
-                File.Delete(path);
+            if (File.Exists(_pluginListFilePath.Value))
+                File.Delete(_pluginListFilePath.Value);
+            
+            if (File.Exists(_pluginHashFilePath.Value))
+                File.Delete(_pluginHashFilePath.Value);
 
             _runtimeCache.ClearCacheItem(CacheKey);
         }
 
-        private string GetPluginListFilePath()
+        private static string GetPluginListFilePath()
         {
-            var filename = "umbraco-plugins." + NetworkHelper.FileSafeMachineName + ".list";
-            return Path.Combine(_tempFolder, filename);
+            string pluginListFilePath;
+            switch (GlobalSettings.LocalTempStorageLocation)
+            {                
+                case LocalTempStorage.AspNetTemp:
+                    pluginListFilePath = Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco-plugins.list");
+                    break;
+                case LocalTempStorage.EnvironmentTemp:
+                    var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
+                    var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                        //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                        // utilizing an old path
+                        appDomainHash);
+                    pluginListFilePath = Path.Combine(cachePath, "umbraco-plugins.list");
+                    break;
+                case LocalTempStorage.Default:                    
+                default:
+                    var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
+                    pluginListFilePath = Path.Combine(tempFolder, "umbraco-plugins." + NetworkHelper.FileSafeMachineName + ".list");
+                    break;
+            }
+
+            //ensure the folder exists
+            var folder = Path.GetDirectoryName(pluginListFilePath);
+            if (folder == null)
+                throw new InvalidOperationException("The folder could not be determined for the file " + pluginListFilePath);
+            if (Directory.Exists(folder) == false)
+                Directory.CreateDirectory(folder);
+
+            return pluginListFilePath;
         }
 
-        private string GetPluginHashFilePath()
+        private static string GetPluginHashFilePath()
         {
-            var filename = "umbraco-plugins." + NetworkHelper.FileSafeMachineName + ".hash";
-            return Path.Combine(_tempFolder, filename);
+            string pluginHashFilePath;
+            switch (GlobalSettings.LocalTempStorageLocation)
+            {
+                case LocalTempStorage.AspNetTemp:
+                    pluginHashFilePath = Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco-plugins.hash");
+                    break;
+                case LocalTempStorage.EnvironmentTemp:
+                    var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
+                    var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                        //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                        // utilizing an old path
+                        appDomainHash);
+                    pluginHashFilePath = Path.Combine(cachePath, "umbraco-plugins.hash");
+                    break;
+                case LocalTempStorage.Default:
+                default:
+                    var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
+                    pluginHashFilePath =  Path.Combine(tempFolder, "umbraco-plugins." + NetworkHelper.FileSafeMachineName + ".hash");
+                    break;
+            }
+
+            //ensure the folder exists
+            var folder = Path.GetDirectoryName(pluginHashFilePath);
+            if (folder == null)
+                throw new InvalidOperationException("The folder could not be determined for the file " + pluginHashFilePath);
+            if (Directory.Exists(folder) == false)
+                Directory.CreateDirectory(folder);
+            
+            return pluginHashFilePath;
         }
 
         internal void WriteCache()
         {
-            // be absolutely sure
-            if (Directory.Exists(_tempFolder) == false)
-                Directory.CreateDirectory(_tempFolder);
-
-            var filePath = GetPluginListFilePath();
-
-            using (var stream = GetFileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, ListFileOpenWriteTimeout))
+            using (var stream = GetFileStream(_pluginListFilePath.Value, FileMode.Create, FileAccess.Write, FileShare.None, ListFileOpenWriteTimeout))
             using (var writer = new StreamWriter(stream))
             {
                 foreach (var typeList in _types.Values)
@@ -461,8 +503,7 @@ namespace Umbraco.Core
 
         internal void UpdateCache()
         {
-            // note
-            // at the moment we write the cache to disk every time we update it. ideally we defer the writing
+            // TODO: at the moment we write the cache to disk every time we update it. ideally we defer the writing
             // since all the updates are going to happen in a row when Umbraco starts. that being said, the
             // file is small enough, so it is not a priority.
             WriteCache();
@@ -475,13 +516,13 @@ namespace Umbraco.Core
             while (true)
             {
                 try
-                {
+                {
                     return new FileStream(path, fileMode, fileAccess, fileShare);
                 }
-                catch
+                catch (Exception ex)
                 {
                     if (--attempts == 0)
-                        throw;
+                        throw;
 
                     LogHelper.Debug<PluginManager>(string.Format("Attempted to get filestream for file {0} failed, {1} attempts left, pausing for {2} milliseconds", path, attempts, pauseMilliseconds));
                     Thread.Sleep(pauseMilliseconds);
@@ -560,7 +601,7 @@ namespace Umbraco.Core
             if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false)
             {
                 return ResolveTypesInternal(
-                    typeof (T), null,
+                    typeof(T), null,
                     () => TypeFinder.FindClassesOfType<T>(specificAssemblies ?? AssembliesToScan),
                     cache);
             }
@@ -569,14 +610,14 @@ namespace Umbraco.Core
             // filter the cached discovered types (and cache the result)
 
             var discovered = ResolveTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                 true);
 
             return ResolveTypesInternal(
-                typeof (T), null,
+                typeof(T), null,
                 () => discovered
-                    .Where(x => typeof (T).IsAssignableFrom(x)),
+                    .Where(x => typeof(T).IsAssignableFrom(x)),
                 true);
         }
 
@@ -599,7 +640,7 @@ namespace Umbraco.Core
             if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false)
             {
                 return ResolveTypesInternal(
-                    typeof (T), typeof (TAttribute),
+                    typeof(T), typeof(TAttribute),
                     () => TypeFinder.FindClassesOfTypeWithAttribute<T, TAttribute>(specificAssemblies ?? AssembliesToScan),
                     cache);
             }
@@ -608,12 +649,12 @@ namespace Umbraco.Core
             // filter the cached discovered types (and cache the result)
 
             var discovered = ResolveTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                 true);
 
             return ResolveTypesInternal(
-                typeof (T), typeof (TAttribute),
+                typeof(T), typeof(TAttribute),
                 () => discovered
                     .Where(x => typeof(T).IsAssignableFrom(x))
                     .Where(x => x.GetCustomAttributes<TAttribute>(false).Any()),
@@ -635,7 +676,7 @@ namespace Umbraco.Core
             cache &= specificAssemblies == null;
 
             return ResolveTypesInternal(
-                typeof (object), typeof (TAttribute),
+                typeof(object), typeof(TAttribute),
                 () => TypeFinder.FindClassesWithAttribute<TAttribute>(specificAssemblies ?? AssembliesToScan),
                 cache);
         }
@@ -653,13 +694,13 @@ namespace Umbraco.Core
             var name = ResolvedName(baseType, attributeType);
 
             lock (_typesLock)
-            using (_logger.TraceDuration<PluginManager>(
-                "Resolving " + name,
-                "Resolved " + name)) // cannot contain typesFound.Count as it's evaluated before the find
-            {
-                // resolve within a lock & timer
-                return ResolveTypesInternalLocked(baseType, attributeType, finder, cache);
-            }
+                using (_logger.TraceDuration<PluginManager>(
+                    "Resolving " + name,
+                    "Resolved " + name)) // cannot contain typesFound.Count as it's evaluated before the find
+                {
+                    // resolve within a lock & timer
+                    return ResolveTypesInternalLocked(baseType, attributeType, finder, cache);
+                }
         }
 
         private static string ResolvedName(Type baseType, Type attributeType)
@@ -691,7 +732,7 @@ namespace Umbraco.Core
             // else proceed,
             typeList = new TypeList(baseType, attributeType);
 
-            var scan = RequiresRescanning || File.Exists(GetPluginListFilePath()) == false;
+            var scan = RequiresRescanning || File.Exists(_pluginListFilePath.Value) == false;
 
             if (scan)
             {
@@ -795,7 +836,7 @@ namespace Umbraco.Core
 
             public TypeListKey(Type baseType, Type attributeType)
             {
-                BaseType = baseType ?? typeof (object);
+                BaseType = baseType ?? typeof(object);
                 AttributeType = attributeType;
             }
 
@@ -813,7 +854,7 @@ namespace Umbraco.Core
 
                 var hash = 5381;
                 hash = ((hash << 5) + hash) ^ BaseType.GetHashCode();
-                hash = ((hash << 5) + hash) ^ (AttributeType ?? typeof (TypeListKey)).GetHashCode();
+                hash = ((hash << 5) + hash) ^ (AttributeType ?? typeof(TypeListKey)).GetHashCode();
                 return hash;
             }
         }
@@ -876,7 +917,7 @@ namespace Umbraco.Core
         {
             // look for IParameterEditor (fast, IDiscoverable) then filter
 
-            var propertyEditor = typeof (PropertyEditor);
+            var propertyEditor = typeof(PropertyEditor);
 
             return mgr.ResolveTypes<IParameterEditor>()
                 .Where(x => propertyEditor.IsAssignableFrom(x) && x != propertyEditor);
@@ -891,8 +932,8 @@ namespace Umbraco.Core
         /// </remarks>
         public static IEnumerable<Type> ResolveParameterEditors(this PluginManager mgr)
         {
-            var propertyEditor = typeof (PropertyEditor);
-            var parameterEditor = typeof (ParameterEditor);
+            var propertyEditor = typeof(PropertyEditor);
+            var parameterEditor = typeof(ParameterEditor);
 
             return mgr.ResolveTypes<IParameterEditor>()
                 .Where(x => x != propertyEditor && x != parameterEditor);

src/Umbraco.Core/PropertyEditors/PreValueEditor.cs

@@ -178,29 +178,25 @@ namespace Umbraco.Core.PropertyEditors
             return result;
         }
 
-        private void ConvertItemsToJsonIfDetected(IDictionary<string, object> result)
+        protected void ConvertItemsToJsonIfDetected(IDictionary<string, object> result)
         {
-            //now we're going to try to see if any of the values are JSON, if they are we'll convert them to real JSON objects
-            // so they can be consumed as real json in angular!
+            // convert values that are Json to true Json objects that can be consumed by Angular
 
             var keys = result.Keys.ToArray();
             for (var i = 0; i < keys.Length; i++)
             {
-                if (result[keys[i]] is string)
+                if ((result[keys[i]] is string) == false) continue;
+
+                var asString = result[keys[i]].ToString();
+                if (asString.DetectIsJson() == false) continue;
+
+                try
                 {
-                    var asString = result[keys[i]].ToString();
-                    if (asString.DetectIsJson())
-                    {
-                        try
-                        {
-                            var json = JsonConvert.DeserializeObject(asString);
-                            result[keys[i]] = json;
-                        }
-                        catch
-                        {
-                            //swallow this exception, we thought it was json but it really isn't so continue returning a string
-                        }
-                    }
+                    result[keys[i]] = JsonConvert.DeserializeObject(asString);
+                }
+                catch
+                {
+                    // swallow this exception, we thought it was Json but it really isn't so continue returning a string
                 }
             }
         }

src/Umbraco.Core/PropertyEditors/ValueConverters/ColorPickerValueConverter.cs

@@ -1,13 +1,14 @@
 using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core.PropertyEditors.ValueConverters
 {
     [DefaultPropertyValueConverter]
-    [PropertyValueType(typeof(string))]
-    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
-    public class ColorPickerValueConverter : PropertyValueConverterBase
+    public class ColorPickerValueConverter : PropertyValueConverterBase, IPropertyValueConverterMeta
     {
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
@@ -18,11 +19,60 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
 	        return false;
         }
 
+        public Type GetPropertyValueType(PublishedPropertyType propertyType)
+        {
+            return UseLabel(propertyType) ? typeof(PickedColor) : typeof(string);
+        }
+
+        public PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType, PropertyCacheValue cacheValue)
+        {
+            return PropertyCacheLevel.Content;
+        }
+
+        private bool UseLabel(PublishedPropertyType propertyType)
+        {
+            var preValues = ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(propertyType.DataTypeId);
+            PreValue preValue;
+            return preValues.PreValuesAsDictionary.TryGetValue("useLabel", out preValue) && preValue.Value == "1";
+        }
+
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
-            // make sure it's a string
-            return source == null ? string.Empty : source.ToString();
+            var useLabel = UseLabel(propertyType);
+
+            if (source == null) return useLabel ? null : string.Empty;
+
+            var ssource = source.ToString();
+            if (ssource.DetectIsJson())
+            {
+                try
+                {
+                    var jo = JsonConvert.DeserializeObject<JObject>(ssource);
+                    if (useLabel) return new PickedColor(jo["value"].ToString(), jo["label"].ToString());
+                    return jo["value"].ToString();
+                }
+                catch { /* not json finally */ }
+            }
+
+            if (useLabel) return new PickedColor(ssource, ssource);
+            return ssource;
+        }
+
+        public class PickedColor
+        {
+            public PickedColor(string color, string label)
+            {
+                Color = color;
+                Label = label;
+            }
+
+            public string Color { get; private set; }
+            public string Label { get; private set; }
+
+            public override string ToString()
+            {
+                return Color;
+            }
         }
-        
     }
 }

src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs

@@ -40,12 +40,13 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
 
                     //TODO: Change all singleton access to use ctor injection in v8!!!
                     //TODO: That would mean that property value converters would need to be request lifespan, hrm....
+                    bool isDebug = HttpContext.Current != null && HttpContext.Current.IsDebuggingEnabled;
                     var gridConfig = UmbracoConfig.For.GridConfig(
                         ApplicationContext.Current.ProfilingLogger.Logger,
                         ApplicationContext.Current.ApplicationCache.RuntimeCache,
-                        new DirectoryInfo(HttpContext.Current.Server.MapPath(SystemDirectories.AppPlugins)),
-                        new DirectoryInfo(HttpContext.Current.Server.MapPath(SystemDirectories.Config)),
-                        HttpContext.Current.IsDebuggingEnabled);
+                        new DirectoryInfo(IOHelper.MapPath(SystemDirectories.AppPlugins)),
+                        new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Config)),
+                        isDebug);
                     
                     var sections = GetArray(obj, "sections");
                     foreach (var section in sections.Cast<JObject>())
@@ -112,4 +113,4 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
         }
 
     }
-}
+}

src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs

@@ -18,6 +18,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             return Constants.PropertyEditors.MultipleTextstringAlias.Equals(propertyType.PropertyEditorAlias);
         }
 
+        private static readonly string[] NewLineDelimiters = { "\r\n", "\r", "\n" };
+
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
             // data is (both in database and xml):
@@ -53,7 +55,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             // Fall back on normal behaviour
             if (values.Any() == false)
             {
-                return sourceString.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
+                return sourceString.Split(NewLineDelimiters, StringSplitOptions.None);
             }
 
             return values.ToArray();

src/Umbraco.Core/Scoping/ScopeContext.cs

@@ -116,5 +116,19 @@ namespace Umbraco.Core.Scoping
             Enlisted[key] = enlistedOfT;
             return enlistedOfT.Item;
         }
+
+        public T GetEnlisted<T>(string key)
+        {
+            var enlistedObjects = _enlisted;
+            if (enlistedObjects == null) return default (T);
+
+            IEnlistedObject enlisted;
+            if (enlistedObjects.TryGetValue(key, out enlisted) == false)
+                return default (T);
+
+            var enlistedAs = enlisted as EnlistedObject<T>;
+            if (enlistedAs == null) throw new InvalidOperationException("An item with the key exists, but with a different type.");
+            return enlistedAs.Item;
+        }
     }
 }

src/Umbraco.Core/Security/BackOfficeSignInManager.cs

@@ -12,6 +12,7 @@ using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Core.Security
 {
+    //TODO: In v8 we need to change this to use an int? nullable TKey instead, see notes against overridden TwoFactorSignInAsync
     public class BackOfficeSignInManager : SignInManager<BackOfficeIdentityUser, int>
     {
         private readonly ILogger _logger;
@@ -259,5 +260,67 @@ namespace Umbraco.Core.Security
             }
             return null;
         }
+
+        /// <summary>
+        /// Two factor verification step
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <param name="code"></param>
+        /// <param name="isPersistent"></param>
+        /// <param name="rememberBrowser"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is implemented because we cannot override GetVerifiedUserIdAsync and instead we have to shadow it
+        /// so due to this and because we are using an INT as the TKey and not an object, it can never be null. Adding to that
+        /// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
+        /// all of this code to check for -1 instead.
+        /// </remarks>
+        public override async Task<SignInStatus> TwoFactorSignInAsync(string provider, string code, bool isPersistent, bool rememberBrowser)
+        {
+            var userId = await GetVerifiedUserIdAsync();
+            if (userId == -1)
+            {
+                return SignInStatus.Failure;
+            }
+            var user = await UserManager.FindByIdAsync(userId);
+            if (user == null)
+            {
+                return SignInStatus.Failure;
+            }
+            if (await UserManager.IsLockedOutAsync(user.Id))
+            {
+                return SignInStatus.LockedOut;
+            }
+            if (await UserManager.VerifyTwoFactorTokenAsync(user.Id, provider, code))
+            {
+                // When token is verified correctly, clear the access failed count used for lockout
+                await UserManager.ResetAccessFailedCountAsync(user.Id);
+                await SignInAsync(user, isPersistent, rememberBrowser);
+                return SignInStatus.Success;
+            }
+            // If the token is incorrect, record the failure which also may cause the user to be locked out
+            await UserManager.AccessFailedAsync(user.Id);
+            return SignInStatus.Failure;
+        }
+
+        /// <summary>Send a two factor code to a user</summary>
+        /// <param name="provider"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is implemented because we cannot override GetVerifiedUserIdAsync and instead we have to shadow it
+        /// so due to this and because we are using an INT as the TKey and not an object, it can never be null. Adding to that
+        /// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
+        /// all of this code to check for -1 instead.
+        /// </remarks>
+        public override async Task<bool> SendTwoFactorCodeAsync(string provider)
+        {
+            var userId = await GetVerifiedUserIdAsync();
+            if (userId == -1)
+                return false;
+
+            var token = await UserManager.GenerateTwoFactorTokenAsync(userId, provider);
+            var identityResult = await UserManager.NotifyTwoFactorTokenAsync(userId, provider, token);
+            return identityResult.Succeeded;
+        }
     }
 }

src/Umbraco.Core/Security/BackOfficeUserStore.cs

@@ -124,12 +124,15 @@ namespace Umbraco.Core.Security
             var found = _userService.GetUserById(asInt.Result);
             if (found != null)
             {
+                // we have to remember whether Logins property is dirty, since the UpdateMemberProperties will reset it.
+                var isLoginsPropertyDirty = user.IsPropertyDirty("Logins");
+
                 if (UpdateMemberProperties(found, user))
                 {
                     _userService.Save(found);
                 }
 
-                if (user.IsPropertyDirty("Logins"))
+                if (isLoginsPropertyDirty)
                 {
                     var logins = await GetLoginsAsync(user);
                     _externalLoginService.SaveUserLogins(found.Id, logins);

src/Umbraco.Core/Security/MembershipProviderBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Specialized;
+using System.ComponentModel.DataAnnotations;
 using System.Configuration.Provider;
 using System.Security.Cryptography;
 using System.Text;
@@ -8,6 +9,7 @@ using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Web.Security;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 
@@ -677,11 +679,7 @@ namespace Umbraco.Core.Security
 
         internal static bool IsEmailValid(string email)
         {
-            const string pattern = @"^(?!\.)(""([^""\r\\]|\\[""\r\\])*""|"
-                                   + @"([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
-                                   + @"@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$";
-
-            return Regex.IsMatch(email, pattern, RegexOptions.IgnoreCase | RegexOptions.Compiled);
+            return new EmailAddressAttribute().IsValid(email);
         }
 
         protected internal string EncryptOrHashPassword(string pass, string salt)

src/Umbraco.Core/Services/ContentService.cs

@@ -62,7 +62,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountPublished();
+                return repository.CountPublished(contentTypeAlias);
             }
         }
 
@@ -993,8 +993,7 @@ namespace Umbraco.Core.Services
                     FROM umbracoNode
                     JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
                     WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
-                    true, false, ids);
-                Console.WriteLine(sql.SQL);
+                    true, false, ids);                    
                 var x = uow.Database.Fetch<int>(sql);
                 return ids.Length == x.Count;
             }
@@ -1345,6 +1344,40 @@ namespace Umbraco.Core.Services
             return content;
         }
 
+        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                var contentTypeIdsA = contentTypeIds.ToArray();
+                var query = new Query<IContent>();
+                if (contentTypeIdsA.Length > 0)
+                {
+                    query.Where(x => contentTypeIdsA.Contains(x.ContentTypeId));
+                }
+                var blueprints = repository.GetByQuery(query).Select(x =>
+                {
+                    ((Content) x).IsBlueprint = true;
+                    return x;
+                }).ToArray();
+
+                foreach (var blueprint in blueprints)
+                {
+                    repository.Delete(blueprint);
+                }
+
+                uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(blueprints), "DeletedBlueprint");
+                uow.Commit();
+            }
+        }
+
+        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
+        {
+            DeleteBlueprintsOfTypes(new[] {contentTypeId}, userId);
+        }
+
         /// <summary>
         /// Saves a single <see cref="IContent"/> object
         /// </summary>
@@ -2009,6 +2042,96 @@ namespace Umbraco.Core.Services
             return true;
         }
 
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
+                var items = ids.Select(x => allContent[x]);
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in asArray)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
         public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
         {
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
@@ -2749,4 +2872,4 @@ namespace Umbraco.Core.Services
 
         #endregion
     }
-}
+}

src/Umbraco.Core/Services/ContentTypeService.cs

@@ -377,7 +377,7 @@ namespace Umbraco.Core.Services
                 repo.Delete(container);
                 uow.Commit();
                 deleteEventArgs.CanCancel = false;
-                uow.Events.Dispatch(DeletedMediaTypeContainer, this, deleteEventArgs);
+                uow.Events.Dispatch(DeletedMediaTypeContainer, this, deleteEventArgs, "DeletedMediaTypeContainer");
 
                 return OperationStatus.Success(evtMsgs);
                 //TODO: Audit trail ?
@@ -920,7 +920,9 @@ namespace Umbraco.Core.Services
                     var deletedContentTypes = new List<IContentType> { contentType };
                     deletedContentTypes.AddRange(GetDescendants(contentType));
 
-                    _contentService.DeleteContentOfTypes(deletedContentTypes.Select(x => x.Id), userId);
+                    var ids = deletedContentTypes.Select(x => x.Id).ToArray();
+                    _contentService.DeleteContentOfTypes(ids, userId);
+                    _contentService.DeleteBlueprintsOfTypes(ids);
 
                     repository.Delete(contentType);
                     deleteEventArgs.DeletedEntities = deletedContentTypes.DistinctBy(x => x.Id);

src/Umbraco.Core/Services/EntityXmlSerializer.cs

@@ -42,6 +42,7 @@ namespace Umbraco.Core.Services
             xml.Add(new XAttribute("writerID", content.WriterId));
             xml.Add(new XAttribute("template", content.Template == null ? "0" : content.Template.Id.ToString(CultureInfo.InvariantCulture)));
             xml.Add(new XAttribute("nodeTypeAlias", content.ContentType.Alias));
+            xml.Add(new XAttribute("isPublished", content.Published));
 
             if (deep)
             {

src/Umbraco.Core/Services/IContentService.cs

@@ -101,7 +101,9 @@ namespace Umbraco.Core.Services
         IContent GetBlueprintById(Guid id);
         void SaveBlueprint(IContent content, int userId = 0);
         void DeleteBlueprint(IContent content, int userId = 0);
-        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0);
+        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0);
+        void DeleteBlueprintsOfType(int contentTypeId, int userId = 0);
+        void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
 
         /// <summary>
         /// Gets all XML entries found in the cmsContentXml table based on the given path
@@ -642,7 +644,21 @@ namespace Umbraco.Core.Services
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        bool Sort(int[] ids, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
         /// Gets the parent of the current content as an <see cref="IContent"/> item.

src/Umbraco.Core/Services/IdkMap.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Services
     {
         private readonly IDatabaseUnitOfWorkProvider _uowProvider;
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
-        
+
         private readonly Dictionary<int, TypedId<Guid>> _id2Key = new Dictionary<int, TypedId<Guid>>();
         private readonly Dictionary<Guid, TypedId<int>> _key2Id = new Dictionary<Guid, TypedId<int>>();
 
@@ -39,8 +39,8 @@ namespace Umbraco.Core.Services
             int? val;
             using (var uow = _uowProvider.GetUnitOfWork())
             {
-                val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id AND nodeObjectType=@nodeObjectType",
-                    new { id = key, nodeObjectType = GetNodeObjectTypeGuid(umbracoObjectType) });
+                val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
+                    new { id = key, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
                 uow.Commit();
             }
 
@@ -92,8 +92,8 @@ namespace Umbraco.Core.Services
             Guid? val;
             using (var uow = _uowProvider.GetUnitOfWork())
             {
-                val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id AND nodeObjectType=@nodeObjectType",
-                    new { id, nodeObjectType = GetNodeObjectTypeGuid(umbracoObjectType) });
+                val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
+                    new { id, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
                 uow.Commit();
             }
 
@@ -106,8 +106,8 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                _id2Key[id] = new TypedId<Guid>(val.Value, umbracoObjectType); ;
-                _key2Id[val.Value] = new TypedId<int>();
+                _id2Key[id] = new TypedId<Guid>(val.Value, umbracoObjectType);
+                _key2Id[val.Value] = new TypedId<int>(id, umbracoObjectType);
             }
             finally
             {
@@ -179,7 +179,7 @@ namespace Umbraco.Core.Services
         {
             private readonly T _id;
             private readonly UmbracoObjectTypes _umbracoObjectType;
-            
+
             public T Id
             {
                 get { return _id; }

src/Umbraco.Core/Services/MemberService.cs

@@ -695,7 +695,7 @@ namespace Umbraco.Core.Services
                 IQuery<IMember> filterQuery = null;
                 if (filter.IsNullOrWhiteSpace() == false)
                 {
-                    filterQuery = Query<IMember>.Builder.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter));
+                    filterQuery = Query<IMember>.Builder.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter) || x.Email.Contains(filter));
                 }
 
                 var repository = RepositoryFactory.CreateMemberRepository(uow);
@@ -986,7 +986,11 @@ namespace Umbraco.Core.Services
         /// <param name="raiseEvents">Optional parameter to raise events.
         /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
         public void Save(IMember entity, bool raiseEvents = true)
-        {
+        {
+            //trimming username and email to make sure we have no trailing space
+            entity.Username = entity.Username.Trim();
+            entity.Email = entity.Email.Trim();
+
             using (var uow = UowProvider.GetUnitOfWork())
             {
                 var saveEventArgs = new SaveEventArgs<IMember>(entity);

src/Umbraco.Core/Services/PackagingService.cs

@@ -1748,9 +1748,10 @@ namespace Umbraco.Core.Services
 
         internal InstallationSummary InstallPackage(string packageFilePath, int userId = 0, bool raiseEvents = false)
         {
+            var metaData = GetPackageMetaData(packageFilePath);
+
             if (raiseEvents)
-            {
-                var metaData = GetPackageMetaData(packageFilePath);
+            {                
                 if (ImportingPackage.IsRaisedEventCancelled(new ImportPackageEventArgs<string>(packageFilePath, metaData), this))
                 {
                     var initEmpty = new InstallationSummary().InitEmpty();
@@ -1762,7 +1763,7 @@ namespace Umbraco.Core.Services
 
             if (raiseEvents)
             {
-                ImportedPackage.RaiseEvent(new ImportPackageEventArgs<InstallationSummary>(installationSummary, false), this);
+                ImportedPackage.RaiseEvent(new ImportPackageEventArgs<InstallationSummary>(installationSummary, metaData, false), this);
             }
 
             return installationSummary;

src/Umbraco.Core/Services/UserService.cs

@@ -228,9 +228,9 @@ namespace Umbraco.Core.Services
         }
 
         /// <summary>
-        /// Deletes an <see cref="IUser"/>
+        /// Disables an <see cref="IUser"/>
         /// </summary>
-        /// <param name="membershipUser"><see cref="IUser"/> to Delete</param>
+        /// <param name="membershipUser"><see cref="IUser"/> to disable</param>
         public void Delete(IUser membershipUser)
         {
             //disable
@@ -712,7 +712,7 @@ namespace Umbraco.Core.Services
         /// <param name="id">Id of the User to retrieve</param>
         /// <returns><see cref="IProfile"/></returns>
         public IProfile GetProfileById(int id)
-        {
+        {
             //This is called a TON. Go get the full user from cache which should already be IProfile
             var fullUser = GetUserById(id);
             var asProfile = fullUser as IProfile;

src/Umbraco.Core/Strings/DefaultShortStringHelper.cs

@@ -70,7 +70,7 @@ namespace Umbraco.Core.Strings
         {
             foreach (var node in _umbracoSettings.RequestHandler.CharCollection)
             {
-                if(string.IsNullOrEmpty(node.Char) == false)
+                if (string.IsNullOrEmpty(node.Char) == false)
                     _urlReplaceCharacters[node.Char] = node.Replacement;
             }
         }
@@ -109,7 +109,7 @@ namespace Umbraco.Core.Strings
         private void EnsureNotFrozen()
         {
             if (_frozen)
-                throw new InvalidOperationException("Cannot configure the helper once it is frozen.");            
+                throw new InvalidOperationException("Cannot configure the helper once it is frozen.");
         }
 
         /// <summary>
@@ -176,7 +176,7 @@ namespace Umbraco.Core.Strings
             }).WithConfig(CleanStringType.Alias, new Config
             {
                 PreFilter = ApplyUrlReplaceCharacters,
-                IsTerm = (c, leading) => leading 
+                IsTerm = (c, leading) => leading
                     ? char.IsLetter(c) // only letters
                     : (char.IsLetterOrDigit(c) || c == '_'), // letter, digit or underscore
                 StringType = CleanStringType.Ascii | CleanStringType.UmbracoCase,
@@ -215,12 +215,12 @@ namespace Umbraco.Core.Strings
                 return new Config
                 {
                     PreFilter = PreFilter,
-                    PostFilter =  PostFilter,
+                    PostFilter = PostFilter,
                     IsTerm = IsTerm,
                     StringType = StringType,
                     BreakTermsOnUpper = BreakTermsOnUpper,
-                    CutAcronymOnNonUpper =  CutAcronymOnNonUpper,
-                    GreedyAcronyms =  GreedyAcronyms,
+                    CutAcronymOnNonUpper = CutAcronymOnNonUpper,
+                    GreedyAcronyms = GreedyAcronyms,
                     Separator = Separator
                 };
             }
@@ -338,9 +338,9 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Gets the JavaScript code defining client-side short string services.
         /// </summary>
         public string GetShortStringServicesJavaScript(string controllerPath)
-        {
-                return string.Format(SssjsFormat,
-                    _umbracoSettings.Content.ForceSafeAliases ? "true" : "false", controllerPath);
+        {
+            return string.Format(SssjsFormat,
+                _umbracoSettings.Content.ForceSafeAliases ? "true" : "false", controllerPath);
         }
 
         #endregion
@@ -467,7 +467,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Cleans a string.
         /// </summary>
         /// <param name="text">The text to clean.</param>
-        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default, 
+        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default,
         /// strings are cleaned up to camelCase and Ascii.</param>
         /// <returns>The clean string.</returns>
         /// <remarks>The string is cleaned in the context of the default culture.</remarks>
@@ -480,7 +480,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Cleans a string, using a specified separator.
         /// </summary>
         /// <param name="text">The text to clean.</param>
-        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default, 
+        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default,
         /// strings are cleaned up to camelCase and Ascii.</param>
         /// <param name="separator">The separator.</param>
         /// <returns>The clean string.</returns>
@@ -494,7 +494,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Cleans a string in the context of a specified culture.
         /// </summary>
         /// <param name="text">The text to clean.</param>
-        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default, 
+        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default,
         /// strings are cleaned up to camelCase and Ascii.</param>
         /// <param name="culture">The culture.</param>
         /// <returns>The clean string.</returns>
@@ -507,7 +507,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Cleans a string in the context of a specified culture, using a specified separator.
         /// </summary>
         /// <param name="text">The text to clean.</param>
-        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default, 
+        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default,
         /// strings are cleaned up to camelCase and Ascii.</param>
         /// <param name="separator">The separator.</param>
         /// <param name="culture">The culture.</param>
@@ -554,7 +554,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
                     text = Utf8ToAsciiConverter.ToAsciiString(text);
                     break;
                 case CleanStringType.TryAscii:
-                    const char ESC = (char) 27;
+                    const char ESC = (char)27;
                     var ctext = Utf8ToAsciiConverter.ToAsciiString(text, ESC);
                     if (ctext.Contains(ESC) == false) text = ctext;
                     break;
@@ -568,8 +568,8 @@ function validateSafeAlias(input, value, immediate, callback) {{
 
             // apply post-filter
             if (config.PostFilter != null)
-                text = config.PostFilter(text);
-            
+                text = config.PostFilter(text);
+
             return text;
         }
 
@@ -839,7 +839,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
                     {
                         term = term.Substring(i);
                         term.CopyTo(0, output, opos, term.Length);
-                        opos += term.Length;                        
+                        opos += term.Length;
                     }
                     break;
 
@@ -914,21 +914,22 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// <returns>The filtered string.</returns>
         public virtual string ReplaceMany(string text, IDictionary<string, string> replacements)
         {
-            // be safe
             if (text == null)
+            {
                 throw new ArgumentNullException("text");
+            }
+
             if (replacements == null)
+            {
                 throw new ArgumentNullException("replacements");
+            }
 
-            // Have done various tests, implementing my own "super fast" state machine to handle 
-            // replacement of many items, or via regexes, but on short strings and not too
-            // many replacements (which prob. is going to be our case) nothing can beat this...
-            // (at least with safe and checked code -- we don't want unsafe/unchecked here)
+            foreach (KeyValuePair<string, string> item in replacements)
+            {
+                text = text.Replace(item.Key, item.Value);
+            }
 
-            // Note that it will do chained-replacements ie replaced items can be replaced
-            // in turn by another replacement (ie the order of replacements is important)
-
-            return replacements.Aggregate(text, (current, kvp) => current.Replace(kvp.Key, kvp.Value));
+            return text;
         }
 
         /// <summary>
@@ -940,15 +941,22 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// <returns>The filtered string.</returns>
         public virtual string ReplaceMany(string text, char[] chars, char replacement)
         {
-            // be safe
             if (text == null)
+            {
                 throw new ArgumentNullException("text");
+            }
+
             if (chars == null)
+            {
                 throw new ArgumentNullException("chars");
+            }
 
-            // see note above
+            for (int i = 0; i < chars.Length; i++)
+            {
+                text = text.Replace(chars[i], replacement);
+            }
 
-            return chars.Aggregate(text, (current, c) => current.Replace(c, replacement));
+            return text;
         }
 
         #endregion

src/Umbraco.Core/Sync/ApplicationUrlHelper.cs

@@ -3,6 +3,7 @@ using System.Web;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Core.Sync
@@ -46,8 +47,20 @@ namespace Umbraco.Core.Sync
         // settings: for unit tests only
         internal static void EnsureApplicationUrl(ApplicationContext appContext, HttpRequestBase request = null, IUmbracoSettingsSection settings = null)
         {
+            bool newApplicationUrl = false;
+            if (request != null)
+            {
+                var applicationUrl = GetApplicationUrlFromRequest(request);
+                newApplicationUrl = !appContext._umbracoApplicationDomains.Contains(applicationUrl);
+                if (newApplicationUrl)
+                {
+                    appContext._umbracoApplicationDomains.Add(applicationUrl);
+                    LogHelper.Info(typeof(ApplicationUrlHelper), string.Format("New ApplicationUrl detected: {0}", applicationUrl));
+                }
+            }
+
             // if initialized, return
-            if (appContext._umbracoApplicationUrl != null) return;
+            if (appContext._umbracoApplicationUrl != null && !newApplicationUrl) return;
 
             var logger = appContext.ProfilingLogger.Logger;
 
@@ -132,6 +145,12 @@ namespace Umbraco.Core.Sync
         {
             var logger = appContext.ProfilingLogger.Logger;
 
+            appContext._umbracoApplicationUrl = GetApplicationUrlFromRequest(request);
+            logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (UmbracoModule request)");
+        }
+
+        private static string GetApplicationUrlFromRequest(HttpRequestBase request)
+        {
             // if (HTTP and SSL not required) or (HTTPS and SSL required),
             //  use ports from request
             // otherwise,
@@ -147,8 +166,7 @@ namespace Umbraco.Core.Sync
             var ssl = useSsl ? "s" : ""; // force, whatever the first request
             var url = "http" + ssl + "://" + request.ServerVariables["SERVER_NAME"] + port + IOHelper.ResolveUrl(SystemDirectories.Umbraco);
 
-            appContext._umbracoApplicationUrl = url.TrimEnd('/');
-            logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (UmbracoModule request)");
+            return url.TrimEnd('/');
         }
     }
-}
+}

src/Umbraco.Core/Sync/DatabaseServerMessenger.cs

@@ -14,6 +14,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using umbraco.interfaces;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Sync
@@ -39,6 +40,7 @@ namespace Umbraco.Core.Sync
         private bool _syncing;
         private bool _released;
         private readonly ProfilingLogger _profilingLogger;
+        private readonly Lazy<string> _distCacheFilePath = new Lazy<string>(GetDistCacheFilePath);
 
         protected DatabaseServerMessengerOptions Options { get; private set; }
         protected ApplicationContext ApplicationContext { get { return _appContext; } }
@@ -460,10 +462,9 @@ namespace Umbraco.Core.Sync
         /// </remarks>
         private void ReadLastSynced()
         {
-            var path = SyncFilePath;
-            if (File.Exists(path) == false) return;
+            if (File.Exists(_distCacheFilePath.Value) == false) return;
 
-            var content = File.ReadAllText(path);
+            var content = File.ReadAllText(_distCacheFilePath.Value);
             int last;
             if (int.TryParse(content, out last))
                 _lastId = last;
@@ -478,7 +479,7 @@ namespace Umbraco.Core.Sync
         /// </remarks>
         private void SaveLastSynced(int id)
         {
-            File.WriteAllText(SyncFilePath, id.ToString(CultureInfo.InvariantCulture));
+            File.WriteAllText(_distCacheFilePath.Value, id.ToString(CultureInfo.InvariantCulture));
             _lastId = id;
         }
 
@@ -498,20 +499,40 @@ namespace Umbraco.Core.Sync
             + "/D" + AppDomain.CurrentDomain.Id // eg 22
             + "] " + Guid.NewGuid().ToString("N").ToUpper(); // make it truly unique
 
-        /// <summary>
-        /// Gets the sync file path for the local server.
-        /// </summary>
-        /// <returns>The sync file path for the local server.</returns>
-        private static string SyncFilePath
+        private static string GetDistCacheFilePath()
         {
-            get
-            {
-                var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/DistCache/" + NetworkHelper.FileSafeMachineName);
-                if (Directory.Exists(tempFolder) == false)
-                    Directory.CreateDirectory(tempFolder);
+            var fileName = HttpRuntime.AppDomainAppId.ReplaceNonAlphanumericChars(string.Empty) + "-lastsynced.txt";
 
-                return Path.Combine(tempFolder, HttpRuntime.AppDomainAppId.ReplaceNonAlphanumericChars(string.Empty) + "-lastsynced.txt");
+            string distCacheFilePath;
+            switch (GlobalSettings.LocalTempStorageLocation)
+            {
+                case LocalTempStorage.AspNetTemp:
+                    distCacheFilePath = Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData", fileName);
+                    break;
+                case LocalTempStorage.EnvironmentTemp:
+                    var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
+                    var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                        //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                        // utilizing an old path
+                        appDomainHash);
+                    distCacheFilePath = Path.Combine(cachePath, fileName);
+                    break;
+                case LocalTempStorage.Default:
+                default:
+                    var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/DistCache");
+                    distCacheFilePath = Path.Combine(tempFolder, fileName);
+                    break;
             }
+
+            //ensure the folder exists
+            var folder = Path.GetDirectoryName(distCacheFilePath);
+            if (folder == null)
+                throw new InvalidOperationException("The folder could not be determined for the file " + distCacheFilePath);
+            if (Directory.Exists(folder) == false)
+                Directory.CreateDirectory(folder);
+
+            return distCacheFilePath;
         }
 
         #endregion

src/Umbraco.Core/TypeFinder.cs

@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security;
 using System.Text;
-using System.Web;
 using System.Web.Compilation;
-using System.Web.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
@@ -21,6 +20,38 @@ namespace Umbraco.Core
     {
         private static volatile HashSet<Assembly> _localFilteredAssemblyCache;
         private static readonly object LocalFilteredAssemblyCacheLocker = new object();
+        private static readonly List<string> NotifiedLoadExceptionAssemblies = new List<string>();
+        private static string[] _assembliesAcceptingLoadExceptions;
+
+        private static string[] AssembliesAcceptingLoadExceptions
+        {
+            get
+            {
+                if (_assembliesAcceptingLoadExceptions != null)
+                    return _assembliesAcceptingLoadExceptions;
+
+                var s = ConfigurationManager.AppSettings["Umbraco.AssembliesAcceptingLoadExceptions"];
+                return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
+                    ? new string[0]
+                    : s.Split(',').Select(x => x.Trim()).ToArray();
+            }
+        }
+
+        private static bool AcceptsLoadExceptions(Assembly a)
+        {
+            if (AssembliesAcceptingLoadExceptions.Length == 0)
+                return false;
+            if (AssembliesAcceptingLoadExceptions.Length == 1 && AssembliesAcceptingLoadExceptions[0] == "*")
+                return true;
+            var name = a.GetName().Name; // simple name of the assembly
+            return AssembliesAcceptingLoadExceptions.Any(pattern =>
+            {
+                if (pattern.Length > name.Length) return false; // pattern longer than name
+                if (pattern.Length == name.Length) return pattern.InvariantEquals(name); // same length, must be identical
+                if (pattern[pattern.Length] != '.') return false; // pattern is shorter than name, must end with dot
+                return name.StartsWith(pattern); // and name must start with pattern
+            });
+        }
 
         /// <summary>
         /// lazily load a reference to all assemblies and only local assemblies.
@@ -45,7 +76,7 @@ namespace Umbraco.Core
             HashSet<Assembly> assemblies = null;
             try
             {
-                var isHosted = HttpContext.Current != null || HostingEnvironment.IsHosted;
+                var isHosted = IOHelper.IsHosted;
 
                 try
                 {
@@ -528,9 +559,22 @@ namespace Umbraco.Core
                 AppendCouldNotLoad(sb, a, getAll);
                 foreach (var loaderException in rex.LoaderExceptions.WhereNotNull())
                     AppendLoaderException(sb, loaderException);
+
+                var ex = new ReflectionTypeLoadException(rex.Types, rex.LoaderExceptions, sb.ToString());
 
-                // rethrow with new message
-                throw new ReflectionTypeLoadException(rex.Types, rex.LoaderExceptions, sb.ToString());
+                // rethrow with new message, unless accepted
+                if (AcceptsLoadExceptions(a) == false) throw ex;
+
+                // log a warning, and return what we can
+                lock (NotifiedLoadExceptionAssemblies)
+                {
+                    if (NotifiedLoadExceptionAssemblies.Contains(a.FullName) == false)
+                    {
+                        NotifiedLoadExceptionAssemblies.Add(a.FullName);
+                        LogHelper.WarnWithException(typeof(TypeFinder), "Could not load all types from " + a.GetName().Name + ".", ex);
+                    }
+                }
+                return rex.Types.WhereNotNull().ToArray();
             }
         }
 

src/Umbraco.Core/UdiEntityType.cs

@@ -117,6 +117,8 @@ namespace Umbraco.Core
                 {
                     case UmbracoObjectTypes.Document:
                         return Document;
+                    case UmbracoObjectTypes.DocumentBlueprint:
+                        return DocumentBluePrint;
                     case UmbracoObjectTypes.Media:
                         return Media;
                     case UmbracoObjectTypes.Member:
@@ -161,6 +163,8 @@ namespace Umbraco.Core
                 {
                     case Document:
                         return UmbracoObjectTypes.Document;
+                    case DocumentBluePrint:
+                        return UmbracoObjectTypes.DocumentBlueprint;
                     case Media:
                         return UmbracoObjectTypes.Media;
                     case Member:

src/Umbraco.Core/Umbraco.Core.csproj

@@ -39,25 +39,21 @@
   <ItemGroup>
     <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.6\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
@@ -67,11 +63,9 @@
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -87,17 +81,16 @@
     </Reference>
     <Reference Include="MiniProfiler, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
       <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
@@ -109,11 +102,9 @@
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Drawing" />
@@ -198,7 +189,7 @@
     <Compile Include="Configuration\BaseRest\ExtensionElement.cs" />
     <Compile Include="Configuration\BaseRest\ExtensionElementCollection.cs" />
     <Compile Include="Configuration\BaseRest\MethodElement.cs" />
-    <Compile Include="Configuration\ContentXmlStorage.cs" />
+    <Compile Include="Configuration\LocalTempStorage.cs" />
     <Compile Include="Configuration\CoreDebug.cs" />
     <Compile Include="Configuration\Dashboard\AccessElement.cs" />
     <Compile Include="Configuration\Dashboard\AccessItem.cs" />
@@ -366,6 +357,7 @@
     <Compile Include="HashGenerator.cs" />
     <Compile Include="IEmailSender.cs" />
     <Compile Include="IHttpContextAccessor.cs" />
+    <Compile Include="Logging\RollingFileCleanupAppender.cs" />
     <Compile Include="Models\EntityBase\EntityPath.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
     <Compile Include="Models\IUserControl.cs" />
@@ -1539,6 +1531,7 @@
     <Compile Include="ReadLock.cs" />
     <Compile Include="TypeFinder.cs" />
     <Compile Include="TypeHelper.cs" />
+    <Compile Include="Collections\CompositeTypeTypeKey.cs" />
     <Compile Include="Udi.cs" />
     <Compile Include="UdiDefinitionAttribute.cs" />
     <Compile Include="UdiEntityType.cs" />

src/Umbraco.Core/packages.config

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.6" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.3" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />

src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs

@@ -3,43 +3,24 @@ using System.Collections.Generic;
 using System.Data.SqlServerCe;
 using System.IO;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnostics.Windows;
-using BenchmarkDotNet.Jobs;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations.Initial;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Tests.Benchmarks.Config;
 using Umbraco.Tests.TestHelpers;
 using ILogger = Umbraco.Core.Logging.ILogger;
 
 namespace Umbraco.Tests.Benchmarks
 {
-    [Config(typeof(Config))]
+    [QuickRunWithMemoryDiagnoserConfig]
     public class BulkInsertBenchmarks
     {
-        private class Config : ManualConfig
-        {
-            public Config()
-            {
-                Add(new MemoryDiagnoser());
-                //Add(ExecutionValidator.FailOnError);
-
-                //The 'quick and dirty' settings, so it runs a little quicker
-                // see benchmarkdotnet FAQ
-                Add(Job.Default
-                    .WithLaunchCount(1) // benchmark process will be launched only once
-                    .WithIterationTime(100) // 100ms per iteration
-                    .WithWarmupCount(3) // 3 warmup iteration
-                    .WithTargetCount(3)); // 3 target iteration                
-            }
-        }
-
         private static byte[] _initDbBytes = null;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             var logger = new DebugDiagnosticsLogger();
@@ -51,8 +32,8 @@ namespace Umbraco.Tests.Benchmarks
             SetupSqlCe(path, logger);
             SetupSqlServer(logger);
 
-            
-        }        
+
+        }
 
         private void SetupSqlServer(ILogger logger)
         {
@@ -75,7 +56,7 @@ namespace Umbraco.Tests.Benchmarks
 	[lastNotifiedDate] [datetime] NOT NULL,
 	[isActive] [bit] NOT NULL,
 	[isMaster] [bit] NOT NULL,
- CONSTRAINT [PK_umbracoServer] PRIMARY KEY CLUSTERED 
+ CONSTRAINT [PK_umbracoServer] PRIMARY KEY CLUSTERED
 (
 	[id] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
@@ -87,7 +68,7 @@ namespace Umbraco.Tests.Benchmarks
             var dbName = string.Concat("Umb", Guid.NewGuid(), ".sdf");
             AppDomain.CurrentDomain.SetData("DataDirectory", path);
             var sqlCeConnectionString = $"Datasource=|DataDirectory|\\{dbName};Flush Interval=1;";
-            
+
             _dbFile = Path.Combine(path, dbName);
 
             //only create the db one time
@@ -107,12 +88,12 @@ namespace Umbraco.Tests.Benchmarks
                     var creation = new DatabaseSchemaCreation(_dbSqlCe, logger, _sqlCeSyntax);
                     creation.InitializeDatabaseSchema();
                 }
-                _initDbBytes = File.ReadAllBytes(_dbFile);            
+                _initDbBytes = File.ReadAllBytes(_dbFile);
             }
             else
             {
                 File.WriteAllBytes(_dbFile, _initDbBytes);
-            }            
+            }
 
             //create the db
             _dbSqlCe = new UmbracoDatabase(
@@ -138,7 +119,7 @@ namespace Umbraco.Tests.Benchmarks
             return data;
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             _dbSqlCe.Dispose();

src/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs

@@ -0,0 +1,153 @@
+using BenchmarkDotNet.Attributes;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Collections;
+
+namespace Umbraco.Tests.Benchmarks
+{
+    [MemoryDiagnoser]
+    public class ConcurrentDictionaryBenchmarks
+    {
+        private static readonly ConcurrentDictionary<CompositeTypeTypeKey, bool> AssignableTypeCache = new ConcurrentDictionary<CompositeTypeTypeKey, bool>();
+
+        private static object input = new Bar();
+
+        private static Type source = typeof(Bar);
+
+        private static Type target = typeof(Foo);
+
+        [Benchmark(Baseline = true)]
+        public bool GetCachedCanAssignFactory()
+        {
+            return AssignableTypeCache.GetOrAdd(new CompositeTypeTypeKey(source, target), k =>
+            {
+                var ksource = k.Type1;
+                var ktarget = k.Type2;
+
+                return ktarget.IsAssignableFrom(ksource) && typeof(IConvertible).IsAssignableFrom(ksource);
+            });
+        }
+
+        [Benchmark]
+        public bool GetCachedCanAssignNoFactory()
+        {
+            // This method is 10% faster
+            var key = new CompositeTypeTypeKey(source, target);
+            bool canConvert;
+            if (AssignableTypeCache.TryGetValue(key, out canConvert))
+            {
+                return canConvert;
+            }
+
+            // "is" is faster than "IsAssignableFrom"
+            if (input is IConvertible && target.IsAssignableFrom(source))
+            {
+                return AssignableTypeCache[key] = true;
+            }
+
+            return AssignableTypeCache[key] = false;
+        }
+
+        private class Foo : IConvertible
+        {
+            public TypeCode GetTypeCode()
+            {
+                return TypeCode.Object;
+            }
+
+            public bool ToBoolean(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public byte ToByte(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public char ToChar(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public DateTime ToDateTime(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public decimal ToDecimal(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public double ToDouble(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public short ToInt16(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public int ToInt32(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public long ToInt64(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public sbyte ToSByte(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public float ToSingle(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public string ToString(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public object ToType(Type conversionType, IFormatProvider provider)
+            {
+                if (conversionType == typeof(Foo))
+                {
+                    return new Foo();
+                }
+
+                throw new NotImplementedException();
+            }
+
+            public ushort ToUInt16(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public uint ToUInt32(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+
+            public ulong ToUInt64(IFormatProvider provider)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        private class Bar : Foo
+        {
+
+        }
+    }
+}

src/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs

@@ -0,0 +1,33 @@
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Horology;
+using BenchmarkDotNet.Jobs;
+using System;
+
+namespace Umbraco.Tests.Benchmarks.Config
+{
+    /// <summary>
+    /// Configures the benchmark to run with less warmup and a shorter iteration time than the standard benchmark.
+    /// </summary>
+    public class QuickRunConfigAttribute : Attribute, IConfigSource
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QuickRunConfigAttribute"/> class.
+        /// </summary>
+        public QuickRunConfigAttribute()
+        {
+            Config = (ManualConfig) ManualConfig.CreateEmpty()
+                .With(Job.Default.WithLaunchCount(1) // benchmark process will be launched only once
+                .WithIterationTime(new TimeInterval(100, TimeUnit.Millisecond)) // 100ms per iteration
+                .WithWarmupCount(3) // 3 warmup iteration
+                .WithTargetCount(3)); // 3 target iteration
+        }
+
+        /// <summary>
+        /// Gets the manual configuration.
+        /// </summary>
+        protected ManualConfig Config { get; }
+
+        /// <inheritdoc/>
+        IConfig IConfigSource.Config => Config;
+    }
+}

src/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs

@@ -0,0 +1,20 @@
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Diagnosers;
+
+namespace Umbraco.Tests.Benchmarks.Config
+{
+    /// <summary>
+    /// Configures the benchmark to run with less warmup and a shorter iteration time than the standard benchmark,
+    /// and include memory usage diagnosis.
+    /// </summary>
+    public class QuickRunWithMemoryDiagnoserConfigAttribute : QuickRunConfigAttribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QuickRunWithMemoryDiagnoserConfigAttribute"/> class.
+        /// </summary>
+        public QuickRunWithMemoryDiagnoserConfigAttribute()
+        {
+            Config.Add(new MemoryDiagnoser());
+        }
+    }
+}

src/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs

@@ -1,25 +1,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnostics.Windows;
+using BenchmarkDotNet.Diagnosers;
 
 namespace Umbraco.Tests.Benchmarks
 {
     /// <summary>
     /// Want to check what is faster OfType or Cast when a enurable all has the same items
     /// </summary>
-    [Config(typeof(Config))]
+    [MemoryDiagnoser]
     public class LinqCastBenchmarks
     {
-        private class Config : ManualConfig
-        {
-            public Config()
-            {
-                Add(new MemoryDiagnoser());
-            }
-        }
-
         public LinqCastBenchmarks()
         {
             _array = new List<object>();

src/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs

@@ -1,47 +1,19 @@
 using System;
-using System.Collections.Generic;
-using System.Data.SqlServerCe;
-using System.Diagnostics;
-using System.IO;
 using System.Linq.Expressions;
-using System.Threading;
-using System.Xml;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Columns;
-using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
-using BenchmarkDotNet.Diagnostics.Windows;
-using BenchmarkDotNet.Jobs;
-using BenchmarkDotNet.Loggers;
-using BenchmarkDotNet.Reports;
 using BenchmarkDotNet.Running;
-using BenchmarkDotNet.Validators;
 using Moq;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.Migrations.Initial;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;
-using Umbraco.Tests.TestHelpers;
-using ILogger = Umbraco.Core.Logging.ILogger;
 
 namespace Umbraco.Tests.Benchmarks
 {
-    [Config(typeof(Config))]
+    [MemoryDiagnoser]
     public class ModelToSqlExpressionHelperBenchmarks
     {
-        private class Config : ManualConfig
-        {
-            public Config()
-            {
-                Add(new MemoryDiagnoser());                
-            }
-        }
-
         public ModelToSqlExpressionHelperBenchmarks()
         {
             var contentMapper = new ContentMapper(_syntaxProvider);
@@ -51,7 +23,7 @@ namespace Umbraco.Tests.Benchmarks
             mappingResolver.Setup(resolver => resolver.ResolveMapperByType(It.IsAny<Type>())).Returns(contentMapper);
             _mappingResolver = mappingResolver.Object;
         }
-        
+
         private readonly ISqlSyntaxProvider _syntaxProvider = new SqlCeSyntaxProvider();
         private readonly CachedExpression _cachedExpression;
         private readonly MappingResolver _mappingResolver;
@@ -62,18 +34,15 @@ namespace Umbraco.Tests.Benchmarks
             for (int i = 0; i < 100; i++)
             {
                 var a = i;
-                var b = i*10;
+                var b = i * 10;
                 Expression<Func<IContent, bool>> predicate = content =>
                 content.Path.StartsWith("-1") && content.Published && (content.ContentTypeId == a || content.ContentTypeId == b);
 
                 var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(_syntaxProvider, _mappingResolver);
                 var result = modelToSqlExpressionHelper.Visit(predicate);
             }
-            
         }
 
-        
-
         [Benchmark()]
         public void WithCachedExpression()
         {
@@ -83,7 +52,7 @@ namespace Umbraco.Tests.Benchmarks
                 var b = i * 10;
                 Expression<Func<IContent, bool>> predicate = content =>
                 content.Path.StartsWith("-1") && content.Published && (content.ContentTypeId == a || content.ContentTypeId == b);
-                
+
                 var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(_syntaxProvider, _mappingResolver);
 
                 //wrap it!
@@ -92,6 +61,5 @@ namespace Umbraco.Tests.Benchmarks
                 var result = modelToSqlExpressionHelper.Visit(_cachedExpression);
             }
         }
-
     }
 }

src/Umbraco.Tests.Benchmarks/Program.cs

@@ -6,17 +6,7 @@ namespace Umbraco.Tests.Benchmarks
     {
         public static void Main(string[] args)
         {
-            var switcher = new BenchmarkSwitcher(new[]
-            {
-                typeof(BulkInsertBenchmarks),
-                typeof(ModelToSqlExpressionHelperBenchmarks),
-                typeof(XmlBenchmarks),
-                typeof(LinqCastBenchmarks),
-                //typeof(DeepCloneBenchmarks),
-                typeof(XmlPublishedContentInitBenchmarks),
-
-            });
-            switcher.Run(args);            
+            new BenchmarkSwitcher(typeof(Program).Assembly).Run(args);
         }
     }
 }

src/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs

@@ -0,0 +1,138 @@
+using BenchmarkDotNet.Attributes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Tests.Benchmarks.Config;
+
+namespace Umbraco.Tests.Benchmarks
+{
+    [QuickRunWithMemoryDiagnoserConfig]
+    public class StringReplaceManyBenchmarks
+    {
+        /*
+
+        short text, short replacement:
+
+                                               Method |     Mean |     Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
+        --------------------------------------------- |---------:|----------:|----------:|-------:|---------:|-------:|----------:|
+        'String.ReplaceMany w/chars - Aggregate'      | 236.0 ns |  40.92 ns |  2.312 ns |   1.00 |     0.00 | 0.0461 |     200 B |
+        'String.ReplaceMany w/chars - For Loop'       | 166.7 ns |  70.51 ns |  3.984 ns |   0.71 |     0.01 | 0.0420 |     180 B |
+        'String.ReplaceMany w/dictionary - Aggregate' | 606.5 ns | 342.94 ns | 19.377 ns |   2.57 |     0.07 | 0.0473 |     212 B |
+        'String.ReplaceMany w/dictionary - For Each'  | 571.8 ns | 232.33 ns | 13.127 ns |   2.42 |     0.05 | 0.0458 |     212 B |
+
+        long text, short replacement:
+
+                                               Method |      Mean |     Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
+        --------------------------------------------- |----------:|----------:|----------:|-------:|---------:|-------:|----------:|
+        'String.ReplaceMany w/chars - Aggregate'      |  5.771 us |  9.963 us | 0.5630 us |   1.00 |     0.00 | 1.6798 |   6.94 KB |
+        'String.ReplaceMany w/chars - For Loop'       |  4.962 us |  2.121 us | 0.1199 us |   0.87 |     0.08 | 1.6840 |   6.92 KB |
+        'String.ReplaceMany w/dictionary - Aggregate' | 14.514 us |  8.189 us | 0.4627 us |   2.53 |     0.22 | 1.6447 |   6.96 KB |
+        'String.ReplaceMany w/dictionary - For Each'  | 15.445 us | 24.745 us | 1.3981 us |   2.69 |     0.30 | 1.5696 |   6.96 KB |
+
+        short text, long replacements dictionary:
+
+                                               Method |       Mean |      Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
+        --------------------------------------------- |-----------:|-----------:|----------:|-------:|---------:|-------:|----------:|
+        'String.ReplaceMany w/chars - Aggregate'      |   257.0 ns |   200.0 ns |  11.30 ns |   1.00 |     0.00 | 0.0452 |     200 B |
+        'String.ReplaceMany w/chars - For Loop'       |   182.4 ns |   221.0 ns |  12.49 ns |   0.71 |     0.05 | 0.0425 |     180 B |
+        'String.ReplaceMany w/dictionary - Aggregate' | 7,273.8 ns | 2,747.1 ns | 155.22 ns |  28.34 |     1.12 | 0.0714 |     464 B |
+        'String.ReplaceMany w/dictionary - For Each'  | 6,981.0 ns | 5,500.7 ns | 310.80 ns |  27.20 |     1.38 | 0.0775 |     464 B |
+
+        long text, long replacements dictionary:
+
+                                               Method |       Mean |      Error |     StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
+        --------------------------------------------- |-----------:|-----------:|-----------:|-------:|---------:|-------:|----------:|
+        'String.ReplaceMany w/chars - Aggregate'      |   4.868 us |   3.420 us |  0.1932 us |   1.00 |     0.00 | 1.6816 |   6.94 KB |
+        'String.ReplaceMany w/chars - For Loop'       |   4.958 us |   2.633 us |  0.1487 us |   1.02 |     0.04 | 1.6791 |   6.92 KB |
+        'String.ReplaceMany w/dictionary - Aggregate' | 181.309 us | 210.177 us | 11.8754 us |  37.29 |     2.32 | 5.3571 |  24.28 KB |
+        'String.ReplaceMany w/dictionary - For Each'  | 174.567 us | 113.733 us |  6.4262 us |  35.90 |     1.57 | 5.8594 |  24.28 KB |
+
+        */
+
+        // don't use constants
+        // ReSharper disable ConvertToConstant.Local
+
+        // input text for ReplaceMany
+        private static readonly string Text;
+
+        // replaced chars for ReplaceMany with chars
+        private static readonly char[] ReplacedChars = { ',', '.', ':', '&', '#' };
+
+        // replacement char for ReplaceMany with chars
+        private static readonly char ReplacementChar = '*';
+
+        // replacements for ReplaceMany with dictionary
+        private static readonly IDictionary<string, string> Replacements;
+
+        // ReSharper restore ConvertToConstant.Local
+
+        static StringReplaceManyBenchmarks()
+        {
+            // pick what you want to benchmark
+
+            // short
+            Text = "1,2.3:4&5#6";
+
+            // long
+            //Text = "Sed ut perspiciatis unde omnis iste natus &error sit voluptatem accusantium doloremque l:audantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et &quasi architecto beatae vitae ::dicta sunt explicabo. Nemo enim ipsam volupta:tem quia voluptas sit aspernatur aut o&dit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciun&t. Neque porro quisquam est, qui dolorem: ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut e:nim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi co&&nsequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse: quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?";
+
+            // short
+            Replacements = new Dictionary<string, string>
+            {
+                { ",", "*" },
+                { ".", "*" },
+                { ":", "*" },
+                { "&", "*" },
+                { "#", "*" },
+            };
+
+            // long
+            //Replacements = new Dictionary<string, string>();
+            //for (var i = 2; i < 100; i++)
+            //    Replacements[Convert.ToChar(i).ToString()] = "*";
+        }
+
+        // this is what v7 originally did
+        [Benchmark(Description = "String.ReplaceMany w/chars - Aggregate", Baseline = true)]
+        public string ReplaceManyAggregate()
+        {
+            var result = Text;
+            return ReplacedChars.Aggregate(result, (current, c) => current.Replace(c, ReplacementChar));
+        }
+
+        [Benchmark(Description = "String.ReplaceMany w/chars - For Loop")]
+        public string ReplaceManyForLoop()
+        {
+            var result = Text;
+
+            // ReSharper disable once LoopCanBeConvertedToQuery
+            // ReSharper disable once ForCanBeConvertedToForeach
+            for (var i = 0; i < ReplacedChars.Length; i++)
+            {
+                result = result.Replace(ReplacedChars[i], ReplacementChar);
+            }
+
+            return result;
+        }
+
+        // this is what v7 originally did
+        [Benchmark(Description = "String.ReplaceMany w/dictionary - Aggregate")]
+        public string ReplaceManyDictionaryAggregate()
+        {
+            return Replacements.Aggregate(Text, (current, kvp) => current.Replace(kvp.Key, kvp.Value));
+        }
+
+        [Benchmark(Description = "String.ReplaceMany w/dictionary - For Each")]
+        public string ReplaceManyDictionaryForEach()
+        {
+            var result = Text;
+            // ReSharper disable once LoopCanBeConvertedToQuery
+            foreach (var item in Replacements)
+            {
+                result = result.Replace(item.Key, item.Value);
+            }
+
+            return result;
+        }
+    }
+}

src/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using BenchmarkDotNet.Attributes;
+using Umbraco.Core;
+
+namespace Umbraco.Tests.Benchmarks
+{
+    [MemoryDiagnoser]
+    public class TryConvertToBenchmarks
+    {
+        private static readonly List<string> List = new List<string>() { "hello", "world", "awesome" };
+        private static readonly string Date = "Saturday 10, November 2012";
+
+        [Benchmark(Description = "List<string> to IEnumerable<string>")]
+        public IEnumerable<string> TryConvertToEnumerable()
+        {
+            return List.TryConvertTo<IEnumerable<string>>().Result;
+        }
+
+        [Benchmark(Description = "Int to Double")]
+        public double TryConvertToDouble()
+        {
+            return 1.TryConvertTo<double>().Result;
+        }
+
+        [Benchmark(Description = "Float to Decimal")]
+        public decimal TryConvertToDecimal()
+        {
+            return 1F.TryConvertTo<decimal>().Result;
+        }
+
+        [Benchmark(Description = "String to Boolean")]
+        public bool TryConvertToBoolean()
+        {
+            return "1".TryConvertTo<bool>().Result;
+        }
+
+        [Benchmark(Description = "String to DateTime")]
+        public DateTime TryConvertToDateTime()
+        {
+            return Date.TryConvertTo<DateTime>().Result;
+        }
+    }
+}

src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj

@@ -9,11 +9,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Umbraco.Tests.Benchmarks</RootNamespace>
     <AssemblyName>Umbraco.Tests.Benchmarks</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,84 +39,147 @@
     <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BenchmarkDotNet, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
-      <HintPath>..\packages\BenchmarkDotNet.0.9.9\lib\net45\BenchmarkDotNet.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="BenchmarkDotNet, Version=0.10.12.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
+      <HintPath>..\packages\BenchmarkDotNet.0.10.12\lib\net46\BenchmarkDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="BenchmarkDotNet.Core, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
-      <HintPath>..\packages\BenchmarkDotNet.Core.0.9.9\lib\net45\BenchmarkDotNet.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="BenchmarkDotNet.Core, Version=0.10.12.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
+      <HintPath>..\packages\BenchmarkDotNet.Core.0.10.12\lib\net46\BenchmarkDotNet.Core.dll</HintPath>
     </Reference>
     <Reference Include="BenchmarkDotNet.Diagnostics.Windows, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
       <HintPath>..\packages\BenchmarkDotNet.Diagnostics.Windows.0.9.9\lib\net45\BenchmarkDotNet.Diagnostics.Windows.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="BenchmarkDotNet.Toolchains.Roslyn, Version=0.9.9.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
-      <HintPath>..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.9.9\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="BenchmarkDotNet.Toolchains.Roslyn, Version=0.10.12.0, Culture=neutral, PublicKeyToken=aa0ca2f9092cefc4, processorArchitecture=MSIL">
+      <HintPath>..\packages\BenchmarkDotNet.Toolchains.Roslyn.0.10.12\lib\net46\BenchmarkDotNet.Toolchains.Roslyn.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.CodeAnalysis, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=1.0.41.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.DotNet.InternalAbstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.DotNet.InternalAbstractions.1.0.0\lib\net451\Microsoft.DotNet.InternalAbstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.DotNet.PlatformAbstractions, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.DotNet.PlatformAbstractions.1.1.1\lib\net451\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Registry, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Registry.4.3.0\lib\net46\Microsoft.Win32.Registry.dll</HintPath>
     </Reference>
     <Reference Include="Moq, Version=4.1.1309.919, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.StackTrace, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Reflection.Metadata, Version=1.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    <Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net46\System.Security.Cryptography.Algorithms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.0.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Text.Encoding.CodePages, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath.XDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ConcurrentDictionaryBenchmarks.cs" />
+    <Compile Include="Config\QuickRunConfigAttribute.cs" />
+    <Compile Include="Config\QuickRunWithMemoryDiagnoserConfigAttribute.cs" />
     <Compile Include="LinqCastBenchmarks.cs" />
     <Compile Include="ModelToSqlExpressionHelperBenchmarks.cs" />
     <Compile Include="BulkInsertBenchmarks.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StringReplaceManyBenchmarks.cs" />
+    <Compile Include="TryConvertToBenchmarks.cs" />
     <Compile Include="XmlBenchmarks.cs" />
     <Compile Include="XmlPublishedContentInitBenchmarks.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
+    <None Include="app.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
@@ -131,10 +195,6 @@
       <Name>Umbraco.Web</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

src/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs

@@ -1,42 +1,19 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnostics.Windows;
-using BenchmarkDotNet.Jobs;
+using Umbraco.Tests.Benchmarks.Config;
 
 namespace Umbraco.Tests.Benchmarks
 {
-    [Config(typeof(Config))]
+    [QuickRunWithMemoryDiagnoserConfig]
     public class XmlBenchmarks
     {
-        private class Config : ManualConfig
-        {
-            public Config()
-            {
-                Add(new MemoryDiagnoser());
-                //Add(ExecutionValidator.FailOnError);
-
-                //The 'quick and dirty' settings, so it runs a little quicker
-                // see benchmarkdotnet FAQ
-                Add(Job.Default
-                    .WithLaunchCount(1) // benchmark process will be launched only once
-                    .WithIterationTime(100) // 100ms per iteration
-                    .WithWarmupCount(3) // 3 warmup iteration
-                    .WithTargetCount(3)); // 3 target iteration                
-            }
-        }
-
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             var templateId = 0;
             var xmlText = @"<?xml version=""1.0"" encoding=""utf-8""?>
-<!DOCTYPE root[ 
+<!DOCTYPE root[
 <!ELEMENT Home ANY>
 <!ATTLIST Home id ID #REQUIRED>
 <!ELEMENT CustomDocument ANY>
@@ -49,7 +26,7 @@ namespace Umbraco.Tests.Benchmarks
 		<umbracoNaviHide>1</umbracoNaviHide>
 		<Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""">
 			<content><![CDATA[<div>This is some content</div>]]></content>
-			<umbracoUrlAlias><![CDATA[page2/alias, 2ndpagealias]]></umbracoUrlAlias>			
+			<umbracoUrlAlias><![CDATA[page2/alias, 2ndpagealias]]></umbracoUrlAlias>
 			<Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
 				<content><![CDATA[]]></content>
 				<umbracoUrlAlias><![CDATA[only/one/alias]]></umbracoUrlAlias>
@@ -70,7 +47,7 @@ namespace Umbraco.Tests.Benchmarks
             _xml.LoadXml(xmlText);
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             _xml = null;
@@ -90,7 +67,7 @@ namespace Umbraco.Tests.Benchmarks
         public void XmlWithNavigation()
         {
             var elt = _xml.DocumentElement;
-            var id = NavigateElementRoute(elt, new[] {"home", "sub1", "sub2"});
+            var id = NavigateElementRoute(elt, new[] { "home", "sub1", "sub2" });
             if (id <= 0) Console.WriteLine("ERR");
         }
 
@@ -120,4 +97,4 @@ namespace Umbraco.Tests.Benchmarks
             return found ? int.Parse(elt.GetAttribute("id")) : -1;
         }
     }
-}
+}

src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs

@@ -3,37 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnostics.Windows;
-using BenchmarkDotNet.Jobs;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Umbraco.Core;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Tests.Benchmarks.Config;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;
 
 namespace Umbraco.Tests.Benchmarks
 {
-    [Config(typeof(Config))]
+    [QuickRunWithMemoryDiagnoserConfig]
     public class XmlPublishedContentInitBenchmarks
     {
-        private class Config : ManualConfig
-        {
-            public Config()
-            {
-                Add(new MemoryDiagnoser());
-
-                //The 'quick and dirty' settings, so it runs a little quicker
-                // see benchmarkdotnet FAQ
-                Add(Job.Default
-                    .WithLaunchCount(1) // benchmark process will be launched only once
-                    .WithIterationTime(100) // 100ms per iteration
-                    .WithWarmupCount(3) // 3 warmup iteration
-                    .WithTargetCount(3)); // 3 target iteration              
-            }
-        }
-
         public XmlPublishedContentInitBenchmarks()
         {
             _xml10 = Build(10);
@@ -281,7 +261,7 @@ namespace Umbraco.Tests.Benchmarks
             var nodes = xmlNode.SelectNodes(dataXPath);
 
             contentType = GetPublishedContentType(PublishedItemType.Content, docTypeAlias);
-            
+
             var propertyNodes = new Dictionary<string, XmlNode>();
             if (nodes != null)
                 foreach (XmlNode n in nodes)
@@ -307,8 +287,8 @@ namespace Umbraco.Tests.Benchmarks
 
         private static PublishedContentType GetPublishedContentType(PublishedItemType type, string alias)
         {
-            return new PublishedContentType(alias, new string[] {},
-                new List<PublishedPropertyType>(Enumerable.Range(0, 10).Select(x => new PublishedPropertyType("prop" + x, 0, "test", initConverters:false))));
+            return new PublishedContentType(alias, new string[] { },
+                new List<PublishedPropertyType>(Enumerable.Range(0, 10).Select(x => new PublishedPropertyType("prop" + x, 0, "test", initConverters: false))));
 
         }
     }

src/Umbraco.Tests.Benchmarks/app.config

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845dcd8080cc91" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.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" />
@@ -27,6 +30,10 @@
         <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="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-5.2.3.0" newVersion="5.2.3.0" />
@@ -36,45 +43,25 @@
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="BenchmarkDotNet.Core" publicKeyToken="aa0ca2f9092cefc4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.10.12.0" newVersion="0.10.12.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.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" />
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

src/Umbraco.Tests.Benchmarks/packages.config

@@ -1,40 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BenchmarkDotNet" version="0.9.9" targetFramework="net45" />
-  <package id="BenchmarkDotNet.Core" version="0.9.9" targetFramework="net45" />
+  <package id="BenchmarkDotNet" version="0.10.12" targetFramework="net46" />
+  <package id="BenchmarkDotNet.Core" version="0.10.12" targetFramework="net46" />
   <package id="BenchmarkDotNet.Diagnostics.Windows" version="0.9.9" targetFramework="net45" />
-  <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.9.9" targetFramework="net45" />
+  <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.12" targetFramework="net46" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net45" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.4.0" targetFramework="net46" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.4.0" targetFramework="net46" />
   <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="1.0.41" targetFramework="net45" />
+  <package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net46" />
+  <package id="Microsoft.DotNet.PlatformAbstractions" version="1.1.1" targetFramework="net46" />
   <package id="Microsoft.SqlServer.Compact" version="4.0.8854.1" targetFramework="net45" />
+  <package id="Microsoft.Win32.Registry" version="4.3.0" targetFramework="net46" />
   <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
   <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net45" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.2.0" targetFramework="net45" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net45" />
-  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net45" />
-  <package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="net45" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="net45" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net45" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net45" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net45" />
-  <package id="System.Reflection.Metadata" version="1.3.0" targetFramework="net45" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net46" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net46" />
+  <package id="System.Console" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net46" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net46" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net46" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net46" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net46" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net46" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net46" />
+  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net46" />
   <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net45" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net45" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net45" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net45" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net45" />
-  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net45" />
-  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net45" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net45" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net45" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net45" />
-  <package id="System.Threading.Tasks.Extensions" version="4.0.0" targetFramework="net45" />
-  <package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net45" />
-  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net45" />
-  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net45" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net46" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net46" />
+  <package id="System.Threading.Thread" version="4.3.0" targetFramework="net46" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XPath" version="4.3.0" targetFramework="net46" />
+  <package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net46" />
 </packages>

src/Umbraco.Tests/Models/ContentTests.cs

@@ -20,7 +20,7 @@ using Umbraco.Tests.TestHelpers.Entities;
 namespace Umbraco.Tests.Models
 {
     [TestFixture]
-    public class ContentTests : BaseUmbracoConfigurationTest
+    public class ContentTests : BaseUmbracoApplicationTest
     {
         [SetUp]
         public void Init()

src/Umbraco.Tests/ObjectExtensionsTests.cs

@@ -161,9 +161,9 @@ namespace Umbraco.Tests
             var obj = new MyTestObject();
             var result = obj.TryConvertTo<object>();
 
-            Assert.AreEqual(obj, result.Result);            
+            Assert.AreEqual(obj, result.Result);
         }
-		
+
 		private CultureInfo savedCulture;
 
 	    /// <summary>

src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs

@@ -332,6 +332,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                 var contentType = (IContentType)MockedContentTypes.CreateSimpleContentType2("test", "Test", propertyGroupName: "testGroup");
 
                 Assert.AreEqual(4, contentType.PropertyTypes.Count());
+
+                // remove all templates - since they are not saved, they would break the (wtf) mapping code
+                contentType.AllowedTemplates = new ITemplate[0];
 
                 // there is NO mapping from display to contentType, but only from save
                 // to contentType, so if we want to test, let's to it properly!

src/Umbraco.Tests/Persistence/Repositories/SimilarNodeNameTests.cs

@@ -24,7 +24,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         [TestCase("Alpha (10)", "Alpha (2)", +1)] // this is the real stuff
         [TestCase("Kilo", "Golf (2)", +1)]
         [TestCase("Kilo (1)", "Golf (2)", +1)]
-        public void ComparerTest(string name1, string name2, int expected)
+		[TestCase("", "", 0)]
+		[TestCase(null, null, 0)]
+		public void ComparerTest(string name1, string name2, int expected)
         {
             var comparer = new SimilarNodeName.Comparer();
 
@@ -76,7 +78,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         [TestCase(0, "Alpha", "Alpha (3)")]
         [TestCase(0, "Kilo (1)", "Kilo (1) (1)")] // though... we might consider "Kilo (2)"
         [TestCase(6, "Kilo (1)", "Kilo (1)")] // because of the id
-        public void Test(int nodeId, string nodeName, string expected)
+		[TestCase(0, "", " (1)")]
+		[TestCase(0, null, " (1)")]
+		public void Test(int nodeId, string nodeName, string expected)
         {
             var names = new[]
             {

src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs

@@ -29,7 +29,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void ImageCropData_Properties_As_Dynamic()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             dynamic d = sourceObj;
 
             var index = 0;
@@ -62,7 +62,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void ImageCropFocalPoint_Properties_As_Dynamic()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             dynamic d = sourceObj;
 
             Assert.AreEqual(sourceObj.FocalPoint.Left, d.FocalPoint.Left);
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void ImageCropDataSet_Properties_As_Dynamic()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             dynamic d = sourceObj;
 
             Assert.AreEqual(sourceObj.Src, d.Src);
@@ -91,7 +91,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void ImageCropDataSet_Methods_As_Dynamic()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             dynamic d = sourceObj;
 
             Assert.AreEqual(sourceObj.HasCrop("thumb"), d.HasCrop("thumb"));
@@ -108,7 +108,7 @@ namespace Umbraco.Tests.PropertyEditors
         public void CanConvertImageCropperDataSetSrcToString()
         {
             //cropperJson3 - has not crops
-            var sourceObj = cropperJson3.SerializeToCropDataSet();
+            var sourceObj = cropperJson3.DeserializeToCropDataSet();
             var destObj = sourceObj.TryConvertTo<string>();
             Assert.IsTrue(destObj.Success);
             Assert.AreEqual(destObj.Result, "/media/1005/img_0672.jpg");
@@ -118,7 +118,7 @@ namespace Umbraco.Tests.PropertyEditors
         public void CanConvertImageCropperDataSetJObject()
         {
             //cropperJson3 - has not crops
-            var sourceObj = cropperJson3.SerializeToCropDataSet();
+            var sourceObj = cropperJson3.DeserializeToCropDataSet();
             var destObj = sourceObj.TryConvertTo<JObject>();
             Assert.IsTrue(destObj.Success);
             Assert.AreEqual(sourceObj, destObj.Result.ToObject<ImageCropDataSet>());
@@ -127,7 +127,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void CanConvertImageCropperDataSetJsonToString()
         {
-            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var sourceObj = cropperJson1.DeserializeToCropDataSet();
             var destObj = sourceObj.TryConvertTo<string>();
             Assert.IsTrue(destObj.Success);
             Assert.IsTrue(destObj.Result.DetectIsJson());
@@ -150,7 +150,7 @@ namespace Umbraco.Tests.PropertyEditors
                 var converter = new Umbraco.Web.PropertyEditors.ValueConverters.ImageCropperValueConverter(dataTypeService.Object);
                 var result = converter.ConvertDataToSource(new PublishedPropertyType("test", 0, "test"), val1, false); // does not use type for conversion
 
-                var resultShouldMatch = val2.SerializeToCropDataSet();
+                var resultShouldMatch = val2.DeserializeToCropDataSet();
                 if (expected)
                 {
                     Assert.AreEqual(resultShouldMatch, result);
@@ -220,7 +220,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetBaseCropUrlFromModelTest()
         {
-            var cropDataSet = cropperJson1.SerializeToCropDataSet();
+            var cropDataSet = cropperJson1.DeserializeToCropDataSet();
             var urlString = cropDataSet.GetCropUrl("thumb");
             Assert.AreEqual("?crop=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&cropmode=percentage&width=100&height=100", urlString);
         }

src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs

@@ -3,10 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
+using umbraco.cms.businesslogic;
+using Umbraco.Core;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Scoping;
+using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 
@@ -99,7 +102,7 @@ namespace Umbraco.Tests.Scoping
             DoDeleteForContent += OnDoThingFail;
             DoForTestArgs += OnDoThingFail;
             DoForTestArgs2 += OnDoThingFail;
-            
+
             var contentType = MockedContentTypes.CreateBasicContentType();
 
             var content1 = MockedContent.CreateBasicContent(contentType);
@@ -114,10 +117,10 @@ namespace Umbraco.Tests.Scoping
             var scopeProvider = new ScopeProvider(Mock.Of<IDatabaseFactory2>());
             using (var scope = scopeProvider.CreateScope(eventDispatcher: new PassiveEventDispatcher()))
             {
-                
+
                 //content1 will be filtered from the args
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(new[]{ content1 , content3}));
-                scope.Events.Dispatch(DoDeleteForContent, this, new DeleteEventArgs<IContent>(content1));
+                scope.Events.Dispatch(DoDeleteForContent, this, new DeleteEventArgs<IContent>(content1), "DoDeleteForContent");
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(content2));
                 //this entire event will be filtered
                 scope.Events.Dispatch(DoForTestArgs, this, new TestEventArgs(content1));
@@ -141,15 +144,36 @@ namespace Umbraco.Tests.Scoping
             }
         }
 
+        [Test]
+        public void SupersededEvents2()
+        {
+            var contentService = Mock.Of<IContentService>();
+            var content = Mock.Of<IContent>();
+            var l1 = new List<IEventDefinition>
+            {
+                new EventDefinition<IContentService, PublishEventArgs<IContent>>(Test_UnPublished, contentService, new PublishEventArgs<IContent>(new [] { content }), "UnPublished"),
+                new EventDefinition<IContentService, DeleteEventArgs<IContent>>(Test_Deleted, contentService, new DeleteEventArgs<IContent>(new [] { content }), "Deleted")
+            };
+
+            var l2 = new OrderedHashSet<IEventDefinition>(keepOldest: false);
+            foreach (var e in l1)
+                l2.Add(e);
+
+            var l3 = ScopeEventDispatcherBase.FilterSupersededAndUpdateToLatestEntity(l2);
+
+            // see U4-10764
+            Assert.AreEqual(2, l3.Count());
+        }
+
         /// <summary>
         /// This will test that when we track events that before we Get the events we normalize all of the
-        /// event entities to be the latest one (most current) found amongst the event so that there is 
+        /// event entities to be the latest one (most current) found amongst the event so that there is
         /// no 'stale' entities in any of the args
         /// </summary>
         [Test]
         public void LatestEntities()
         {
-            DoSaveForContent += OnDoThingFail;            
+            DoSaveForContent += OnDoThingFail;
 
             var now = DateTime.Now;
             var contentType = MockedContentTypes.CreateBasicContentType();
@@ -165,7 +189,7 @@ namespace Umbraco.Tests.Scoping
 
             var scopeProvider = new ScopeProvider(Mock.Of<IDatabaseFactory2>());
             using (var scope = scopeProvider.CreateScope(eventDispatcher: new PassiveEventDispatcher()))
-            {                                
+            {
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(content1));
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(content2));
                 scope.Events.Dispatch(DoSaveForContent, this, new SaveEventArgs<IContent>(content3));
@@ -173,7 +197,7 @@ namespace Umbraco.Tests.Scoping
                 // events have been queued
                 var events = scope.Events.GetEvents(EventDefinitionFilter.All).ToArray();
                 Assert.AreEqual(3, events.Length);
-                
+
                 foreach (var t in events)
                 {
                     var args = (SaveEventArgs<IContent>)t.Args;
@@ -212,7 +236,7 @@ namespace Umbraco.Tests.Scoping
 
                 // events have been queued
                 var events = scope.Events.GetEvents(EventDefinitionFilter.FirstIn).ToArray();
-                Assert.AreEqual(1, events.Length);                
+                Assert.AreEqual(1, events.Length);
                 Assert.AreEqual(content1, ((SaveEventArgs<IContent>) events[0].Args).SavedEntities.First());
                 Assert.IsTrue(object.ReferenceEquals(content1, ((SaveEventArgs<IContent>)events[0].Args).SavedEntities.First()));
                 Assert.AreEqual(content1.UpdateDate, ((SaveEventArgs<IContent>) events[0].Args).SavedEntities.First().UpdateDate);
@@ -350,6 +374,9 @@ namespace Umbraco.Tests.Scoping
 
         public static event TypedEventHandler<ScopeEventDispatcherTests, SaveEventArgs<decimal>> DoThing3;
 
+        public static event TypedEventHandler<IContentService, PublishEventArgs<IContent>> Test_UnPublished;
+        public static event TypedEventHandler<IContentService, DeleteEventArgs<IContent>> Test_Deleted;
+
         public class TestEventArgs : CancellableObjectEventArgs
         {
             public TestEventArgs(object eventObject) : base(eventObject)

src/Umbraco.Tests/Services/EntityServiceTests.cs

@@ -26,15 +26,15 @@ namespace Umbraco.Tests.Services
         public override void TearDown()
         {
             base.TearDown();
-        }      
+        }
 
         [Test]
         public void EntityService_Can_Get_Paged_Content_Children()
         {
-            
+
             var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
-            
-            var root = MockedContent.CreateSimpleContent(contentType);            
+
+            var root = MockedContent.CreateSimpleContent(contentType);
             ServiceContext.ContentService.Save(root);
             for (int i = 0; i < 10; i++)
             {
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.Services
             var service = ServiceContext.EntityService;
 
             long total;
-            var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out total).ToArray();            
+            var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(6));
             Assert.That(total, Is.EqualTo(10));
             entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Services
                     var c2 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
                     ServiceContext.ContentService.Save(c2);
                     count++;
-                }                
+                }
             }
 
             var service = ServiceContext.EntityService;
@@ -181,7 +181,7 @@ namespace Umbraco.Tests.Services
 
             var root = MockedContent.CreateSimpleContent(contentType);
             ServiceContext.ContentService.Save(root);
-            
+
             for (int i = 0; i < 10; i++)
             {
                 var c1 = MockedContent.CreateSimpleContent(contentType, "ssss" + Guid.NewGuid(), root);
@@ -204,7 +204,7 @@ namespace Umbraco.Tests.Services
             Assert.That(entities.Length, Is.EqualTo(50));
             Assert.That(total, Is.EqualTo(50));
         }
-       
+
         [Test]
         public void EntityService_Can_Get_Paged_Media_Children()
         {
@@ -227,7 +227,7 @@ namespace Umbraco.Tests.Services
             Assert.That(total, Is.EqualTo(10));
             entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 1, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));            
+            Assert.That(total, Is.EqualTo(10));
         }
 
         [Test]
@@ -362,7 +362,7 @@ namespace Umbraco.Tests.Services
 
             var root = MockedMedia.CreateMediaFolder(folderType, -1);
             ServiceContext.MediaService.Save(root);
-            
+
             for (int i = 0; i < 10; i++)
             {
                 var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
@@ -519,7 +519,7 @@ namespace Umbraco.Tests.Services
             Assert.That(
                 entities.Any(
                     x =>
-                    x.AdditionalData.Any(y => y.Value is UmbracoEntity.EntityProperty 
+                    x.AdditionalData.Any(y => y.Value is UmbracoEntity.EntityProperty
                         && ((UmbracoEntity.EntityProperty)y.Value).PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias)), Is.True);
         }
 
@@ -575,6 +575,30 @@ namespace Umbraco.Tests.Services
             Assert.IsFalse(result2.Success);
         }
 
+        [Test]
+        public void ReserveId()
+        {
+            var service = ServiceContext.EntityService;
+            var guid = Guid.NewGuid();
+
+            // can reserve
+            var reservedId = service.ReserveId(guid);
+            Assert.IsTrue(reservedId > 0);
+
+            // can get it back
+            var id = service.GetIdForKey(guid, UmbracoObjectTypes.DocumentType);
+            Assert.IsTrue(id.Success);
+            Assert.AreEqual(reservedId, id.Result);
+
+            // anything goes
+            id = service.GetIdForKey(guid, UmbracoObjectTypes.Media);
+            Assert.IsTrue(id.Success);
+            Assert.AreEqual(reservedId, id.Result);
+
+            // a random guid won't work
+            Assert.IsFalse(service.GetIdForKey(Guid.NewGuid(), UmbracoObjectTypes.DocumentType).Success);
+        }
+
         private static bool _isSetup = false;
 
         private int folderId;
@@ -589,7 +613,7 @@ namespace Umbraco.Tests.Services
 
                 //Create and Save folder-Media -> 1050
                 var folderMediaType = ServiceContext.ContentTypeService.GetMediaType(1031);
-                var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);                
+                var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
                 ServiceContext.MediaService.Save(folder, 0);
                 folderId = folder.Id;
 
@@ -607,9 +631,9 @@ namespace Umbraco.Tests.Services
                 ServiceContext.MediaService.Save(subfolder, 0);
                 var subfolder2 = MockedMedia.CreateMediaFolder(folderMediaType, subfolder.Id);
                 ServiceContext.MediaService.Save(subfolder2, 0);
-                
+
             }
-            
+
         }
     }
 }

src/Umbraco.Tests/Strings/StringValidationTests.cs

@@ -17,6 +17,8 @@ namespace Umbraco.Tests.Strings
             Assert.IsTrue(foo.IsValid("futureTLD@somewhere.fooo"));
 
             Assert.IsTrue(foo.IsValid("abc@xyz.financial"));
+            Assert.IsTrue(foo.IsValid("admin+gmail-syntax@c.pizza"));
+            Assert.IsTrue(foo.IsValid("admin@c.pizza"));
 
             Assert.IsFalse(foo.IsValid("fdsa"));
             Assert.IsFalse(foo.IsValid("fdsa@"));

src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs

@@ -388,13 +388,12 @@ namespace Umbraco.Tests.TestHelpers
             return ctx;
         }
 
-        protected FakeHttpContextFactory GetHttpContextFactory(string url, RouteData routeData = null)
+        protected virtual FakeHttpContextFactory GetHttpContextFactory(string url, RouteData routeData = null)
         {
             var factory = routeData != null
                             ? new FakeHttpContextFactory(url, routeData)
                             : new FakeHttpContextFactory(url);
 
-
             //set the state helper
             StateHelper.HttpContext = factory.HttpContext;
 

src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs

@@ -118,26 +118,13 @@ namespace Umbraco.Tests.TestHelpers
             });            
         }
 
-        /// <summary>
-        /// By default this returns false which means the plugin manager will not be reset so it doesn't need to re-scan
-        /// all of the assemblies. Inheritors can override this if plugin manager resetting is required, generally needs
-        /// to be set to true if the SetupPluginManager has been overridden.
-        /// </summary>
-        protected virtual bool PluginManagerResetRequired
-        {
-            get { return false; }
-        }
-
         /// <summary>
         /// Inheritors can resset the plugin manager if they choose to on teardown
         /// </summary>
         protected virtual void ResetPluginManager()
         {
-            if (PluginManagerResetRequired)
-            {
-                PluginManager.Current = null;
-            }
-        }        
+            PluginManager.Current = null;
+        }
 
         protected virtual CacheHelper CreateCacheHelper()
         {
@@ -185,26 +172,23 @@ namespace Umbraco.Tests.TestHelpers
         /// </summary>
         protected virtual void SetupPluginManager()
         {
-            if (PluginManager.Current == null || PluginManagerResetRequired)
+            PluginManager.Current = new PluginManager(
+                new ActivatorServiceProvider(),
+                CacheHelper.RuntimeCache, ProfilingLogger, false)
             {
-                PluginManager.Current = new PluginManager(
-                    new ActivatorServiceProvider(),
-                    CacheHelper.RuntimeCache, ProfilingLogger, false)
+                AssembliesToScan = new[]
                 {
-                    AssembliesToScan = new[]
-                    {
-                        Assembly.Load("Umbraco.Core"),
-                        Assembly.Load("umbraco"),
-                        Assembly.Load("Umbraco.Tests"),
-                        Assembly.Load("businesslogic"),
-                        Assembly.Load("cms"),
-                        Assembly.Load("controls"),
-                        Assembly.Load("umbraco.editorControls"),
-                        Assembly.Load("umbraco.MacroEngines"),
-                        Assembly.Load("umbraco.providers"),
-                    }
-                };
-            }
+                    Assembly.Load("Umbraco.Core"),
+                    Assembly.Load("umbraco"),
+                    Assembly.Load("Umbraco.Tests"),
+                    Assembly.Load("businesslogic"),
+                    Assembly.Load("cms"),
+                    Assembly.Load("controls"),
+                    Assembly.Load("umbraco.editorControls"),
+                    Assembly.Load("umbraco.MacroEngines"),
+                    Assembly.Load("umbraco.providers"),
+                }
+            };
         }
 
         /// <summary>

src/Umbraco.Tests/UdiTests.cs

@@ -7,12 +7,19 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Deploy;
 using Umbraco.Core.Serialization;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests
 {
     [TestFixture]
-    public class UdiTests
+    public class UdiTests : BaseUmbracoApplicationTest
     {
+        [SetUp]
+        public void Setup()
+        {
+            Udi.ResetUdiTypes();
+        }
+
         [Test]
         public void StringUdiCtorTest()
         {

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -62,8 +62,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.89.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.89\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

src/Umbraco.Tests/Web/Mvc/HtmlStringUtilitiesTests.cs

@@ -22,5 +22,40 @@ namespace Umbraco.Tests.Web.Mvc
             var expected = "<div><h1>hello world</h1><p>hello world<br />hello world<br />hello world<br />hello world</p></div>";
             Assert.AreEqual(expected, output);
         }
+
+        [Test]
+        public void TruncateWithElipsis()
+        {
+            var output = _htmlStringUtilities.Truncate("hello world", 5, true, false).ToString();
+            var expected = "hello&hellip;";
+            Assert.AreEqual(expected, output);
+        }
+
+        [Test]
+        public void TruncateWithoutElipsis()
+        {
+            var output = _htmlStringUtilities.Truncate("hello world", 5, false, false).ToString();
+            var expected = "hello";
+            Assert.AreEqual(expected, output);
+        }
+
+        [Test]
+        public void TruncateShorterWordThanHellip()
+        {
+            //http://issues.umbraco.org/issue/U4-10478
+            var output = _htmlStringUtilities.Truncate("hi", 5, true, false).ToString();
+            var expected = "hi";
+            Assert.AreEqual(expected, output);
+        }
+
+        [Test]
+        public void TruncateAndRemoveSpaceBetweenHellipAndWord()
+        {
+            var output = _htmlStringUtilities.Truncate("hello world", 6 /* hello plus space */, true, false).ToString();
+            var expected = "hello&hellip;";
+            Assert.AreEqual(expected, output);
+        }
+
+
     }
 }

src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs

@@ -20,8 +20,14 @@ using Umbraco.Web.Templates;
 namespace Umbraco.Tests.Web
 {
     [TestFixture]
-    public class TemplateUtilitiesTests
+    public class TemplateUtilitiesTests : BaseUmbracoApplicationTest
     {
+        [SetUp]
+        public void Setup()
+        {
+            Udi.ResetUdiTypes();
+        }
+
         [TestCase("", "")]
         [TestCase("hello href=\"{localLink:1234}\" world ", "hello href=\"/my-test-url\" world ")]
         [TestCase("hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"/my-test-url\" world ")]

src/Umbraco.Tests/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.89" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />

src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less

@@ -31,15 +31,17 @@
   display: block;
   padding: 4px;
   line-height: @baseLineHeight;
-  border: 1px solid #ddd;
+  border: 1px solid @gray-8;
   .border-radius(@baseBorderRadius);
   .box-shadow(0 1px 3px rgba(0,0,0,.055));
   .transition(all .2s ease-in-out);
 }
-// Add a hover/focus state for linked versions only
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: @linkColor;
+// Add a hover/focus state for linked versions only.
+a.thumbnail:hover, 
+a.thumbnail:focus,
+a div.thumbnail:hover,
+a div.thumbnail:focus {
+  border-color: @turquoise;
   .box-shadow(0 1px 4px rgba(0,105,214,.25));
 }
 

src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js

@@ -361,11 +361,29 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
             rootScope : function(){
                 return getRootScope();
             },
-
-            reloadLocation: function() {
-                var injector = getRootInjector();
-                var $route = injector.get("$route");
-                $route.reload();
+
+            /**
+            This will reload the content frame based on it's current route, if pathToMatch is specified it will only reload it if the current
+            location matches the path
+            */
+            reloadLocation: function(pathToMatch) {
+
+                var injector = getRootInjector();
+                var doChange = true;
+                if (pathToMatch) {
+                    var $location = injector.get("$location");
+                    var path = $location.path();
+                    if (path != pathToMatch) {
+                        doChange = false;
+                    }
+                }
+
+                if (doChange) {
+                    var $route = injector.get("$route");
+                    $route.reload();
+                    var $rootScope = injector.get("$rootScope");
+                    $rootScope.$apply();
+                }
             },
             
             closeModalWindow: function(rVal) {

src/Umbraco.Web.UI.Client/package.json

@@ -26,7 +26,7 @@
     "cssnano": "^3.7.6",
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
-    "gulp-connect": "^5.0.0",
+    "gulp-connect": "5.0.0",
     "gulp-less": "^3.1.0",
     "gulp-ngdocs": "^0.3.0",
     "gulp-open": "^2.0.0",

src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js

@@ -7,12 +7,22 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
 
 .controller("Umbraco.canvasdesignerController", function ($scope, $http, $window, $timeout, $location, dialogService) {
 
+    var isInit = $location.search().init;
+    if (isInit === "true") {
+        //do not continue, this is the first load of this new window, if this is passed in it means it's been
+        //initialized by the content editor and then the content editor will actually re-load this window without
+        //this flag. This is a required trick to get around chrome popup mgr. We don't want to double load preview.aspx
+        //since that will double prepare the preview documents
+        return;
+    }
+
     $scope.isOpen = false;
     $scope.frameLoaded = false;
     $scope.enableCanvasdesigner = 0;
     $scope.googleFontFamilies = {};
-    $scope.pageId = $location.search().id;
-    $scope.pageUrl = "../dialogs/Preview.aspx?id=" + $location.search().id;
+    var pageId = $location.search().id;    
+    $scope.pageId = pageId;
+    $scope.pageUrl = "../dialogs/Preview.aspx?id=" + pageId;
     $scope.valueAreLoaded = false;
     $scope.devices = [
         { name: "desktop", css: "desktop", icon: "icon-display", title: "Desktop" },

src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js

@@ -3,7 +3,7 @@
 * @name umbraco.directives.directive:umbSections
 * @restrict E
 **/
-function sectionsDirective($timeout, $window, navigationService, treeService, sectionService, appState, eventsService, $location) {
+function sectionsDirective($timeout, $window, navigationService, treeService, sectionService, appState, eventsService, $location, historyService) {
     return {
         restrict: "E",    // restrict to an element
         replace: true,   // replace the html element with the template
@@ -161,7 +161,9 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
                     $location.path(section.routePath);
                 }
                 else {
-                    $location.path(section.alias).search('');
+                    var lastAccessed = historyService.getLastAccessedItemForSection(section.alias);
+                    var path = lastAccessed != null ? lastAccessed.link : section.alias;                  
+                    $location.path(path).search('');
                 }
 			    
 			};

src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js

@@ -185,6 +185,8 @@
 
             $scope.page.buttonGroupState = "success";
 
+          }, function(err) {
+            $scope.page.buttonGroupState = 'error';
           });
       }
 
@@ -208,9 +210,9 @@
       if (!$scope.busy) {
 
         // Chromes popup blocker will kick in if a window is opened 
-        // outwith the initial scoped request. This trick will fix that.
+        // without the initial scoped request. This trick will fix that.
         //  
-        var previewWindow = $window.open('preview/?id=' + content.id, 'umbpreview');
+        var previewWindow = $window.open('preview/?init=true&id=' + content.id, 'umbpreview');
 
         // Build the correct path so both /#/ and #/ work.
         var redirect = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + '/preview/?id=' + content.id;