Merge pull request #2116 from umbraco/temp-deploy-350

changes needed for blueprints to differentiate them from content items.

.editorconfig

@@ -3,7 +3,7 @@ root=true
 [*]
 end_of_line = lf
 indent_style = space
-indent_size = 2
+indent_size = 4
 trim_trailing_whitespace = true
 
 [*.{cs,cshtml,csx,vb,vbx,vbhtml,fs,fsx,txt,ps1,sql}]

.gitignore

@@ -46,7 +46,13 @@ src/Umbraco.Web.UI/Web.*.config.transformed
 
 umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
 umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+_BuildOutput/*
 *.ncrunchsolution
+build/UmbracoCms.AllBinaries*zip
+build/UmbracoCms.WebPI*zip
+build/UmbracoCms*zip
+build/UmbracoExamine.PDF*zip
+build/*.nupkg
 src/Umbraco.Tests/config/applications.config
 src/Umbraco.Tests/config/trees.config
 src/Umbraco.Web.UI/web.config
@@ -62,9 +68,9 @@ src/packages/repositories.config
 
 src/Umbraco.Web.UI/[Ww]eb.config
 *.transformed
+webpihash.txt
 
 node_modules
-lib-bower
 
 src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
@@ -89,6 +95,7 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
 src/Umbraco.Web.UI.Client/[Bb]uild/*
 src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
 src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+build/_BuildOutput/
 src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
 tools/NDepend/
 
@@ -123,6 +130,7 @@ src/*.boltdata/
 /src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
 /src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
 src/umbraco.sln.ide/*
+build/UmbracoCms.*/
 src/.vs/
 src/Umbraco.Web.UI/umbraco/js/install.loader.js
 src/Umbraco.Tests/media
@@ -132,11 +140,9 @@ apidocs/api/*
 build/docs.zip
 build/ui-docs.zip
 build/csharp-docs.zip
+build/msbuild.log
 .vs/
 src/packages/
 src/PrecompiledWeb/*
-
-
-build.out/
-build.tmp/
-build/Modules/*/temp/
+build/tools/
+src/PrecompiledWeb/*

BUILD.md

@@ -1,149 +0,0 @@
-Umbraco Cms Build
---
-----
-
-# Quick!
-
-To build Umbraco, fire PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `README.md`...). There, trigger the build with the following command:
-
-    build\build.ps1
-    
-By default, this builds the current version. It is possible to specify a different version as a parameter to the build script: 
-
-    build\build.ps1 7.6.44
-
-Valid version strings are defined in the `Set-UmbracoVersion` documentation below.
-
-## 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).
-
-# Build
-
-The Umbraco Build solution relies on a PowerShell module. The module needs to be imported into PowerShell. From within Umbraco's repository root:
-
-    build\build.ps1 -ModuleOnly
-
-Or the abbreviated form:
-
-    build\build.ps1 -mo
-
-Once the module has been imported, a set of commands are added to PowerShell.
-
-## Get-UmbracoBuildEnv
-
-Gets the Umbraco build environment ie NuGet, Semver, Visual Studio, etc. Downloads things that can be downloaded such as NuGet. Examples:
-
-    $uenv = Get-UmbracoBuildEnv
-    Write-Host $uenv.SolutionRoot
-    &$uenv.NuGet help
-    
-The object exposes the following properties:
-
-* `SolutionRoot`: the absolute path to the solution root
-* `VisualStudio`: a Visual Studio object (see below)
-* `NuGet`: the absolute path to the NuGet executable
-* `Zip`: the absolute path to the 7Zip executable
-* `VsWhere`: the absolute path to the VsWhere executable
-* `NodePath`: the absolute path to the Node install
-* `NpmPath`: the absolute path to the Npm install
-
-The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
-
-* `Path`: Visual Studio installation path (eg some place under `Program Files`)
-* `Major`: Visual Studio major version (eg `15` for VS 2017)
-* `Minor`: Visual Studio minor version
-* `MsBUild`: the absolute path to the MsBuild executable
-
-## Get-UmbracoVersion
-
-Gets an object representing the current Umbraco version. Example:
-
-    $v = Get-UmbracoVersion
-    Write-Host $v.Semver
-
-The object exposes the following properties:
-
-* `Semver`: the semver object representing the version
-* `Release`: the main part of the version (eg `7.6.33`)
-* `Comment`: the pre release part of the version (eg `alpha02`)
-* `Build`: the build number part of the version (eg `1234`)
-
-## Set-UmbracoVersion
-
-Modifies Umbraco files with the new version.
-
->This entirely replaces the legacy `UmbracoVersion.txt` file.
-
-The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
-
-    Set-UmbracoVersion 7.6.33
-    Set-UmbracoVersion 7.6.33-alpha02
-    Set-UmbracoVersion 7.6.33+1234
-    Set-UmbracoVersion 7.6.33-beta05+5678
-
-Note that `Set-UmbracoVersion` enforces a slightly more restrictive naming scheme than what semver would tolerate. The pre release part can only be composed of a-z and 0-9, therefore `alpha033` is considered valid but not `alpha.033` nor `alpha033-preview` nor `RC2` (would need to be lowercased `rc2`). 
-
->It is considered best to add trailing zeroes to pre releases, else NuGet gets the order of versions wrong. So if you plan to have more than 10, but no more that 100 alpha versions, number the versions `alpha00`, `alpha01`, etc. 
-
-## Build-Umbraco
-
-Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
-
-    Build-Umbraco
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-### web.config
-
-Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
-
-## Build-UmbracoDocs
-
-Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
-
-    Build-UmbracoDocs
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-## Verify-NuGet
-
-Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
-
-    Verify-NuGet
-
-# VSTS
-
-Continuous integration, nightly builds and release builds run on VSTS.
-
-VSTS uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
-
-* `pre-build`: prepares the build
-* `compile-belle`: compiles Belle
-* `compile-umbraco`: compiles Umbraco
-* `pre-tests`: prepares the tests
-* `compile-tests`: compiles the tests
-* `pre-packages`: prepares the packages
-* `pkg-zip`: creates the zip files
-* `pre-nuget`: prepares NuGet packages
-* `pkg-nuget`: creates NuGet packages
-
-All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated VSTS tasks. Similarly, creating the NuGet packages is also performed by dedicated VSTS tasks.
-
-Finally, the produced artifacts are published in two containers that can be downloaded from VSTS: `zips` contains the zip files while `nuget` contains the NuGet packages.
-
->During a VSTS build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in VSTS tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with VSTS at the moment.
-
-# Notes
-
-*This part needs to be cleaned up*
-
-Nightlies should use some sort of build number.
-
-We should increment versions as soon as a version is released. Ie, as soon as `7.6.33` is released, we should `Set-UmbracoVersion 7.6.34-alpha` and push.
-
-NuGet / NuSpec consistency checks are performed in tests. We should move it so it is done as part of the PowerShell script even before we try to compile and run the tests.
-
-There are still a few commands in `build` (to build docs, install Git or cleanup the install) that will need to be migrated to PowerShell.
-
-/eof

README.md

@@ -12,7 +12,9 @@ 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/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 `grunt vs` in `src\Umbraco.Web.UI.Client`.
+ 
+If you're interested in making changes to Belle without running Visual Studio make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). 
 
 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.
 

appveyor.yml

@@ -1,9 +1,5 @@
 version: '{build}'
 shallow_clone: true
-
-init:
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  
 build_script:
 - cmd: >-
     SET SLN=%CD%

build.bat

@@ -1,15 +0,0 @@
-@ECHO OFF
-powershell .\build\build.ps1
-
-IF ERRORLEVEL 1 (
-	GOTO :error 
-) ELSE (
-	GOTO :EOF 
-)
-
-:error
-ECHO.
-ECHO Can not run build\build.ps1.
-ECHO If this is due to a SecurityError then make sure to run the following command from an administrator command prompt:
-ECHO.
-ECHO powershell Set-ExecutionPolicy -ExecutionPolicy RemoteSigned

build/Build.bat

@@ -0,0 +1,207 @@
+@ECHO OFF
+
+:: UMBRACO BUILD FILE
+
+
+:: ensure we have UmbracoVersion.txt
+IF NOT EXIST UmbracoVersion.txt (
+	ECHO UmbracoVersion.txt is missing!
+	GOTO error
+)
+
+REM Get the version and comment from UmbracoVersion.txt lines 2 and 3
+SET RELEASE=
+SET COMMENT=
+FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED RELEASE SET RELEASE=%%i
+FOR /F "skip=2 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED COMMENT SET COMMENT=%%i
+
+REM process args
+
+SET INTEGRATION=0
+SET nuGetFolder=%CD%\..\src\packages
+SET SKIPNUGET=0
+
+:processArgs
+
+:: grab the first parameter as a whole eg "/action:start"
+:: end if no more parameter
+SET SWITCHPARSE=%1
+IF [%SWITCHPARSE%] == [] goto endProcessArgs
+
+:: get switch and value
+SET SWITCH=
+SET VALUE=
+FOR /F "tokens=1,* delims=: " %%a IN ("%SWITCHPARSE%") DO SET SWITCH=%%a& SET VALUE=%%b
+
+:: route arg
+IF '%SWITCH%'=='/release' GOTO argRelease
+IF '%SWITCH%'=='-release' GOTO argRelease
+IF '%SWITCH%'=='/comment' GOTO argComment
+IF '%SWITCH%'=='-comment' GOTO argComment
+IF '%SWITCH%'=='/integration' GOTO argIntegration
+IF '%SWITCH%'=='-integration' GOTO argIntegration
+IF '%SWITCH%'=='/nugetfolder' GOTO argNugetFolder
+IF '%SWITCH%'=='-nugetfolder' GOTO argNugetFolder
+IF '%SWITCH%'=='/skipnuget' GOTO argSkipNuget
+IF '%SWITCH%'=='-skipnuget' GOTO argSkipNuget
+ECHO "Invalid switch %SWITCH%"
+GOTO error
+
+:: handle each arg
+
+:argRelease
+set RELEASE=%VALUE%
+SHIFT
+goto processArgs
+
+:argComment
+SET COMMENT=%VALUE%
+SHIFT
+GOTO processArgs
+
+:argIntegration
+SET INTEGRATION=1
+SHIFT
+GOTO processArgs
+
+:argNugetFolder
+SET nuGetFolder=%VALUE%
+SHIFT
+GOTO processArgs
+
+:argSkipNuget
+SET SKIPNUGET=1
+SHIFT
+GOTO processArgs
+
+:endProcessArgs 
+
+REM run
+
+SET VERSION=%RELEASE%
+IF [%COMMENT%] EQU [] (SET VERSION=%RELEASE%) ELSE (SET VERSION=%RELEASE%-%COMMENT%)
+
+ECHO ################################################################
+ECHO Building Umbraco %VERSION%
+ECHO ################################################################
+
+SET MSBUILDPATH=C:\Program Files (x86)\MSBuild\14.0\Bin
+SET MSBUILD="%MSBUILDPATH%\MsBuild.exe"
+SET PATH="%MSBUILDPATH%";%PATH%
+
+ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %RELEASE%
+
+ECHO.
+ECHO Removing the belle build folder and bower_components folder to make sure everything is clean as a whistle
+RD ..\src\Umbraco.Web.UI.Client\build /Q /S
+RD ..\src\Umbraco.Web.UI.Client\bower_components /Q /S
+
+ECHO.
+ECHO Removing existing built files to make sure everything is clean as a whistle
+RMDIR /Q /S _BuildOutput
+DEL /F /Q UmbracoCms.*.zip 2>NUL
+DEL /F /Q UmbracoExamine.*.zip 2>NUL
+DEL /F /Q UmbracoCms.*.nupkg 2>NUL
+DEL /F /Q webpihash.txt 2>NUL
+
+ECHO.
+ECHO Making sure Git is in the path so that the build can succeed
+CALL InstallGit.cmd
+
+REM Adding the default Git path so that if it's installed it can actually be found
+REM This is necessary because SETLOCAL is on in InstallGit.cmd so that one might find Git, 
+REM but the path setting is lost due to SETLOCAL 
+SET PATH="C:\Program Files (x86)\Git\cmd";"C:\Program Files\Git\cmd";%PATH%
+
+SET toolsFolder=%CD%\tools\
+IF NOT EXIST "%toolsFolder%" (
+	MD tools
+)
+
+SET nuGetExecutable=%CD%\tools\nuget.exe
+IF NOT EXIST "%nuGetExecutable%" (
+	ECHO Getting NuGet so we can fetch some tools
+	ECHO Downloading https://dist.nuget.org/win-x86-commandline/latest/nuget.exe to %nuGetExecutable%
+	powershell -Command "(New-Object Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '%nuGetExecutable%')"
+)
+
+:: We need vswhere.exe for VS2017+
+IF NOT EXIST "%toolsFolder%vswhere.exe" (
+	ECHO vswhere not found - fetching now
+	"%nuGetExecutable%" install vswhere -OutputDirectory tools -Verbosity quiet
+)
+
+FOR /f "delims=" %%A in ('dir "%toolsFolder%vswhere.*" /b') DO SET "vswhereExePath=%toolsFolder%%%A\"
+MOVE "%vswhereExePath%tools\vswhere.exe" "%toolsFolder%vswhere.exe"
+
+ECHO.
+ECHO Making sure we have a web.config
+IF NOT EXIST "%CD%\..\src\Umbraco.Web.UI\web.config" COPY "%CD%\..\src\Umbraco.Web.UI\web.Template.config" "%CD%\..\src\Umbraco.Web.UI\web.config"
+
+for /f "usebackq tokens=1* delims=: " %%i in (`"%CD%\tools\vswhere.exe" -latest -requires Microsoft.Component.MSBuild`) do (
+  if /i "%%i"=="installationPath" set InstallDir=%%j
+)
+
+SET VSWherePath="%InstallDir%\MSBuild"
+
+ECHO.
+ECHO Visual Studio is installed in: %InstallDir%
+
+SET MSBUILDPATH=C:\Program Files (x86)\MSBuild\14.0\Bin
+SET MSBUILD="%MSBUILDPATH%\MsBuild.exe"
+
+ECHO.
+ECHO Reporting NuGet version
+"%nuGetExecutable%" help | findstr "^NuGet Version:"
+
+ECHO.
+ECHO Restoring NuGet packages
+ECHO Into %nuGetFolder%
+"%nuGetExecutable%" restore "%CD%\..\src\umbraco.sln" -Verbosity Quiet -NonInteractive -PackagesDirectory "%nuGetFolder%"
+IF ERRORLEVEL 1 GOTO :error
+
+ECHO.
+ECHO.
+ECHO Performing MSBuild and producing Umbraco binaries zip files
+ECHO This takes a few minutes and logging is set to report warnings
+ECHO and errors only so it might seems like nothing is happening for a while. 
+ECHO You can check the msbuild.log file for progress.
+ECHO.
+%MSBUILD% "Build.proj" /p:BUILD_RELEASE=%RELEASE% /p:BUILD_COMMENT=%COMMENT% /p:NugetPackagesDirectory="%nuGetFolder%" /p:VSWherePath=%VSWherePath% /consoleloggerparameters:Summary;ErrorsOnly /fileLogger
+IF ERRORLEVEL 1 GOTO error
+
+ECHO.
+ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
+attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
+
+IF %SKIPNUGET% EQU 1 GOTO success
+
+ECHO.
+ECHO Adding Web.config transform files to the NuGet package
+REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
+REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform
+
+ECHO.
+ECHO Packing the NuGet release files
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %VERSION% -Symbols -Verbosity quiet
+..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %VERSION% -Verbosity quiet
+IF ERRORLEVEL 1 GOTO error
+
+:success
+ECHO.
+ECHO No errors were detected!
+ECHO There may still be some in the output, which you would need to investigate.
+ECHO Warnings are usually normal.
+ECHO.
+ECHO.
+GOTO :EOF
+
+:error
+
+ECHO.
+ECHO Errors were detected!
+ECHO.
+
+REM don't pause if continuous integration else the build server waits forever
+REM before cancelling the build (and, there is noone to read the output anyways)
+IF %INTEGRATION% NEQ 1 PAUSE

build/Build.proj

@@ -0,0 +1,345 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+ ****************************************************
+ INCLUDES
+ *****************************************************
+ -->
+
+  <PropertyGroup>
+    <MSBuildCommunityTasksPath>..\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
+    <UmbracoMSBuildTasksPath>..\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
+  </PropertyGroup>
+
+  <Import Project="..\tools\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
+  <Import Project="..\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+
+  <UsingTask TaskName="GenerateHash" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+      <InputFiles ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
+      <OutputFile ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Linq" />
+      <Using Namespace="System.Security.Cryptography" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+                using (var ms = new MemoryStream())
+                {
+                    foreach (var item in InputFiles)
+                    {
+                        string path = item.ItemSpec;
+
+                        using (FileStream stream = new FileStream(path, FileMode.Open))
+                        {
+                            using (var cryptoProvider = new SHA1CryptoServiceProvider())
+                            {
+
+                                var fileHash = cryptoProvider.ComputeHash(stream);
+
+                                using (TextWriter w = new StreamWriter(OutputFile, false))
+                                {
+                                    w.WriteLine(string.Join("", fileHash.Select(b => b.ToString("x2"))));
+                                }
+                            }
+                        }
+                    }
+                }
+            ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
+
+  <!--
+ ****************************************************
+ VARIABLES
+ *****************************************************
+ -->
+
+  <!-- NB: BUILD_NUMBER is passed in by the build server -->
+  <PropertyGroup Condition="'$(BUILD_NUMBER)'!=''">
+    <DECIMAL_BUILD_NUMBER>.$(BUILD_NUMBER)</DECIMAL_BUILD_NUMBER>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_RELEASE)'!=''">
+    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)</DECIMAL_BUILD_NUMBER>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_COMMENT)'!=''">
+    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_COMMENT)</DECIMAL_BUILD_NUMBER>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_NIGHTLY)'!=''">
+    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_NIGHTLY)</DECIMAL_BUILD_NUMBER>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_RELEASE)'!='' AND '$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''">
+    <DECIMAL_BUILD_NUMBER>.$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)</DECIMAL_BUILD_NUMBER>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <BuildConfiguration>Release</BuildConfiguration>
+    <BuildFolder>_BuildOutput\</BuildFolder>
+    <BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
+    <BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
+    <BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
+    <IncludeSymbols>False</IncludeSymbols>
+    <BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
+    <BuildFolderAbsolutePath>$(MSBuildProjectDirectory)\$(BuildFolder)</BuildFolderAbsolutePath>
+    <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
+    <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
+    <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
+    <ConfigsFolder>$(BuildFolder)Configs\</ConfigsFolder>
+    <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
+    <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
+    <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
+    <WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
+    <WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
+    <WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <SystemFolders Include="$(WebAppFolder)App_Data" />
+    <SystemFolders Include="$(WebAppFolder)Media" />
+    <SystemFolders Include="$(WebAppFolder)Views" />
+  </ItemGroup>
+
+  <!--
+ ****************************************************
+ TARGETS
+ *****************************************************
+ -->
+
+  <Target Name="Build" DependsOnTargets="GenerateWebPiHash">
+    <Message Text="Build finished" />
+  </Target>
+
+  <Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
+    <ItemGroup>
+      <WebPiFile Include="$(BuildZipFileNameWebPi)" />
+    </ItemGroup>
+    <Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
+    <GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
+  </Target>
+
+  <Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
+    <Message Text="Deleting $(BuildFolder)" Importance="high" />
+    <RemoveDir Directories="$(BuildFolder)" />
+    <Message Text="Finished deleting $(BuildFolder)" Importance="high" />
+  </Target>
+
+  <Target Name="ZipWebPiApp" DependsOnTargets="ZipWebApp" >
+    <!-- Clean folders -->
+    <RemoveDir Directories="$(WebPiFolder)" />
+    <MakeDir Directories="$(WebPiFolder)" />
+    <MakeDir Directories="$(WebPiFolder)umbraco" />
+
+    <!-- Copy fresh built umbraco files -->
+    <Exec Command="xcopy %22$(WebAppFolderAbsolutePath)*%22 %22$(WebPiFolderAbsolutePath)umbraco%22 /S /E /Y /I" />
+
+    <!-- Copy Web Pi template files -->
+    <ItemGroup>
+      <WebPiFiles Include="..\src\WebPi\**\*.*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(WebPiFiles)"
+        DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <!-- Zip the files -->
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22 -x!dotLess.Core.dll -x![Content_Types].xml >NUL" />
+  </Target>
+
+  <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
+    <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
+
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22 -x!dotLess.Core.dll >NUL" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22 -x!dotLess.Core.dll -x![Content_Types].xml >NUL" />
+
+    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
+  </Target>
+
+  <Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
+    <MakeDir Directories="@(SystemFolders)" />
+  </Target>
+
+  <Target Name="CopyBelleBuild" DependsOnTargets="CopyLibraries" >
+    <ItemGroup>
+      <BelleFiles Include="..\src\Umbraco.Web.UI.Client\build\belle\**\*.*" Exclude="..\src\Umbraco.Web.UI.Client\build\belle\index.html" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(BelleFiles)"
+          DestinationFiles="@(BelleFiles->'$(WebAppFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
+          OverwriteReadOnlyFiles="true"
+          SkipUnchangedFiles="false" />
+  </Target>
+
+  <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
+    <!-- Copy SQL CE -->
+    <ItemGroup>
+      <SQLCE4Files
+     Include="..\src\packages\SqlServerCE.4.0.0.1\**\*.*"
+     Exclude="..\src\packages\SqlServerCE.4.0.0.1\lib\**\*;..\src\packages\SqlServerCE.4.0.0.1\**\*.nu*"
+		/>
+    </ItemGroup>
+
+    <Copy SourceFiles="@(SQLCE4Files)"
+        DestinationFiles="@(SQLCE4Files->'$(SolutionBinFolder)%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+
+    <Copy SourceFiles="@(SQLCE4Files)"
+        DestinationFiles="@(SQLCE4Files->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+
+  </Target>
+
+  <!-- Offset the modified timestamps on all umbraco dlls, as WebResources break if date is in the future, which, due to timezone offsets can happen. -->
+  <Target Name="OffsetTimestamps" DependsOnTargets="CopyTransformedWebConfig">
+    <CreateItem Include="$(BuildFolder)**\umbraco.*.dll">
+      <Output TaskParameter="Include" ItemName="FilesToOffsetTimestamp" />
+    </CreateItem>
+    <Message Text="Starting to offset timestamps" Importance="high" />
+    <Umbraco.MSBuild.Tasks.TimestampOffset Files="@(FilesToOffsetTimestamp)" Offset="-11" />
+    <Message Text="Finished offsetting timestamps" Importance="high" />
+  </Target>
+
+  <!-- Copy the transformed web.config file to the root -->
+  <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
+    <ItemGroup>
+      <WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(WebConfigFile)"
+        DestinationFiles="$(WebAppFolder)Web.config"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+  </Target>
+
+  <!-- Copy the config files and rename them to *.config.transform -->
+  <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
+    <ItemGroup>
+      <ConfigFiles Include="$(WebAppFolder)config\*.config;$(WebAppFolder)config\*.js" />
+      <CustomLanguageFiles Include="$(WebAppFolder)config\lang\*.xml" />
+      <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(ConfigFiles)"
+        DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+
+    <Copy SourceFiles="@(CustomLanguageFiles)"
+      DestinationFiles="@(CustomLanguageFiles->'$(ConfigsFolder)Lang\%(RecursiveDir)%(Filename)%(Extension)')"
+      OverwriteReadOnlyFiles="true"
+      SkipUnchangedFiles="false" />
+
+    <Copy SourceFiles="@(WebConfigTransformFile)"
+      DestinationFiles="$(ConfigsFolder)Web.config.transform"
+      OverwriteReadOnlyFiles="true"
+      SkipUnchangedFiles="false" />
+  </Target>
+
+  <!-- Copy the xml documentation to the bin folder -->
+  <Target Name="CopyXmlDocumentation"  DependsOnTargets="CleanupPresentation">
+    <ItemGroup>
+      <XmlDocumentationFiles Include="$(SolutionBinFolder)*.xml" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(XmlDocumentationFiles)"
+        DestinationFiles="@(XmlDocumentationFiles->'$(WebAppFolder)bin\%(RecursiveDir)%(Filename)%(Extension)')"
+        OverwriteReadOnlyFiles="true"
+        SkipUnchangedFiles="false" />
+    <Message Text="CopyXmlDocumentation" />
+  </Target>
+
+  <!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
+  <Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
+    <ItemGroup>
+      <PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
+    </ItemGroup>
+    <RemoveDir Directories="@(PresentationFolderToDelete)" />
+  </Target>
+
+  <Target Name="CompileProjects" DependsOnTargets="SetVersionNumber">
+
+    <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
+    <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
+    <!-- Build the Umbraco.Web.UI project -->
+    <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath);Verbosity=minimal" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False" />
+
+    <!-- DONE -->
+    <Message Text="Finished compiling projects" Importance="high" />
+  </Target>
+
+  <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
+    <PropertyGroup>
+      <NewVersion>$(BUILD_RELEASE)</NewVersion>
+      <NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
+      <NewVersion Condition="'$(BUILD_NIGHTLY)'!=''">$(BUILD_RELEASE)-$(BUILD_NIGHTLY)</NewVersion>
+      <NewVersion Condition="'$(BUILD_COMMENT)'!='' And '$(BUILD_NIGHTLY)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)</NewVersion>
+    </PropertyGroup>
+
+    <!-- Match & replace 3 and 4 digit version numbers and -beta and +nightly (if they're there) -->
+    <FileUpdate
+      Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+      Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?"
+      ReplacementText="$(BUILD_RELEASE)"/>
+
+    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
+      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>
+
+    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+	  Condition="'$(BUILD_NIGHTLY)'!=''"
+      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
+      ReplacementText="CurrentComment { get { return &quot;$(BUILD_NIGHTLY)&quot;"/>
+	  
+    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+	  Condition="'$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''"
+      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
+      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)-$(BUILD_NIGHTLY)&quot;"/>
+
+    <!--This updates the AssemblyFileVersion for the solution to the umbraco version-->
+    <FileUpdate
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyFileVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyFileVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
+
+    <!--This updates the AssemblyInformationalVersion for the solution to the umbraco version and comment-->
+    <FileUpdate
+      Condition="'$(BUILD_COMMENT)'!=''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_COMMENT)&quot;)"/>
+    <FileUpdate
+      Condition="'$(BUILD_COMMENT)'==''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
+    <FileUpdate
+      Condition="'$(BUILD_NIGHTLY)'!=''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_NIGHTLY)&quot;)"/>
+	<FileUpdate
+      Condition="'$(BUILD_COMMENT)'!='' AND '$(BUILD_NIGHTLY)'!=''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY)&quot;)"/>
+    <FileUpdate
+      Condition="'$(BUILD_COMMENT)'=='' AND '$(BUILD_NIGHTLY)'==''"
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
+      ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
+
+    <!--This updates the copyright year-->
+    <FileUpdate
+      Files="..\src\SolutionInfo.cs"
+      Regex="AssemblyCopyright\(&quot;Copyright © Umbraco (\d{4})&quot;\)"
+      ReplacementText="AssemblyCopyright(&quot;Copyright © Umbraco $([System.DateTime]::Now.ToString(`yyyy`))&quot;)"/>
+
+    <XmlPoke XmlInputPath=".\NuSpecs\build\UmbracoCms.props"
+               Namespaces="&lt;Namespace Prefix='x' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
+         Query="//x:UmbracoVersion"
+         Value="$(NewVersion)" />
+  </Target>
+</Project>

build/BuildBelle.bat

@@ -0,0 +1,68 @@
+@ECHO OFF
+SETLOCAL
+	:: SETLOCAL is on, so changes to the path not persist to the actual user's path
+
+SET toolsFolder=%CD%\tools\
+ECHO Current folder: %CD%
+
+SET nodeFileName=node-v6.9.1-win-x86.7z
+SET nodeExtractFolder=%toolsFolder%node.js.691
+
+SET nuGetExecutable=%CD%\tools\nuget.exe
+IF NOT EXIST "%nuGetExecutable%" (
+	ECHO Downloading https://dist.nuget.org/win-x86-commandline/latest/nuget.exe to %nuGetExecutable%
+	powershell -Command "(New-Object Net.WebClient).DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', '%nuGetExecutable%')"
+)
+
+:: We need 7za.exe for BuildBelle.bat
+IF NOT EXIST "%toolsFolder%7za.exe" (
+	ECHO 7zip not found - fetching now
+	"%nuGetExecutable%" install 7-Zip.CommandLine -OutputDirectory tools -Verbosity quiet
+)
+
+:: Put 7za.exe and vswhere.exe in a predictable path (not version specific)
+FOR /f "delims=" %%A in ('dir "%toolsFolder%7-Zip.CommandLine.*" /b') DO SET "sevenZipExePath=%toolsFolder%%%A\"
+MOVE "%sevenZipExePath%tools\7za.exe" "%toolsFolder%7za.exe"
+
+IF NOT EXIST "%nodeExtractFolder%" (
+	ECHO Downloading http://nodejs.org/dist/v6.9.1/%nodeFileName% to %toolsFolder%%nodeFileName%
+	powershell -Command "(New-Object Net.WebClient).DownloadFile('http://nodejs.org/dist/v6.9.1/%nodeFileName%', '%toolsFolder%%nodeFileName%')"
+	ECHO Extracting %nodeFileName% to %nodeExtractFolder%
+	"%toolsFolder%\7za.exe" x "%toolsFolder%\%nodeFileName%" -o"%nodeExtractFolder%" -aos > nul
+)
+FOR /f "delims=" %%A in ('dir "%nodeExtractFolder%\node*" /b') DO SET "nodePath=%nodeExtractFolder%\%%A"
+
+SET drive=%CD:~0,2%
+SET nuGetFolder=%drive%\packages\
+FOR /f "delims=" %%A in ('dir "%nuGetFolder%npm.*" /b') DO SET "npmPath=%nuGetFolder%%%A\"
+
+IF [%npmPath%] == [] GOTO :installnpm 
+IF NOT [%npmPath%] == [] GOTO :build
+
+:installnpm
+	ECHO Downloading npm
+	ECHO Configured packages folder: %nuGetFolder%	
+	ECHO Installing Npm NuGet Package
+	"%nuGetExecutable%" install Npm -OutputDirectory %nuGetFolder% -Verbosity detailed
+	REM Ensures that we look for the just downloaded NPM, not whatever the user has installed on their machine
+	FOR /f "delims=" %%A in ('dir %nuGetFolder%npm.* /b') DO SET "npmPath=%nuGetFolder%%%A\"
+	GOTO :build
+
+:build
+    ECHO Adding Npm and Node to path 
+    REM SETLOCAL is on, so changes to the path not persist to the actual user's path
+    PATH="%npmPath%";"%nodePath%";%PATH%
+    SET buildFolder=%CD%
+
+    ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
+    CD %CD%\..\src\Umbraco.Web.UI.Client\
+
+    ECHO Do npm install and the grunt build of Belle
+    call npm cache clean --quiet
+    call npm install --quiet
+    call npm install -g grunt-cli --quiet
+    call npm install -g bower --quiet
+    call grunt build --buildversion=%release%
+
+    ECHO Move back to the build folder
+    CD "%buildFolder%"

build/BuildDocs.bat

@@ -0,0 +1,20 @@
+@ECHO OFF
+SETLOCAL
+
+SET release=%1
+ECHO Installing Npm NuGet Package
+
+SET nuGetFolder=%CD%\..\src\packages\
+ECHO Configured packages folder: %nuGetFolder%
+ECHO Current folder: %CD%
+
+%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%  -Verbosity quiet
+
+for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
+for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
+
+ECHO Adding Npm and Node to path 
+REM SETLOCAL is on, so changes to the path not persist to the actual user's path
+PATH=%npmPath%;%nodePath%;%PATH%
+
+Powershell.exe -ExecutionPolicy Unrestricted  -File .\BuildDocs.ps1

build/BuildDocs.ps1

@@ -0,0 +1,114 @@
+$PSScriptFilePath = (Get-Item $MyInvocation.MyCommand.Path);
+$RepoRoot = (get-item $PSScriptFilePath).Directory.Parent.FullName;
+$SolutionRoot = Join-Path -Path $RepoRoot "src";
+$ToolsRoot = Join-Path -Path $RepoRoot "tools";
+$DocFx = Join-Path -Path $ToolsRoot "docfx\docfx.exe"
+$DocFxFolder = (Join-Path -Path $ToolsRoot "docfx")
+$DocFxJson = Join-Path -Path $RepoRoot "apidocs\docfx.json"
+$7Zip = Join-Path -Path $ToolsRoot "7zip\7za.exe"
+$DocFxSiteOutput = Join-Path -Path $RepoRoot "apidocs\_site\*.*"
+$NgDocsSiteOutput = Join-Path -Path $RepoRoot "src\Umbraco.Web.UI.Client\docs\api\*.*"
+$ProgFiles86 = [Environment]::GetEnvironmentVariable("ProgramFiles(x86)");
+$MSBuild = "$ProgFiles86\MSBuild\14.0\Bin\MSBuild.exe"
+
+
+################ Do the UI docs
+
+"Changing to Umbraco.Web.UI.Client folder"
+cd ..
+cd src\Umbraco.Web.UI.Client
+Write-Host $(Get-Location)
+
+"Creating build folder so MSBuild doesn't run the whole grunt build"
+if (-Not (Test-Path "build")) {
+    md "build"
+}
+
+"Installing node"
+# Check if Install-Product exists, should only exist on the build server
+if (Get-Command Install-Product -errorAction SilentlyContinue)
+{
+    Install-Product node ''
+}
+
+"Installing node modules"
+& npm install
+
+"Installing grunt"
+& npm install -g grunt-cli
+
+"Moving back to build folder"
+cd ..
+cd ..
+cd build
+Write-Host $(Get-Location)
+
+ & grunt --gruntfile ../src/umbraco.web.ui.client/gruntfile.js docs
+
+# change baseUrl
+$BaseUrl = "https://our.umbraco.org/apidocs/ui/"
+$IndexPath = "../src/umbraco.web.ui.client/docs/api/index.html"
+(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
+# zip it
+
+& $7Zip a -tzip ui-docs.zip $NgDocsSiteOutput -r
+
+################ Do the c# docs
+
+# Build the solution in debug mode
+$SolutionPath = Join-Path -Path $SolutionRoot -ChildPath "umbraco.sln"
+
+# Go get nuget.exe if we don't hae it
+$NuGet = "$ToolsRoot\nuget.exe"
+$FileExists = Test-Path $NuGet
+If ($FileExists -eq $False) {
+	Write-Host "Retrieving nuget.exe..."
+	$SourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+	Invoke-WebRequest $SourceNugetExe -OutFile $NuGet
+}
+
+#restore nuget packages
+Write-Host "Restoring nuget packages..."
+& $NuGet restore $SolutionPath
+
+& $MSBuild "$SolutionPath" /p:Configuration=Debug /maxcpucount /t:Clean
+if (-not $?)
+{
+	throw "The MSBuild process returned an error code."
+}
+& $MSBuild "$SolutionPath" /p:Configuration=Debug /maxcpucount
+if (-not $?)
+{
+	throw "The MSBuild process returned an error code."
+}
+
+# Go get docfx if we don't hae it
+$FileExists = Test-Path $DocFx 
+If ($FileExists -eq $False) {
+
+	If(!(Test-Path $DocFxFolder))
+	{
+		New-Item $DocFxFolder -type directory
+	}	
+	
+	$DocFxZip = Join-Path -Path $ToolsRoot "docfx\docfx.zip"
+	$DocFxSource = "https://github.com/dotnet/docfx/releases/download/v1.9.4/docfx.zip"
+	Invoke-WebRequest $DocFxSource -OutFile $DocFxZip
+
+	#unzip it	
+	& $7Zip e $DocFxZip "-o$DocFxFolder"
+}
+
+#clear site
+If(Test-Path(Join-Path -Path $RepoRoot "apidocs\_site"))
+{
+	Remove-Item $DocFxSiteOutput -recurse
+}
+
+# run it!
+& $DocFx metadata $DocFxJson
+& $DocFx build $DocFxJson
+
+# zip it
+
+& $7Zip a -tzip csharp-docs.zip $DocFxSiteOutput -r

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build/Modules/Umbraco.Build/Utilities.ps1

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

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

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

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -21,9 +21,9 @@
       <dependency id="Microsoft.AspNet.WebApi" version="[5.2.3,6.0.0)" />
       <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.0.1, 4.0.0)" />
-      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.0.1, 4.0.0)" />
-      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.0.1, 4.0.0)" />
+      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.1.0, 4.0.0)" />
+      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.1.0, 4.0.0)" />
+      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.1.0, 4.0.0)" />
       <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
       <dependency id="HtmlAgilityPack" version="[1.4.9.5, 2.0.0)" />
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
@@ -40,69 +40,69 @@
       <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>
-    <file src="$BuildTmp$\WebApp\bin\businesslogic.dll" target="lib\net45\businesslogic.dll" />
-    <file src="$BuildTmp$\WebApp\bin\businesslogic.xml" target="lib\net45\businesslogic.xml" />
-    <file src="$BuildTmp$\WebApp\bin\cms.dll" target="lib\net45\cms.dll" />
-    <file src="$BuildTmp$\WebApp\bin\cms.xml" target="lib\net45\cms.xml" />
-    <file src="$BuildTmp$\WebApp\bin\controls.dll" target="lib\net45\controls.dll" />
-    <file src="$BuildTmp$\WebApp\bin\controls.xml" target="lib\net45\controls.xml" />
-    <file src="$BuildTmp$\WebApp\bin\interfaces.dll" target="lib\net45\interfaces.dll" />
-    <file src="$BuildTmp$\WebApp\bin\interfaces.xml" target="lib\net45\interfaces.xml" />
-    <file src="$BuildTmp$\WebApp\bin\log4net.dll" target="lib\net45\log4net.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net45\Microsoft.ApplicationBlocks.Data.dll" />
-    <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.dll" target="lib\net45\SQLCE4Umbraco.dll" />
-    <file src="$BuildTmp$\WebApp\bin\SQLCE4Umbraco.xml" target="lib\net45\SQLCE4Umbraco.xml" />
-    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\net45\System.Data.SqlServerCe.dll" />
-    <file src="$BuildTmp$\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\net45\System.Data.SqlServerCe.Entity.dll" />
-    <file src="$BuildTmp$\WebApp\bin\TidyNet.dll" target="lib\net45\TidyNet.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net45\Umbraco.Core.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net45\Umbraco.Core.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.dll" target="lib\net45\umbraco.DataLayer.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.DataLayer.xml" target="lib\net45\umbraco.DataLayer.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.dll" target="lib\net45\umbraco.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.xml" target="lib\net45\umbraco.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.dll" target="lib\net45\umbraco.editorControls.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.editorControls.xml" target="lib\net45\umbraco.editorControls.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.dll" target="lib\net45\umbraco.MacroEngines.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.MacroEngines.xml" target="lib\net45\umbraco.MacroEngines.xml" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.providers.dll" target="lib\net45\umbraco.providers.dll" />
-    <file src="$BuildTmp$\WebApp\bin\umbraco.providers.xml" target="lib\net45\umbraco.providers.xml" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net45\Umbraco.Web.UI.dll" />
-    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net45\Umbraco.Web.UI.xml" />
-    <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.dll" target="lib\net45\UmbracoExamine.dll" />
-    <file src="$BuildTmp$\WebApp\bin\UmbracoExamine.xml" target="lib\net45\UmbracoExamine.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\net45\businesslogic.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\net45\businesslogic.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\net45\cms.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\net45\cms.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\net45\controls.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\net45\controls.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\net45\interfaces.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\net45\interfaces.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\net45\log4net.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net45\Microsoft.ApplicationBlocks.Data.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\net45\SQLCE4Umbraco.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\net45\SQLCE4Umbraco.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\net45\System.Data.SqlServerCe.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\net45\System.Data.SqlServerCe.Entity.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\net45\TidyNet.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\net45\Umbraco.Core.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\net45\Umbraco.Core.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\net45\umbraco.DataLayer.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\net45\umbraco.DataLayer.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\net45\umbraco.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\net45\umbraco.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\net45\umbraco.editorControls.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\net45\umbraco.editorControls.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\net45\umbraco.MacroEngines.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\net45\umbraco.MacroEngines.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\net45\umbraco.providers.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\net45\umbraco.providers.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net45\Umbraco.Web.UI.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net45\Umbraco.Web.UI.xml" />
+    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\net45\UmbracoExamine.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.xml" target="lib\net45\UmbracoExamine.xml" />
     <file src="tools\install.core.ps1" target="tools\install.ps1" />
 
     <!-- Added to be able to produce a symbols package -->
-    <file src="$BuildTmp$\bin\SQLCE4Umbraco.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\SQLCE4Umbraco.pdb" target="lib" />
     <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
-    <file src="$BuildTmp$\bin\businesslogic.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\businesslogic.pdb" target="lib" />
     <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
-    <file src="$BuildTmp$\bin\cms.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\cms.pdb" target="lib" />
     <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
-    <file src="$BuildTmp$\bin\controls.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\controls.pdb" target="lib" />
     <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
-    <file src="$BuildTmp$\bin\interfaces.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\interfaces.pdb" target="lib" />
     <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
-    <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\Umbraco.Core.pdb" target="lib" />
     <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
-    <file src="$BuildTmp$\bin\umbraco.DataLayer.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\umbraco.DataLayer.pdb" target="lib" />
     <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
-    <file src="$BuildTmp$\bin\umbraco.editorControls.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\umbraco.editorControls.pdb" target="lib" />
     <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
-    <file src="$BuildTmp$\bin\umbraco.MacroEngines.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\umbraco.MacroEngines.pdb" target="lib" />
     <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
-    <file src="$BuildTmp$\bin\umbraco.providers.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\umbraco.providers.pdb" target="lib" />
     <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
-    <file src="$BuildTmp$\bin\umbraco.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\umbraco.pdb" target="lib" />
     <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
-    <file src="$BuildTmp$\bin\Umbraco.Web.UI.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\Umbraco.Web.UI.pdb" target="lib" />
     <file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
-    <file src="$BuildTmp$\bin\UmbracoExamine.pdb" target="lib" />
+    <file src="..\_BuildOutput\bin\UmbracoExamine.pdb" target="lib" />
     <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
   </files>
 </package>

build/NuSpecs/UmbracoCms.nuspec

@@ -19,22 +19,22 @@
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
       <dependency id="Umbraco.ModelsBuilder" version="[3.0.7, 4.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-	  <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
+	    <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
     </dependencies>
   </metadata>
   <files>
-    <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
-    <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
-    <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
-    <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
-    <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-    <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-    <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
-    <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
-    <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
-    <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-    <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
-    <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
+    <file src="..\_BuildOutput\Configs\**" target="Content\Config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
+    <file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" exclude="..\_BuildOutput\WebApp\Views\Web.config" />
+    <file src="..\_BuildOutput\WebApp\default.aspx" target="Content\default.aspx" />
+    <file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
+    <file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
+    <file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
+    <file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
+    <file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
+    <file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+    <file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
+    <file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
+    <file src="..\_BuildOutput\WebApp\Media\Web.config" target="Content\Media\Web.config" />
     <file src="tools\install.ps1" target="tools\install.ps1" />
     <file src="tools\Readme.txt" target="tools\Readme.txt" />
     <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />

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

@@ -15,6 +15,7 @@
       <section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
       <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
       <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
     </sectionGroup>
   </configSections>
 
@@ -30,6 +31,7 @@
     <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
     <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
     <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
   </umbracoConfiguration>
 
   <FileSystemProviders xdt:Transform="Remove" />
@@ -368,19 +370,19 @@
       </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />

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

@@ -102,15 +102,16 @@
        xdt:Transform="Remove" />
 
   <!--Users-->
-  <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" 
+ <add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, umbraco" 
+      xdt:Locator="Match(application,alias)"
+      xdt:Transform="SetAttributes()" />
+
+  <add application="users" alias="userTypes"
        xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" 
+       xdt:Transform="Remove" />
+  <add application="users" alias="userPermissions" 
        xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
+       xdt:Transform="Remove" />
 
   <!--Members-->
   <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" 

build/UmbracoVersion.txt

@@ -0,0 +1,3 @@
+# Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
+7.7.0
+beta

build/build.ps1

@@ -1,67 +0,0 @@
-param (
-    [Parameter(Mandatory=$false)]
-    [string]
-    $version,
-
-    [Parameter(Mandatory=$false)]
-    [Alias("mo")]
-    [switch]
-    $moduleOnly = $false
-)
-
-# the script can run either from the solution root,
-# or from the ./build directory - anything else fails
-if ([System.IO.Path]::GetFileName($pwd) -eq "build")
-{
-  $mpath = [System.IO.Path]::GetDirectoryName($pwd) + "\build\Modules\"
-}
-else
-{
-  $mpath = "$pwd\build\Modules\"
-}
-
-# look for the module and throw if not found
-if (-not [System.IO.Directory]::Exists($mpath + "Umbraco.Build"))
-{
-  Write-Error "Could not locate Umbraco build Powershell module."
-  break
-}
-
-# add the module path (if not already there)
-if (-not $env:PSModulePath.Contains($mpath))
-{
-  $env:PSModulePath = "$mpath;$env:PSModulePath"
-}
-
-# force-import (or re-import) the module
-Write-Host "Import Umbraco build Powershell module"
-Import-Module Umbraco.Build -Force -DisableNameChecking
-
-# module only?
-if ($moduleOnly)
-{
-  if (-not [string]::IsNullOrWhiteSpace($version))
-  {
-    Write-Host "(module only: ignoring version parameter)"
-  }
-  else
-  {
-    Write-Host "(module only)"
-  }
-  break
-}
-
-# get build environment
-Write-Host "Setup Umbraco build Environment"
-$uenv = Get-UmbracoBuildEnv
-
-# set the version if any
-if (-not [string]::IsNullOrWhiteSpace($version))
-{
-  Write-Host "Set Umbraco version to $version"
-  Set-UmbracoVersion $version
-}
-
-# full umbraco build
-Write-Host "Build Umbraco"
-Build-Umbraco

build/setversion.ps1

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

src/.nuget/NuGet.Config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>

src/.nuget/NuGet.targets

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+        
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+        
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+    
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+      <PackageSource Include="https://nuget.org/api/v2/" />
+      <PackageSource Include="http://www.myget.org/F/umbracocore/" />		
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+        <PackagesConfig>packages.config</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+        
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+        
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+        
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+              
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)" 
+              Condition=" '$(OS)' != 'Windows_NT' " />
+              
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+    
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -93,6 +93,7 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

src/SQLCE4Umbraco/app.config

@@ -16,19 +16,19 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />

src/SolutionInfo.cs

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

src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Threading;
-using System.Web;
-using Umbraco.Core.Security;
-
-namespace Umbraco.Core.Auditing
-{
-    /// <summary>
-    /// This class is used by events raised from hthe BackofficeUserManager
-    /// </summary>
-    public class IdentityAuditEventArgs : EventArgs
-    {
-        /// <summary>
-        /// The action that got triggered from the audit event
-        /// </summary>
-        public AuditEvent Action { get; private set; }
-
-        /// <summary>
-        /// Current date/time in UTC format
-        /// </summary>
-        public DateTime DateTimeUtc { get; private set; }
-
-        /// <summary>
-        /// The source IP address of the user performing the action
-        /// </summary>
-        public string IpAddress { get; private set; }
-
-        /// <summary>
-        /// The user affected by the event raised
-        /// </summary>
-        public int AffectedUser { get; private set; }
-
-        /// <summary>
-        /// If a user is perfoming an action on a different user, then this will be set. Otherwise it will be -1
-        /// </summary>
-        public int PerformingUser { get; private set; }
-
-        /// <summary>
-        /// An optional comment about the action being logged
-        /// </summary>
-        public string Comment { get; private set; }
-
-        /// <summary>
-        /// This property is always empty except in the LoginFailed event for an unknown user trying to login
-        /// </summary>
-        public string Username { get; private set; }
-
-        /// <summary>
-        /// Sets the properties on the event being raised, all parameters are optional except for the action being performed
-        /// </summary>
-        /// <param name="action">An action based on the AuditEvent enum</param>
-        /// <param name="ipAddress">The client's IP address. This is usually automatically set but could be overridden if necessary</param>
-        /// <param name="performingUser">The Id of the user performing the action (if different from the user affected by the action)</param>
-        public IdentityAuditEventArgs(AuditEvent action, string ipAddress, int performingUser = -1)
-        {
-            DateTimeUtc = DateTime.UtcNow;
-            Action = action;
-
-            IpAddress = ipAddress;
-
-            PerformingUser = performingUser == -1
-                ? GetCurrentRequestBackofficeUserId()
-                : performingUser;
-        }
-
-        public IdentityAuditEventArgs(AuditEvent action, string ipAddress, string username, string comment)
-        {
-            DateTimeUtc = DateTime.UtcNow;
-            Action = action;
-
-            IpAddress = ipAddress;
-            Username = username;
-            Comment = comment;
-        }
-
-        /// <summary>
-        /// Returns the current logged in backoffice user's Id logging if there is one
-        /// </summary>
-        /// <returns></returns>
-        protected int GetCurrentRequestBackofficeUserId()
-        {
-            var userId = -1;
-            var backOfficeIdentity = Thread.CurrentPrincipal.GetUmbracoIdentity();
-            if (backOfficeIdentity != null)
-                int.TryParse(backOfficeIdentity.Id.ToString(), out userId);
-            return userId;
-        }
-    }
-
-    public enum AuditEvent
-    {
-        AccountLocked,
-        AccountUnlocked,
-        ForgotPasswordRequested,
-        ForgotPasswordChangedSuccess,
-        LoginFailed,
-        LoginRequiresVerification,
-        LoginSucces,
-        LogoutSuccess,
-        PasswordChanged,
-        PasswordReset,
-        ResetAccessFailedCount
-    }
-}

src/Umbraco.Core/Cache/CacheKeys.cs

@@ -55,8 +55,10 @@ namespace Umbraco.Core.Cache
         [Obsolete("This is no longer used and will be removed from the codebase in the future")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public const string UserCacheKey = "UmbracoUser";
-        
-        public const string UserPermissionsCacheKey = "UmbracoUserPermissions";
+
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public const string UserGroupPermissionsCacheKey = "UmbracoUserGroupPermissions";
 
         [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
         public const string ContentTypeCacheKey = "UmbracoContentType";

src/Umbraco.Core/CodeAnnotations/ActionMetadataAttribute.cs

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

src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs

@@ -1,19 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Web;
+using System.Linq;
 using System.Xml.Linq;
-using ClientDependency.Core.CompositeFiles.Providers;
-using ClientDependency.Core.Config;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// A utility class for working with CDF config and cache files - use sparingly!
-    /// </summary>
-    public class ClientDependencyConfiguration
+{
+    internal class ClientDependencyConfiguration
     {
         private readonly ILogger _logger;
         private readonly string _fileName;
@@ -28,7 +21,7 @@ namespace Umbraco.Core.Configuration
         /// <summary>
         /// Changes the version number in ClientDependency.config to a random value to avoid stale caches
         /// </summary>
-        public bool IncreaseVersionNumber()
+        internal bool IncreaseVersionNumber()
         {
             try
             {
@@ -56,55 +49,5 @@ namespace Umbraco.Core.Configuration
 
             return false;
         }
-
-        /// <summary>
-        /// Clears the temporary files stored for the ClientDependency folder
-        /// </summary>
-        /// <param name="currentHttpContext"></param>
-        public bool ClearTempFiles(HttpContextBase currentHttpContext)
-        {
-            var cdfTempDirectories = new HashSet<string>();
-            foreach (BaseCompositeFileProcessingProvider provider in ClientDependencySettings.Instance
-                .CompositeFileProcessingProviderCollection)
-            {
-                var path = provider.CompositeFilePath.FullName;
-                cdfTempDirectories.Add(path);
-            }
-
-            try
-            {
-                var fullPath = currentHttpContext.Server.MapPath(XmlFileMapper.FileMapVirtualFolder);
-                if (fullPath != null)
-                {
-                    cdfTempDirectories.Add(fullPath);
-                }
-            }
-            catch (Exception ex)
-            {
-                //invalid path format or something... try/catch to be safe
-                LogHelper.Error<ClientDependencyConfiguration>("Could not get path from ClientDependency.config", ex);
-            }
-
-            var success = true;
-            foreach (var directory in cdfTempDirectories)
-            {
-                var directoryInfo = new DirectoryInfo(directory);
-                if (directoryInfo.Exists == false)
-                    continue;
-
-                try
-                {
-                    directoryInfo.Delete(true);
-                }
-                catch (Exception ex)
-                {
-                    // Something could be locking the directory or the was another error, making sure we don't break the upgrade installer
-                    LogHelper.Error<ClientDependencyConfiguration>("Could not clear temp files", ex);
-                    success = false;
-                }
-            }
-
-            return success;
-        }
     }
 }

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
+using System.Net.Configuration;
 using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
@@ -42,7 +43,6 @@ namespace Umbraco.Core.Configuration
         //ensure the built on (non-changeable) reserved paths are there at all times
         private const string StaticReservedPaths = "~/app_plugins/,~/install/,";
         private const string StaticReservedUrls = "~/config/splashes/booting.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,";
-
         #endregion
 
         /// <summary>
@@ -53,6 +53,7 @@ namespace Umbraco.Core.Configuration
             _reservedUrlsCache = null;
             _reservedPaths = null;
             _reservedUrls = null;
+            HasSmtpServer = null;
         }
 
         /// <summary>
@@ -64,7 +65,26 @@ namespace Umbraco.Core.Configuration
             ResetInternal();
         }
 
-    	/// <summary>
+        public static bool HasSmtpServerConfigured(string appPath)
+        {
+            if (HasSmtpServer.HasValue) return HasSmtpServer.Value;
+
+            var config = WebConfigurationManager.OpenWebConfiguration(appPath);
+            var settings = (MailSettingsSectionGroup)config.GetSectionGroup("system.net/mailSettings");
+            if (settings == null || settings.Smtp == null) return false;
+            if (settings.Smtp.SpecifiedPickupDirectory != null && string.IsNullOrEmpty(settings.Smtp.SpecifiedPickupDirectory.PickupDirectoryLocation) == false)
+                return true;
+            if (settings.Smtp.Network != null && string.IsNullOrEmpty(settings.Smtp.Network.Host) == false)
+                return true;
+            return false;
+        }
+
+        /// <summary>
+        /// For testing only
+        /// </summary>
+        internal static bool? HasSmtpServer { get; set; }
+
+        /// <summary>
         /// Gets the reserved urls from web.config.
         /// </summary>
         /// <value>The reserved urls.</value>

src/Umbraco.Core/Configuration/HealthChecks/DisabledHealthCheckElement.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public class DisabledHealthCheckElement : ConfigurationElement, IDisabledHealthCheck
+    {
+        private const string IdKey = "id";
+        private const string DisabledOnKey = "disabledOn";
+        private const string DisabledByKey = "disabledBy";
+
+        [ConfigurationProperty(IdKey, IsKey = true, IsRequired = true)]
+        public Guid Id
+        {
+            get
+            {
+                return ((Guid)(base[IdKey]));
+            }
+        }
+
+        [ConfigurationProperty(DisabledOnKey, IsKey = false, IsRequired = false)]
+        public DateTime DisabledOn
+        {
+            get
+            {
+                return ((DateTime)(base[DisabledOnKey]));
+            }
+        }
+
+        [ConfigurationProperty(DisabledByKey, IsKey = false, IsRequired = false)]
+        public int DisabledBy
+        {
+            get
+            {
+                return ((int)(base[DisabledByKey]));
+            }
+        }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/DisabledHealthChecksElementCollection.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    [ConfigurationCollection(typeof(DisabledHealthCheckElement), AddItemName = "check")]
+    public class DisabledHealthChecksElementCollection : ConfigurationElementCollection, IEnumerable<IDisabledHealthCheck> 
+    {
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new DisabledHealthCheckElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((DisabledHealthCheckElement)(element)).Id;
+        }
+
+        public new DisabledHealthCheckElement this[string key]
+        {
+            get
+            {
+                return (DisabledHealthCheckElement)BaseGet(key);
+            }
+        }
+
+        IEnumerator<IDisabledHealthCheck> IEnumerable<IDisabledHealthCheck>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as DisabledHealthCheckElement;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/HealthCheckNotificationSettingsElement.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public class HealthCheckNotificationSettingsElement : ConfigurationElement, IHealthCheckNotificationSettings
+    {
+        private const string EnabledKey = "enabled";
+        private const string FirstRunTimeKey = "firstRunTime";
+        private const string PeriodKey = "periodInHours";
+        private const string NotificationMethodsKey = "notificationMethods";
+        private const string DisabledChecksKey = "disabledChecks";
+
+        [ConfigurationProperty(EnabledKey, IsRequired = true)]
+        public bool Enabled
+        {
+            get
+            {
+                return (bool)base[EnabledKey];
+            }
+        }
+
+        [ConfigurationProperty(FirstRunTimeKey, IsRequired = false)]
+        public string FirstRunTime
+        {
+            get
+            {
+                return (string)base[FirstRunTimeKey];
+            }
+        }
+
+        [ConfigurationProperty(PeriodKey, IsRequired = true)]
+        public int PeriodInHours
+        {
+            get
+            {
+                return (int)base[PeriodKey];
+            }
+        }
+
+        [ConfigurationProperty(NotificationMethodsKey, IsDefaultCollection = true, IsRequired = false)]
+        public NotificationMethodsElementCollection NotificationMethods
+        {
+            get
+            {
+                return (NotificationMethodsElementCollection)base[NotificationMethodsKey];
+            }
+        }
+
+        [ConfigurationProperty(DisabledChecksKey, IsDefaultCollection = false, IsRequired = false)]
+        public DisabledHealthChecksElementCollection DisabledChecks
+        {
+            get
+            {
+                return (DisabledHealthChecksElementCollection)base[DisabledChecksKey];
+            }
+        }
+
+        bool IHealthCheckNotificationSettings.Enabled
+        {
+            get { return Enabled; }
+        }
+
+        string IHealthCheckNotificationSettings.FirstRunTime
+        {
+            get { return FirstRunTime; }
+        }
+
+        int IHealthCheckNotificationSettings.PeriodInHours
+        {
+            get { return PeriodInHours; }
+        }
+
+        IReadOnlyDictionary<string, INotificationMethod> IHealthCheckNotificationSettings.NotificationMethods
+        {
+            get { return NotificationMethods; }
+        }
+
+        IEnumerable<IDisabledHealthCheck> IHealthCheckNotificationSettings.DisabledChecks
+        {
+            get { return DisabledChecks; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/HealthCheckNotificationVerbosity.cs

@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public enum HealthCheckNotificationVerbosity
+    {
+        Summary,
+        Detailed
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/HealthChecksSection.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public class HealthChecksSection : ConfigurationSection, IHealthChecks
+    {
+        private const string DisabledChecksKey = "disabledChecks";
+        private const string NotificationSettingsKey = "notificationSettings";
+
+        [ConfigurationProperty(DisabledChecksKey)]
+        public DisabledHealthChecksElementCollection DisabledChecks
+        {
+            get { return ((DisabledHealthChecksElementCollection)(base[DisabledChecksKey])); }
+        }
+
+        [ConfigurationProperty(NotificationSettingsKey, IsRequired = true)]
+        public HealthCheckNotificationSettingsElement NotificationSettings
+        {
+            get { return ((HealthCheckNotificationSettingsElement)(base[NotificationSettingsKey])); }
+        }
+
+        IEnumerable<IDisabledHealthCheck> IHealthChecks.DisabledChecks
+        {
+            get { return DisabledChecks; }
+        }
+
+        IHealthCheckNotificationSettings IHealthChecks.NotificationSettings
+        {
+            get { return NotificationSettings; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/IDisabledHealthCheck.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public interface IDisabledHealthCheck
+    {
+        Guid Id { get; }
+        DateTime DisabledOn { get; }
+        int DisabledBy { get; }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/IHealthCheckNotificationSettings.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public interface IHealthCheckNotificationSettings
+    {
+        bool Enabled { get; }
+        string FirstRunTime { get; }
+        int PeriodInHours { get; }
+        IReadOnlyDictionary<string, INotificationMethod> NotificationMethods { get; }
+        IEnumerable<IDisabledHealthCheck> DisabledChecks { get; }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/IHealthChecks.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public interface IHealthChecks
+    {
+        IEnumerable<IDisabledHealthCheck> DisabledChecks { get; }
+        IHealthCheckNotificationSettings NotificationSettings { get; }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/INotificationMethod.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public interface INotificationMethod
+    {
+        string Alias { get; }
+        bool Enabled { get; }
+        HealthCheckNotificationVerbosity Verbosity { get; }
+        bool FailureOnly { get; }
+        IReadOnlyDictionary<string, INotificationMethodSettings> Settings { get; }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/INotificationMethodSettings.cs

@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public interface INotificationMethodSettings
+    {
+        string Key { get; }
+        string Value { get; }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/NotificationMethodElement.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public class NotificationMethodElement : ConfigurationElement, INotificationMethod
+    {
+        private const string AliasKey = "alias";
+        private const string EnabledKey = "enabled";
+        private const string VerbosityKey = "verbosity";
+        private const string FailureonlyKey = "failureOnly";
+        private const string SettingsKey = "settings";
+
+        [ConfigurationProperty(AliasKey, IsKey = true, IsRequired = true)]
+        public string Alias 
+        {
+            get
+            {
+                return (string)base[AliasKey];
+            }
+        }
+
+        [ConfigurationProperty(EnabledKey, IsKey = true, IsRequired = true)]
+        public bool Enabled
+        {
+            get
+            {
+                return (bool)base[EnabledKey];
+            }
+        }
+
+        [ConfigurationProperty(VerbosityKey, IsRequired = true)]
+        public HealthCheckNotificationVerbosity Verbosity
+        {
+            get
+            {
+                return (HealthCheckNotificationVerbosity)base[VerbosityKey];
+            }
+        }
+
+        [ConfigurationProperty(FailureonlyKey, IsRequired = false)]
+        public bool FailureOnly
+        {
+            get
+            {
+                return (bool)base[FailureonlyKey];
+            }
+        }
+
+        [ConfigurationProperty(SettingsKey, IsDefaultCollection = true, IsRequired = false)]
+        public NotificationMethodSettingsElementCollection Settings
+        {
+            get
+            {
+                return (NotificationMethodSettingsElementCollection)base[SettingsKey];
+            }
+        }
+
+        string INotificationMethod.Alias
+        {
+            get { return Alias; }
+        }
+
+        bool INotificationMethod.Enabled
+        {
+            get { return Enabled; }
+        }
+
+        HealthCheckNotificationVerbosity INotificationMethod.Verbosity
+        {
+            get { return Verbosity; }
+        }
+
+        bool INotificationMethod.FailureOnly
+        {
+            get { return FailureOnly; }
+        }
+
+        IReadOnlyDictionary<string, INotificationMethodSettings> INotificationMethod.Settings
+        {
+            get { return Settings; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/NotificationMethodSettingsElement.cs

@@ -0,0 +1,28 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    public class NotificationMethodSettingsElement : ConfigurationElement, INotificationMethodSettings
+    {
+        private const string KeyKey = "key";
+        private const string ValueKey = "value";
+
+        [ConfigurationProperty(KeyKey, IsKey = true, IsRequired = true)]
+        public string Key 
+        {
+            get
+            {
+                return (string)base[KeyKey];
+            }
+        }
+
+        [ConfigurationProperty(ValueKey, IsRequired = true)]
+        public string Value
+        {
+            get
+            {
+                return (string)base[ValueKey];
+            }
+        }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/NotificationMethodSettingsElementCollection.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    [ConfigurationCollection(typeof(NotificationMethodSettingsElement), AddItemName = "add")]
+    public class NotificationMethodSettingsElementCollection : ConfigurationElementCollection, IEnumerable<INotificationMethodSettings>, IReadOnlyDictionary<string, INotificationMethodSettings>
+    {
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new NotificationMethodSettingsElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((NotificationMethodSettingsElement)(element)).Key;
+        }        
+
+        IEnumerator<KeyValuePair<string, INotificationMethodSettings>> IEnumerable<KeyValuePair<string, INotificationMethodSettings>>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                var val = (NotificationMethodSettingsElement)BaseGet(i);
+                var key = (string)BaseGetKey(i);
+                yield return new KeyValuePair<string, INotificationMethodSettings>(key, val);
+            }
+        }
+
+        IEnumerator<INotificationMethodSettings> IEnumerable<INotificationMethodSettings>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return (NotificationMethodSettingsElement)BaseGet(i);
+            }
+        }
+
+        bool IReadOnlyDictionary<string, INotificationMethodSettings>.ContainsKey(string key)
+        {
+            return ((IReadOnlyDictionary<string, INotificationMethodSettings>)this).Keys.Any(x => x == key);
+        }
+
+        bool IReadOnlyDictionary<string, INotificationMethodSettings>.TryGetValue(string key, out INotificationMethodSettings value)
+        {
+            try
+            {
+                var val = (NotificationMethodSettingsElement)BaseGet(key);
+                value = val;
+                return true;
+            }
+            catch (Exception)
+            {
+                value = null;
+                return false;
+            }
+        }
+
+        INotificationMethodSettings IReadOnlyDictionary<string, INotificationMethodSettings>.this[string key]
+        {
+            get { return (NotificationMethodSettingsElement)BaseGet(key); }
+        }
+
+        IEnumerable<string> IReadOnlyDictionary<string, INotificationMethodSettings>.Keys
+        {
+            get { return BaseGetAllKeys().Cast<string>(); }
+        }
+
+        IEnumerable<INotificationMethodSettings> IReadOnlyDictionary<string, INotificationMethodSettings>.Values
+        {
+            get
+            {
+                for (var i = 0; i < Count; i++)
+                {
+                    yield return (NotificationMethodSettingsElement)BaseGet(i);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Configuration/HealthChecks/NotificationMethodsElementCollection.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+
+namespace Umbraco.Core.Configuration.HealthChecks
+{
+    [ConfigurationCollection(typeof(NotificationMethodElement), AddItemName = "notificationMethod")]
+    public class NotificationMethodsElementCollection : ConfigurationElementCollection, IEnumerable<INotificationMethod>, IReadOnlyDictionary<string, INotificationMethod>
+    {
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new NotificationMethodElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((NotificationMethodElement)(element)).Alias;
+        }
+        
+        IEnumerator<KeyValuePair<string, INotificationMethod>> IEnumerable<KeyValuePair<string, INotificationMethod>>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                var val = (NotificationMethodElement)BaseGet(i);
+                var key = (string)BaseGetKey(i);
+                yield return new KeyValuePair<string, INotificationMethod>(key, val);
+            }
+        }
+
+        IEnumerator<INotificationMethod> IEnumerable<INotificationMethod>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return (NotificationMethodElement)BaseGet(i);
+            }
+        }
+
+        bool IReadOnlyDictionary<string, INotificationMethod>.ContainsKey(string key)
+        {
+            return ((IReadOnlyDictionary<string, INotificationMethod>) this).Keys.Any(x => x == key);
+        }
+
+        bool IReadOnlyDictionary<string, INotificationMethod>.TryGetValue(string key, out INotificationMethod value)
+        {
+            try
+            {
+                var val = (NotificationMethodElement)BaseGet(key);
+                value = val;
+                return true;
+            }
+            catch (Exception)
+            {
+                value = null;
+                return false;
+            }
+        }
+
+        INotificationMethod IReadOnlyDictionary<string, INotificationMethod>.this[string key]
+        {
+            get { return (NotificationMethodElement)BaseGet(key); }
+        }
+
+        IEnumerable<string> IReadOnlyDictionary<string, INotificationMethod>.Keys
+        {
+            get { return BaseGetAllKeys().Cast<string>(); }
+        }
+
+        IEnumerable<INotificationMethod> IReadOnlyDictionary<string, INotificationMethod>.Values
+        {
+            get
+            {
+                for (var i = 0; i < Count; i++)
+                {
+                    yield return (NotificationMethodElement)BaseGet(i);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Configuration/UmbracoConfig.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration.BaseRest;
 using Umbraco.Core.Configuration.Dashboard;
 using Umbraco.Core.Configuration.Grid;
+using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 
@@ -52,6 +53,12 @@ namespace Umbraco.Core.Configuration
                 var dashboardConfig = ConfigurationManager.GetSection("umbracoConfiguration/dashBoard") as IDashboardSection;                
                 SetDashboardSettings(dashboardConfig);
             }
+
+            if (_healthChecks == null)
+            {
+                var healthCheckConfig = ConfigurationManager.GetSection("umbracoConfiguration/HealthChecks") as IHealthChecks;
+                SetHealthCheckSettings(healthCheckConfig);
+            }
         }
 
         /// <summary>
@@ -60,18 +67,36 @@ namespace Umbraco.Core.Configuration
         /// <param name="umbracoSettings"></param>
         /// <param name="baseRestSettings"></param>
         /// <param name="dashboardSettings"></param>
-        public UmbracoConfig(IUmbracoSettingsSection umbracoSettings, IBaseRestSection baseRestSettings, IDashboardSection dashboardSettings)
+        /// <param name="healthChecks"></param>
+        public UmbracoConfig(IUmbracoSettingsSection umbracoSettings, IBaseRestSection baseRestSettings, IDashboardSection dashboardSettings, IHealthChecks healthChecks)
         {
+            SetHealthCheckSettings(healthChecks);
             SetUmbracoSettings(umbracoSettings);
             SetBaseRestExtensions(baseRestSettings);
             SetDashboardSettings(dashboardSettings);
         }
 
+        private IHealthChecks _healthChecks;
         private IDashboardSection _dashboardSection;
         private IUmbracoSettingsSection _umbracoSettings;
         private IBaseRestSection _baseRestExtensions;
         private IGridConfig _gridConfig;
 
+        /// <summary>
+        /// Gets the IHealthCheck config
+        /// </summary>
+        public IHealthChecks HealthCheck()
+        {
+            if (_healthChecks == null)
+            {
+                var ex = new ConfigurationErrorsException("Could not load the " + typeof(IHealthChecks) + " from config file, ensure the web.config and healthchecks.config files are formatted correctly");
+                LogHelper.Error<UmbracoConfig>("Config error", ex);
+                throw ex;
+            }
+
+            return _healthChecks;
+        }
+
         /// <summary>
         /// Gets the IDashboardSection
         /// </summary>
@@ -86,14 +111,23 @@ namespace Umbraco.Core.Configuration
 
             return _dashboardSection;
         }        
+        
+        /// <summary>
+        /// Only for testing
+        /// </summary>
+        /// <param name="value"></param>
+        public void SetDashboardSettings(IDashboardSection value)
+        {
+            _dashboardSection = value;
+        }
 
         /// <summary>
         /// Only for testing
         /// </summary>
         /// <param name="value"></param>
-        internal void SetDashboardSettings(IDashboardSection value)
+        public void SetHealthCheckSettings(IHealthChecks value)
         {
-            _dashboardSection = value;
+            _healthChecks = value;
         }
 
         /// <summary>

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

@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This is no longer used and will be removed in future versions")]
     internal class HelpElement : ConfigurationElement, IHelpSection
     {
         [ConfigurationProperty("defaultUrl", DefaultValue = "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}")]

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

@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
-{
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This is no longer used and will be removed in future versions")]
     public interface IHelpSection : IUmbracoConfigurationSection
     {
         string DefaultUrl { get; }

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

@@ -1,5 +1,10 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
 {
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This is no longer used and will be removed in future versions")]
     public interface ILink
     {
         string Application { get; }

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

@@ -1,4 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
     {
@@ -24,6 +27,8 @@
 
         IProvidersSection Providers { get; }
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("This is no longer used and will be removed in future versions")]
         IHelpSection Help { get; }
 
         IWebRoutingSection WebRouting { get; }

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

@@ -1,7 +1,11 @@
-using System.Configuration;
+using System;
+using System.ComponentModel;
+using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This is no longer used and will be removed in future versions")]
     internal class LinkElement : ConfigurationElement, ILink
     {
         [ConfigurationProperty("application")]

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

@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This is no longer used and will be removed in future versions")]
     internal class LinksCollection : ConfigurationElementCollection, IEnumerable<ILink>
     {
         protected override ConfigurationElement CreateNewElement()

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

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Configuration;
 using System.Linq;
 
@@ -183,6 +184,8 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return Providers; }
         }
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("This is no longer used and will be removed in future versions")]
         IHelpSection IUmbracoSettingsSection.Help
         {
             get { return Help; }

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

src/Umbraco.Core/Constants-Applications.cs

@@ -56,7 +56,12 @@
             /// <summary>
             /// alias for the content tree.
             /// </summary>
-            public const string Content = "content";
+            public const string Content = "content";
+
+            /// <summary>
+            /// alias for the content blueprint tree.
+            /// </summary>
+            public const string ContentBlueprints = "contentBlueprints";
 
             /// <summary>
             /// alias for the member tree.
@@ -118,6 +123,8 @@
 
             public const string Scripts = "scripts";
 
+            public const string Users = "users";
+
             //TODO: Fill in the rest!
         }
     }

src/Umbraco.Core/Constants-Conventions.cs

@@ -12,6 +12,14 @@ namespace Umbraco.Core
 		/// </summary>
 		public static class Conventions
 		{
+		    internal static class PermissionCategories
+		    {
+		        public const string ContentCategory = "content";
+		        public const string AdministrationCategory = "administration";
+		        public const string StructureCategory = "structure";
+		        public const string OtherCategory = "other";
+		    }
+
 		    public static class PublicAccess
 		    {
                 public const string MemberUsernameRuleType = "MemberUsername";               

src/Umbraco.Core/Constants-ObjectTypes.cs

@@ -68,12 +68,22 @@ namespace Umbraco.Core
             /// Guid for a Document object.
             /// </summary>
             public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
-
+            
             /// <summary>
             /// Guid for a Document object.
             /// </summary>
             public static readonly Guid DocumentGuid = new Guid(Document);
 
+            /// <summary>
+            /// Guid for a Document Blueprint object.
+            /// </summary>
+            public const string DocumentBlueprint = "6EBEF410-03AA-48CF-A792-E1C1CB087ACA";
+
+            /// <summary>
+            /// Guid for a Document object.
+            /// </summary>
+            public static readonly Guid DocumentBlueprintGuid = new Guid(DocumentBlueprint);
+
             /// <summary>
             /// Guid for a Document Type object.
             /// </summary>
@@ -222,16 +232,6 @@ namespace Umbraco.Core
             /// Guid for a Forms DataSource.
             /// </summary>
             public static readonly Guid LanguageGuid = new Guid(Language);
-
-            /// <summary>
-            /// Guid for an Identifier Reservation.
-            /// </summary>
-            public const string IdReservation = "92849B1E-3904-4713-9356-F646F87C25F4";
-
-            /// <summary>
-            /// Guid for an Identifier Reservation.
-            /// </summary>
-            public static readonly Guid IdReservationGuid = new Guid(IdReservation);
         }
     }
 }

src/Umbraco.Core/Constants-PropertyEditors.cs

@@ -437,6 +437,11 @@ namespace Umbraco.Core
             /// </summary>
             public const string EmailAddressAlias = "Umbraco.EmailAddress";
 
+            /// <summary>
+            /// Alias for the nested content property editor.
+            /// </summary>
+            public const string NestedContentAlias = "Umbraco.NestedContent";
+
             public static class PreValueKeys
             {
                 /// <summary>

src/Umbraco.Core/Constants-Security.cs

@@ -8,6 +8,8 @@ namespace Umbraco.Core
         public static class Security
         {
 
+            public const string AdminGroupAlias = "admin";
+            
             public const string BackOfficeAuthenticationType = "UmbracoBackOffice";
             public const string BackOfficeExternalAuthenticationType = "UmbracoExternalCookie";
             public const string BackOfficeExternalCookieName = "UMB_EXTLOGIN";
@@ -15,6 +17,7 @@ namespace Umbraco.Core
             public const string BackOfficeTwoFactorAuthenticationType = "UmbracoTwoFactorCookie";
 
             internal const string EmptyPasswordPrefix = "___UIDEMPTYPWORD__";
+            internal const string ForceReAuthFlag = "umbraco-force-auth";
 
             /// <summary>
             /// The prefix used for external identity providers for their authentication type

src/Umbraco.Core/CoreBootManager.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Web;
 using AutoMapper;
@@ -400,28 +399,6 @@ namespace Umbraco.Core
             if (ApplicationContext.IsConfigured == false) return;
             if (ApplicationContext.DatabaseContext.IsDatabaseConfigured == false) return;
 
-            // deal with localdb
-            var databaseContext = ApplicationContext.DatabaseContext;
-            var localdbex = new Regex(@"\(localdb\)\\([a-zA-Z0-9-_]+)(;|$)");
-            var m = localdbex.Match(databaseContext.ConnectionString);
-            if (m.Success)
-            {
-                var instanceName = m.Groups[1].Value;
-                ProfilingLogger.Logger.Info<CoreBootManager>(string.Format("LocalDb instance \"{0}\"", instanceName));
-
-                var localDb = new LocalDb();
-                if (localDb.IsAvailable == false)
-                    throw new UmbracoStartupFailedException("Umbraco cannot start. LocalDb is not available.");
-
-                if (localDb.InstanceExists(m.Groups[1].Value) == false)
-                {
-                    if (localDb.CreateInstance(instanceName) == false)
-                        throw new UmbracoStartupFailedException(string.Format("Umbraco cannot start. LocalDb cannot create instance \"{0}\".", instanceName));
-                    if (localDb.StartInstance(instanceName) == false)
-                        throw new UmbracoStartupFailedException(string.Format("Umbraco cannot start. LocalDb cannot start instance \"{0}\".", instanceName));
-                }
-            }
-
             //try now
             if (ApplicationContext.DatabaseContext.CanConnect)
                 return;

src/Umbraco.Core/DateTimeExtensions.cs

@@ -41,7 +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 
+        /// 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);
         }
-
     }
 }

src/Umbraco.Core/Deploy/IDeployContext.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
 
 namespace Umbraco.Core.Deploy
 {
@@ -39,10 +38,5 @@ namespace Umbraco.Core.Deploy
         /// <param name="key">The key of the item.</param>
         /// <returns>The item with the specified key and type, if any, else null.</returns>
         T Item<T>(string key) where T : class;
-
-        ///// <summary>
-        ///// Gets the global deployment cancellation token.
-        ///// </summary>
-        //CancellationToken CancellationToken { get; }
     }
 }

src/Umbraco.Core/EnumerableExtensions.cs

@@ -111,6 +111,9 @@ namespace Umbraco.Core
         /// <returns></returns>
         public static bool ContainsAll<TSource>(this IEnumerable<TSource> source, IEnumerable<TSource> other)
         {
+            if (source == null) throw new ArgumentNullException("source");
+            if (other == null) throw new ArgumentNullException("other");
+
             return other.Except(source).Any() == false;
         }
 
@@ -295,16 +298,5 @@ namespace Umbraco.Core
             return list1Groups.Count == list2Groups.Count
                && list1Groups.All(g => g.Count() == list2Groups[g.Key].Count());
         }
-
-        public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source)
-        {
-            using (var e = source.GetEnumerator())
-            {
-                if (e.MoveNext() == false) yield break;
-
-                for (var value = e.Current; e.MoveNext(); value = e.Current)
-                    yield return value;
-            }
-        }
     }
 }

src/Umbraco.Core/Events/CancellableEventArgs.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Security.Permissions;
+using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core.Events
 {
@@ -12,9 +13,6 @@ namespace Umbraco.Core.Events
 	public class CancellableEventArgs : EventArgs, IEquatable<CancellableEventArgs>
     {
 		private bool _cancel;
-        private Dictionary<string, object> _eventState;
-
-        private static readonly ReadOnlyDictionary<string, object> EmptyAdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
 
         public CancellableEventArgs(bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
         {
@@ -28,7 +26,7 @@ namespace Umbraco.Core.Events
             if (eventMessages == null) throw new ArgumentNullException("eventMessages");
             CanCancel = canCancel;
             Messages = eventMessages;
-            AdditionalData = EmptyAdditionalData;
+            AdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
         }
 
         public CancellableEventArgs(bool canCancel)
@@ -36,16 +34,18 @@ namespace Umbraco.Core.Events
 			CanCancel = canCancel;
             //create a standalone messages
             Messages = new EventMessages();
-		    AdditionalData = EmptyAdditionalData;
+            AdditionalData = new ReadOnlyDictionary<string, object>(new Dictionary<string, object>());
         }
 
         public CancellableEventArgs(EventMessages eventMessages)
             : this(true, eventMessages)
-        { }
+        {
+        }
 
         public CancellableEventArgs()
 			: this(true)
-		{ }
+		{
+		}
 
 		/// <summary>
 		/// Flag to determine if this instance will support being cancellable
@@ -95,19 +95,10 @@ namespace Umbraco.Core.Events
         /// In some cases raised evens might need to contain additional arbitrary readonly data which can be read by event subscribers
         /// </summary>
         /// <remarks>
-        /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility
+        /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility 
         /// so we cannot change the strongly typed nature for some events.
         /// </remarks>
         public ReadOnlyDictionary<string, object> AdditionalData { get; private set; }
-
-        /// <summary>
-        /// This can be used by event subscribers to store state in the event args so they easily deal with custom state data between a starting ("ing")
-        /// event and an ending ("ed") event
-        /// </summary>
-        public IDictionary<string, object> EventState
-        {
-            get { return _eventState ?? (_eventState = new Dictionary<string, object>()); }
-        }
 
 	    public bool Equals(CancellableEventArgs other)
 	    {
@@ -120,13 +111,13 @@ namespace Umbraco.Core.Events
 	    {
 	        if (ReferenceEquals(null, obj)) return false;
 	        if (ReferenceEquals(this, obj)) return true;
-	        if (obj.GetType() != GetType()) return false;
+	        if (obj.GetType() != this.GetType()) return false;
 	        return Equals((CancellableEventArgs) obj);
 	    }
 
 	    public override int GetHashCode()
 	    {
-	        return AdditionalData != null ? AdditionalData.GetHashCode() : 0;
+	        return (AdditionalData != null ? AdditionalData.GetHashCode() : 0);
 	    }
 
 	    public static bool operator ==(CancellableEventArgs left, CancellableEventArgs right)
@@ -136,7 +127,7 @@ namespace Umbraco.Core.Events
 
 	    public static bool operator !=(CancellableEventArgs left, CancellableEventArgs right)
 	    {
-	        return Equals(left, right) == false;
+	        return !Equals(left, right);
 	    }
 	}
 }

src/Umbraco.Core/Events/DeleteEventArgs.cs

@@ -99,8 +99,7 @@ namespace Umbraco.Core.Events
 		/// </summary>
 		public IEnumerable<TEntity> DeletedEntities
 		{
-			get { return EventObject; }
-            internal set { EventObject = value; }
+			get { return EventObject; }
 		}
 
         /// <summary>

src/Umbraco.Core/Events/MoveEventArgs.cs

@@ -6,8 +6,6 @@ namespace Umbraco.Core.Events
 {
     public class MoveEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>, IEquatable<MoveEventArgs<TEntity>>
     {
-        private IEnumerable<MoveEventInfo<TEntity>> _moveInfoCollection;
-
         /// <summary>
         /// Constructor accepting a collection of MoveEventInfo objects
         /// </summary>
@@ -109,24 +107,7 @@ namespace Umbraco.Core.Events
         /// <summary>
         /// Gets all MoveEventInfo objects used to create the object
         /// </summary>
-        public IEnumerable<MoveEventInfo<TEntity>> MoveInfoCollection
-        {
-            get { return _moveInfoCollection; }
-            set
-            {
-                var first = value.FirstOrDefault();
-                if (first == null)
-                {
-                    throw new InvalidOperationException("MoveInfoCollection must have at least one item");
-                }
-
-                _moveInfoCollection = value;                
-
-                //assign the legacy props                
-                EventObject = first.Entity;
-                ParentId = first.NewParentId;                
-            }
-        }
+        public IEnumerable<MoveEventInfo<TEntity>> MoveInfoCollection { get; private set; }
 
         /// <summary>
         /// The entity being moved

src/Umbraco.Core/Events/RecycleBinEventArgs.cs

@@ -107,7 +107,7 @@ namespace Umbraco.Core.Events
         /// <summary>
         /// Boolean indicating whether the Recycle Bin was emptied successfully
         /// </summary>
-        public bool RecycleBinEmptiedSuccessfully { get; set; }
+        public bool RecycleBinEmptiedSuccessfully { get; private set; }
 
         /// <summary>
         /// Boolean indicating whether this event was fired for the Content's Recycle Bin.

src/Umbraco.Core/ExpressionHelper.cs

@@ -217,8 +217,21 @@ namespace Umbraco.Core
 		public static MemberInfo GetMemberInfo<T, TReturn>(Expression<Func<T, TReturn>> fromExpression)
 		{
 			if (fromExpression == null) return null;
-			var body = fromExpression.Body as MemberExpression;
-			return body != null ? body.Member : null;
+
+		    MemberExpression me;
+		    switch (fromExpression.Body.NodeType)
+		    {
+		        case ExpressionType.Convert:
+		        case ExpressionType.ConvertChecked:
+		            var ue = fromExpression.Body as UnaryExpression;
+		            me = ((ue != null) ? ue.Operand : null) as MemberExpression;
+		            break;
+		        default:
+		            me = fromExpression.Body as MemberExpression;
+		            break;
+		    }
+
+		    return me != null ? me.Member : null;
 		}
 
 		/// <summary>

src/Umbraco.Core/GuidUdi.cs

@@ -32,11 +32,7 @@ namespace Umbraco.Core
         public GuidUdi(Uri uriValue)
             : base(uriValue)
         {
-            Guid guid;
-            if (Guid.TryParse(uriValue.AbsolutePath.TrimStart('/'), out guid) == false)
-                throw new FormatException("Url \"" + uriValue + "\" is not a guid entity id.");
-
-            Guid = guid;
+            Guid = Guid.Parse(uriValue.AbsolutePath.TrimStart('/'));
         }
 
         /// <summary>
@@ -47,17 +43,16 @@ namespace Umbraco.Core
         public new static GuidUdi Parse(string s)
         {
             var udi = Udi.Parse(s);
-            if (udi is GuidUdi == false)
+            if (!(udi is GuidUdi))
                 throw new FormatException("String \"" + s + "\" is not a guid entity id.");
-
-            return (GuidUdi) udi;
+            return (GuidUdi)udi;
         }
 
         public static bool TryParse(string s, out GuidUdi udi)
         {
             Udi tmp;
             udi = null;
-            if (TryParse(s, out tmp) == false) return false;
+            if (!TryParse(s, out tmp)) return false;
             udi = tmp as GuidUdi;
             return udi != null;
         }
@@ -80,9 +75,10 @@ namespace Umbraco.Core
             get { return Guid == Guid.Empty; }
         }
 
+        /// <inheritdoc/>
         public GuidUdi EnsureClosed()
         {
-            EnsureNotRoot();
+            base.EnsureNotRoot();
             return this;
         }
     }

src/Umbraco.Core/HashCodeCombiner.cs

@@ -2,19 +2,17 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
 
 namespace Umbraco.Core
 {
     /// <summary>
-    /// Used to create a .NET HashCode from multiple objects.
+    /// Used to create a hash code from multiple objects.
     /// </summary>
     /// <remarks>
     /// .Net has a class the same as this: System.Web.Util.HashCodeCombiner and of course it works for all sorts of things
     /// which we've not included here as we just need a quick easy class for this in order to create a unique
     /// hash of directories/files to see if they have changed.
-    /// 
-    /// NOTE: It's probably best to not relying on the hashing result across AppDomains! If you need a constant/reliable hash value
-    /// between AppDomains use SHA1. This is perfect for hashing things in a very fast way for a single AppDomain.
     /// </remarks>
     internal class HashCodeCombiner
     {

src/Umbraco.Core/HashGenerator.cs

@@ -1,154 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Used to generate a string hash using crypto libraries over multiple objects
-    /// </summary>
-    /// <remarks>
-    /// This should be used to generate a reliable hash that survives AppDomain restarts. 
-    /// This will use the crypto libs to generate the hash and will try to ensure that 
-    /// strings, etc... are not re-allocated so it's not consuming much memory.
-    /// </remarks>
-    internal class HashGenerator : DisposableObject
-    {
-        public HashGenerator()
-        {
-            _writer = new StreamWriter(_ms, Encoding.Unicode, 1024, leaveOpen: true);
-        }
-
-        private readonly MemoryStream _ms = new MemoryStream();
-        private StreamWriter _writer;
-
-        internal void AddInt(int i)
-        {
-            _writer.Write(i);
-        }
-
-        internal void AddLong(long i)
-        {
-            _writer.Write(i);
-        }
-
-        internal void AddObject(object o)
-        {
-            _writer.Write(o);
-        }
-
-        internal void AddDateTime(DateTime d)
-        {
-            _writer.Write(d.Ticks);;
-        }
-
-        internal void AddString(string s)
-        {
-            if (s != null)
-                _writer.Write(s);
-        }
-
-        internal void AddCaseInsensitiveString(string s)
-        {
-            //I've tried to no allocate a new string with this which can be done if we use the CompareInfo.GetSortKey method which will create a new
-            //byte array that we can use to write to the output, however this also allocates new objects so i really don't think the performance
-            //would be much different. In any case, i'll leave this here for reference. We could write the bytes out based on the sort key,
-            //this is how we could deal with case insensitivity without allocating another string
-            //for reference see: https://stackoverflow.com/a/10452967/694494
-            //we could go a step further and s.Normalize() but we're not really dealing with crazy unicode with this class so far.
-
-            if (s != null)
-                _writer.Write(s.ToUpperInvariant());            
-        }
-
-        internal void AddFileSystemItem(FileSystemInfo f)
-        {
-            //if it doesn't exist, don't proceed.
-            if (f.Exists == false)
-                return;
-
-            AddCaseInsensitiveString(f.FullName);
-            AddDateTime(f.CreationTimeUtc);
-            AddDateTime(f.LastWriteTimeUtc);
-
-            //check if it is a file or folder 
-            var fileInfo = f as FileInfo;
-            if (fileInfo != null)
-            {
-                AddLong(fileInfo.Length);
-            }
-
-            var dirInfo = f as DirectoryInfo;
-            if (dirInfo != null)
-            {
-                foreach (var d in dirInfo.GetFiles())
-                {
-                    AddFile(d);
-                }
-                foreach (var s in dirInfo.GetDirectories())
-                {
-                    AddFolder(s);
-                }
-            }
-        }
-
-        internal void AddFile(FileInfo f)
-        {
-            AddFileSystemItem(f);
-        }
-
-        internal void AddFolder(DirectoryInfo d)
-        {
-            AddFileSystemItem(d);
-        }
-
-        /// <summary>
-        /// Returns the generated hash output of all added objects
-        /// </summary>
-        /// <returns></returns>
-        internal string GenerateHash()
-        {
-            //flush,close,dispose the writer,then create a new one since it's possible to keep adding after GenerateHash is called.
-
-            _writer.Flush();
-            _writer.Close();
-            _writer.Dispose();
-            _writer = new StreamWriter(_ms, Encoding.UTF8, 1024, leaveOpen: true);
-
-            var hashType = CryptoConfig.AllowOnlyFipsAlgorithms ? "SHA1" : "MD5";
-
-            //create an instance of the correct hashing provider based on the type passed in
-            var hasher = HashAlgorithm.Create(hashType);
-            if (hasher == null) throw new InvalidOperationException("No hashing type found by name " + hashType);
-            using (hasher)
-            {
-                var buffer = _ms.GetBuffer();
-                //get the hashed values created by our selected provider
-                var hashedByteArray = hasher.ComputeHash(buffer);
-
-                //create a StringBuilder object
-                var stringBuilder = new StringBuilder();
-
-                //loop to each each byte
-                foreach (var b in hashedByteArray)
-                {
-                    //append it to our StringBuilder
-                    stringBuilder.Append(b.ToString("x2"));
-                }
-
-                //return the hashed value
-                return stringBuilder.ToString();
-            }
-        }
-
-        protected override void DisposeResources()
-        {
-            _writer.Close();
-            _writer.Dispose();
-            _ms.Close();
-            _ms.Dispose();
-        }
-    }
-}

src/Umbraco.Core/Models/Content.cs

@@ -20,7 +20,7 @@ namespace Umbraco.Core.Models
         private DateTime? _expireDate;
         private int _writer;
         private string _nodeName;//NOTE Once localization is introduced this will be the non-localized Node Name.
-        private bool _permissionsChanged;
+
         /// <summary>
         /// Constructor for creating a Content object
         /// </summary>
@@ -29,7 +29,7 @@ namespace Umbraco.Core.Models
         /// <param name="contentType">ContentType for the current Content object</param>
         public Content(string name, IContent parent, IContentType contentType)
 			: this(name, parent, contentType, new PropertyCollection())
-		{			
+		{
 		}
 
         /// <summary>
@@ -65,7 +65,7 @@ namespace Umbraco.Core.Models
         /// <param name="parentId">Id of the Parent content</param>
         /// <param name="contentType">ContentType for the current Content object</param>
         /// <param name="properties">Collection of properties</param>
-        public Content(string name, int parentId, IContentType contentType, PropertyCollection properties) 
+        public Content(string name, int parentId, IContentType contentType, PropertyCollection properties)
 			: base(name, parentId, contentType, properties)
         {
             Mandate.ParameterNotNull(contentType, "contentType");
@@ -84,7 +84,6 @@ namespace Umbraco.Core.Models
             public readonly PropertyInfo ExpireDateSelector = ExpressionHelper.GetPropertyInfo<Content, DateTime?>(x => x.ExpireDate);
             public readonly PropertyInfo WriterSelector = ExpressionHelper.GetPropertyInfo<Content, int>(x => x.WriterId);
             public readonly PropertyInfo NodeNameSelector = ExpressionHelper.GetPropertyInfo<Content, string>(x => x.NodeName);
-            public readonly PropertyInfo PermissionsChangedSelector = ExpressionHelper.GetPropertyInfo<Content, bool>(x => x.PermissionsChanged);
         }
 
         /// <summary>
@@ -92,7 +91,7 @@ namespace Umbraco.Core.Models
         /// This is used to override the default one from the ContentType.
         /// </summary>
         /// <remarks>
-        /// If no template is explicitly set on the Content object, 
+        /// If no template is explicitly set on the Content object,
         /// the Default template from the ContentType will be returned.
         /// </remarks>
         [DataMember]
@@ -194,15 +193,6 @@ namespace Umbraco.Core.Models
             set { SetPropertyValueAndDetectChanges(value, ref _nodeName, Ps.Value.NodeNameSelector); }
         }
 
-        /// <summary>
-        /// Used internally to track if permissions have been changed during the saving process for this entity
-        /// </summary>
-        [IgnoreDataMember]
-        internal bool PermissionsChanged
-        {
-            get { return _permissionsChanged; }
-            set { SetPropertyValueAndDetectChanges(value, ref _permissionsChanged, Ps.Value.PermissionsChangedSelector); }
-        }
 
         /// <summary>
         /// Gets the ContentType used by this content object
@@ -274,6 +264,9 @@ namespace Umbraco.Core.Models
         [IgnoreDataMember]
         internal DateTime PublishedDate { get; set; }
 
+        [DataMember]
+        public bool IsBlueprint { get; internal set; }
+
         /// <summary>
         /// Changes the Trashed state of the content object
         /// </summary>
@@ -290,7 +283,7 @@ namespace Umbraco.Core.Models
                 ChangePublishedState(PublishedState.Unpublished);
             }
         }
-        
+
         /// <summary>
         /// Method to call when Entity is being updated
         /// </summary>

src/Umbraco.Core/Models/ContentBase.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
@@ -277,10 +278,10 @@ namespace Umbraco.Core.Models
             if (Properties.Contains(propertyTypeAlias) == false)
             {
                 return default(TPassType);
-            }
+            }
 
             var convertAttempt = Properties[propertyTypeAlias].Value.TryConvertTo<TPassType>();
-            return convertAttempt.Success ? convertAttempt.Result : default(TPassType);
+            return convertAttempt.Success ? convertAttempt.Result : default(TPassType);
         }
 
         /// <summary>

src/Umbraco.Core/Models/ContentType.cs

@@ -54,6 +54,11 @@ namespace Umbraco.Core.Models
         {
             public readonly PropertyInfo DefaultTemplateSelector = ExpressionHelper.GetPropertyInfo<ContentType, int>(x => x.DefaultTemplateId);
             public readonly PropertyInfo AllowedTemplatesSelector = ExpressionHelper.GetPropertyInfo<ContentType, IEnumerable<ITemplate>>(x => x.AllowedTemplates);
+
+            //Custom comparer for enumerable
+            public readonly DelegateEqualityComparer<IEnumerable<ITemplate>> TemplateComparer = new DelegateEqualityComparer<IEnumerable<ITemplate>>(
+                (templates, enumerable) => templates.UnsortedSequenceEqual(enumerable),
+                templates => templates.GetHashCode());
         }
 
         /// <summary>
@@ -91,10 +96,7 @@ namespace Umbraco.Core.Models
             set
             {
                 SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector,
-                    //Custom comparer for enumerable
-                    new DelegateEqualityComparer<IEnumerable<ITemplate>>(
-                        (templates, enumerable) => templates.UnsortedSequenceEqual(enumerable),
-                        templates => templates.GetHashCode()));
+                   Ps.Value.TemplateComparer);
             }
         }
 

src/Umbraco.Core/Models/ContentTypeBase.cs

@@ -88,6 +88,12 @@ namespace Umbraco.Core.Models
             public readonly PropertyInfo PropertyGroupCollectionSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, PropertyGroupCollection>(x => x.PropertyGroups);
             public readonly PropertyInfo PropertyTypeCollectionSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, IEnumerable<PropertyType>>(x => x.PropertyTypes);
             public readonly PropertyInfo HasPropertyTypeBeenRemovedSelector = ExpressionHelper.GetPropertyInfo<ContentTypeBase, bool>(x => x.HasPropertyTypeBeenRemoved);
+
+            //Custom comparer for enumerable
+            public readonly DelegateEqualityComparer<IEnumerable<ContentTypeSort>> ContentTypeSortComparer =
+                new DelegateEqualityComparer<IEnumerable<ContentTypeSort>>(
+                    (sorts, enumerable) => sorts.UnsortedSequenceEqual(enumerable),
+                    sorts => sorts.GetHashCode());
         }
 
 
@@ -254,7 +260,7 @@ namespace Umbraco.Core.Models
             set { SetPropertyValueAndDetectChanges(value, ref _trashed, Ps.Value.TrashedSelector); }
         }
 
-        private IDictionary<string, object> _additionalData;
+        private readonly IDictionary<string, object> _additionalData;
         /// <summary>
         /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
         /// </summary>
@@ -273,11 +279,8 @@ namespace Umbraco.Core.Models
             get { return _allowedContentTypes; }
             set
             {
-                SetPropertyValueAndDetectChanges(value, ref _allowedContentTypes, Ps.Value.AllowedContentTypesSelector,
-                    //Custom comparer for enumerable
-                    new DelegateEqualityComparer<IEnumerable<ContentTypeSort>>(
-                        (sorts, enumerable) => sorts.UnsortedSequenceEqual(enumerable),
-                        sorts => sorts.GetHashCode()));                
+                SetPropertyValueAndDetectChanges(value, ref _allowedContentTypes, Ps.Value.AllowedContentTypesSelector, 
+                    Ps.Value.ContentTypeSortComparer);                
             }
         }
 

src/Umbraco.Core/Models/DictionaryItem.cs

@@ -37,6 +37,12 @@ namespace Umbraco.Core.Models
             public readonly PropertyInfo ParentIdSelector = ExpressionHelper.GetPropertyInfo<DictionaryItem, Guid?>(x => x.ParentId);
             public readonly PropertyInfo ItemKeySelector = ExpressionHelper.GetPropertyInfo<DictionaryItem, string>(x => x.ItemKey);
             public readonly PropertyInfo TranslationsSelector = ExpressionHelper.GetPropertyInfo<DictionaryItem, IEnumerable<IDictionaryTranslation>>(x => x.Translations);
+
+            //Custom comparer for enumerable
+            public readonly DelegateEqualityComparer<IEnumerable<IDictionaryTranslation>> DictionaryTranslationComparer =
+                new DelegateEqualityComparer<IEnumerable<IDictionaryTranslation>>(
+                    (enumerable, translations) => enumerable.UnsortedSequenceEqual(translations),
+                    enumerable => enumerable.GetHashCode());
         }
 
         /// <summary>
@@ -79,10 +85,7 @@ namespace Umbraco.Core.Models
                 }
 
                 SetPropertyValueAndDetectChanges(asArray, ref _translations, Ps.Value.TranslationsSelector,
-                    //Custom comparer for enumerable
-                    new DelegateEqualityComparer<IEnumerable<IDictionaryTranslation>>(
-                        (enumerable, translations) => enumerable.UnsortedSequenceEqual(translations),
-                        enumerable => enumerable.GetHashCode()));                
+                    Ps.Value.DictionaryTranslationComparer);                
             }
         }
     }

src/Umbraco.Core/Models/EntityBase/Entity.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Reflection;
 using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text;
 
 namespace Umbraco.Core.Models.EntityBase
 {
@@ -99,7 +102,7 @@ namespace Umbraco.Core.Models.EntityBase
         }
 
         [IgnoreDataMember]
-        public DateTime? DeletedDate { get; set; }
+        public DateTime? DeletedDate { get; set; }
 
         internal virtual void ResetIdentity()
         {
@@ -116,7 +119,7 @@ namespace Umbraco.Core.Models.EntityBase
             if (IsPropertyDirty("CreateDate") == false || _createDate == default(DateTime))
                 CreateDate = DateTime.Now;
             if (IsPropertyDirty("UpdateDate") == false || _updateDate == default(DateTime))
-                UpdateDate = CreateDate;
+                UpdateDate = DateTime.Now;
         }
 
         /// <summary>
@@ -126,6 +129,10 @@ namespace Umbraco.Core.Models.EntityBase
         {
             if (IsPropertyDirty("UpdateDate") == false || _updateDate == default(DateTime))
                 UpdateDate = DateTime.Now;
+
+            //this is just in case
+            if (_createDate == default(DateTime))
+                CreateDate = DateTime.Now;
         }
 
         /// <summary>

src/Umbraco.Core/Models/EntityBase/EntityPath.cs

@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Models.EntityBase
+{
+    public class EntityPath
+    {
+        public int Id { get; set; }
+        public string Path { get; set; }
+    }
+}

src/Umbraco.Core/Models/IContent.cs

@@ -1,7 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models
 {
@@ -85,5 +83,10 @@ namespace Umbraco.Core.Models
         /// Gets the unique identifier of the published version, if any.
         /// </summary>
         Guid PublishedVersionGuid { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the content item is a blueprint.
+        /// </summary>
+        bool IsBlueprint { get; }
     }
 }

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

@@ -2,23 +2,69 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Linq;
+using System.Reflection;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Identity;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Security;
 
 namespace Umbraco.Core.Models.Identity
 {
-    public class BackOfficeIdentityUser : IdentityUser<int, IIdentityUserLogin, IdentityUserRole<string>, IdentityUserClaim<int>>
+    public class BackOfficeIdentityUser : IdentityUser<int, IIdentityUserLogin, IdentityUserRole<string>, IdentityUserClaim<int>>, IRememberBeingDirty
     {
-
-        public BackOfficeIdentityUser()
+        /// <summary>
+        ///  Used to construct a new instance without an identity
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="email">This is allowed to be null (but would need to be filled in if trying to persist this instance)</param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        public static BackOfficeIdentityUser CreateNew(string username, string email, string culture)
         {
-            StartMediaId = -1;
-            StartContentId = -1;
-            Culture = Configuration.GlobalSettings.DefaultUILanguage;
+            if (string.IsNullOrWhiteSpace(username)) throw new ArgumentException("Value cannot be null or whitespace.", "username");
+            if (string.IsNullOrWhiteSpace(culture)) throw new ArgumentException("Value cannot be null or whitespace.", "culture");
+
+            var user = new BackOfficeIdentityUser();
+            user.DisableChangeTracking();
+            user._userName = username;
+            user._email = email;
+            //we are setting minvalue here because the default is "0" which is the id of the admin user
+            //which we cannot allow because the admin user will always exist
+            user._id = int.MinValue;
+            user._hasIdentity = false;
+            user._culture = culture;
+            user.EnableChangeTracking();
+            return user;
         }
 
+        private BackOfficeIdentityUser()
+        {
+        }
+
+        /// <summary>
+        /// Creates an existing user with the specified groups
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="groups"></param>
+        public BackOfficeIdentityUser(int userId, IEnumerable<IReadOnlyUserGroup> groups)
+        {
+            _startMediaIds = new int[] { };
+            _startContentIds = new int[] { };
+            _groups = new IReadOnlyUserGroup[] { };
+            _allowedSections = new string[] { };
+            _culture = Configuration.GlobalSettings.DefaultUILanguage;
+            _groups = groups.ToArray();
+            _roles = new ObservableCollection<IdentityUserRole<string>>(_groups.Select(x => new IdentityUserRole<string>
+            {
+                RoleId = x.Alias,
+                UserId = userId.ToString()
+            }));
+            _roles.CollectionChanged += _roles_CollectionChanged;
+        }        
+
         public virtual async Task<ClaimsIdentity> GenerateUserIdentityAsync(BackOfficeUserManager<BackOfficeIdentityUser> manager)
         {
             // NOTE the authenticationType must match the umbraco one
@@ -27,16 +73,155 @@ namespace Umbraco.Core.Models.Identity
             return userIdentity;
         }
 
+        /// <summary>
+        /// Returns true if an Id has been set on this object this will be false if the object is new and not peristed to the database
+        /// </summary>
+        public bool HasIdentity
+        {
+            get { return _hasIdentity; }
+        }
+
+        public int[] CalculatedMediaStartNodeIds { get; internal set; }
+        public int[] CalculatedContentStartNodeIds { get; internal set; }
+
+        public override int Id
+        {
+            get { return _id; }
+            set
+            {
+                _id = value;
+                _hasIdentity = true;
+            }
+        }
+
+        /// <summary>
+        /// Override Email so we can track changes to it
+        /// </summary>
+        public override string Email
+        {
+            get { return _email; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _email, Ps.Value.EmailSelector); }
+        }
+
+        /// <summary>
+        /// Override UserName so we can track changes to it
+        /// </summary>
+        public override string UserName
+        {
+            get { return _userName; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _userName, Ps.Value.UserNameSelector); }
+        }
+
+        /// <summary>
+        /// Override LastLoginDateUtc so we can track changes to it
+        /// </summary>
+        public override DateTime? LastLoginDateUtc
+        {
+            get { return _lastLoginDateUtc; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _lastLoginDateUtc, Ps.Value.LastLoginDateUtcSelector); }            
+        }
+
+        /// <summary>
+        /// Override EmailConfirmed so we can track changes to it
+        /// </summary>
+        public override bool EmailConfirmed
+        {
+            get { return _emailConfirmed; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _emailConfirmed, Ps.Value.EmailConfirmedSelector); }            
+        }
+
         /// <summary>
         /// Gets/sets the user's real name
         /// </summary>
-        public string Name { get; set; }
-        public int StartContentId { get; set; }
-        public int StartMediaId { get; set; }
-        public string[] AllowedSections { get; set; }
-        public string Culture { get; set; }
+        public string Name
+        {
+            get { return _name; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _name, Ps.Value.NameSelector); }            
+        }
 
-        public string UserTypeAlias { get; set; }
+        /// <summary>
+        /// Override AccessFailedCount so we can track changes to it
+        /// </summary>
+        public override int AccessFailedCount
+        {
+            get { return _accessFailedCount; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _accessFailedCount, Ps.Value.AccessFailedCountSelector); }
+        }
+
+        /// <summary>
+        /// Override PasswordHash so we can track changes to it
+        /// </summary>
+        public override string PasswordHash
+        {
+            get { return _passwordHash; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _passwordHash, Ps.Value.PasswordHashSelector); }
+        }
+
+
+        /// <summary>
+        /// Content start nodes assigned to the User (not ones assigned to the user's groups)
+        /// </summary>
+        public int[] StartContentIds
+        {
+            get { return _startContentIds; }
+            set
+            {
+                if (value == null) value = new int[0];
+                _tracker.SetPropertyValueAndDetectChanges(value, ref _startContentIds, Ps.Value.StartContentIdsSelector, Ps.Value.StartIdsComparer);
+            }
+        }
+
+        /// <summary>
+        /// Media start nodes assigned to the User (not ones assigned to the user's groups)
+        /// </summary>
+        public int[] StartMediaIds
+        {
+            get { return _startMediaIds; }
+            set
+            {
+                if (value == null) value = new int[0];
+                _tracker.SetPropertyValueAndDetectChanges(value, ref _startMediaIds, Ps.Value.StartMediaIdsSelector, Ps.Value.StartIdsComparer);
+            }
+        }
+
+        /// <summary>
+        /// This is a readonly list of the user's allowed sections which are based on it's user groups
+        /// </summary>        
+        public string[] AllowedSections
+        {
+            get { return _allowedSections ?? (_allowedSections = _groups.SelectMany(x => x.AllowedSections).Distinct().ToArray()); }
+        }
+
+        public string Culture
+        {
+            get { return _culture; }
+            set { _tracker.SetPropertyValueAndDetectChanges(value, ref _culture, Ps.Value.CultureSelector); }
+        }
+
+        public IReadOnlyUserGroup[] Groups
+        {
+            get { return _groups; }
+            set
+            {
+                //so they recalculate
+                _allowedSections = null;
+
+                //now clear all roles and re-add them
+                _roles.CollectionChanged -= _roles_CollectionChanged;
+                _roles.Clear();
+                foreach (var identityUserRole in _groups.Select(x => new IdentityUserRole<string>
+                {
+                    RoleId = x.Alias,
+                    UserId = Id.ToString()
+                }))
+                {
+                    _roles.Add(identityUserRole);
+                }
+                _roles.CollectionChanged += _roles_CollectionChanged;
+
+                _tracker.SetPropertyValueAndDetectChanges(value, ref _groups, Ps.Value.GroupsSelector, Ps.Value.GroupsComparer);
+            }
+        }
 
         /// <summary>
         /// Lockout is always enabled
@@ -44,7 +229,7 @@ namespace Umbraco.Core.Models.Identity
         public override bool LockoutEnabled
         {
             get { return true; }
-            set 
+            set
             {
                 //do nothing 
             }
@@ -82,16 +267,42 @@ namespace Umbraco.Core.Models.Identity
                 return _logins;
             }
         }
-
-        public bool LoginsChanged { get; private set; }
-
+        
         void Logins_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            LoginsChanged = true;
+            _tracker.OnPropertyChanged(Ps.Value.LoginsSelector);
         }
 
-        private ObservableCollection<IIdentityUserLogin> _logins;
-        private Lazy<IEnumerable<IIdentityUserLogin>> _getLogins;
+        private void _roles_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            _tracker.OnPropertyChanged(Ps.Value.RolesSelector);
+        }
+
+        private readonly ObservableCollection<IdentityUserRole<string>> _roles;
+
+        /// <summary>
+        /// helper method to easily add a role without having to deal with IdentityUserRole{T}
+        /// </summary>
+        /// <param name="role"></param>
+        /// <remarks>
+        /// Adding a role this way will not reflect on the user's group's collection or it's allowed sections until the user is persisted
+        /// </remarks>
+        public void AddRole(string role)
+        {
+            Roles.Add(new IdentityUserRole<string>
+            {
+                UserId = this.Id.ToString(),
+                RoleId = role
+            });
+        }
+
+        /// <summary>
+        /// Override Roles because the value of these are the user's group aliases
+        /// </summary>
+        public override ICollection<IdentityUserRole<string>> Roles
+        {
+            get { return _roles; }
+        }
 
         /// <summary>
         /// Used to set a lazy call back to populate the user's Login list
@@ -101,6 +312,128 @@ namespace Umbraco.Core.Models.Identity
         {
             if (callback == null) throw new ArgumentNullException("callback");
             _getLogins = callback;
+        }        
+
+        #region Change tracking
+
+        public void DisableChangeTracking()
+        {
+            _tracker.DisableChangeTracking();
         }
+
+        public void EnableChangeTracking()
+        {
+            _tracker.EnableChangeTracking();
+        }
+
+        /// <summary>
+        /// Since this class only has change tracking turned on for Email/Username this will return true if either of those have changed
+        /// </summary>
+        /// <returns></returns>
+        public bool IsDirty()
+        {
+            return _tracker.IsDirty();
+        }
+
+        /// <summary>
+        /// Returns true if the specified property is dirty
+        /// </summary>
+        /// <param name="propName"></param>
+        /// <returns></returns>
+        public bool IsPropertyDirty(string propName)
+        {
+            return _tracker.IsPropertyDirty(propName);
+        }
+
+        /// <summary>
+        /// Resets dirty properties
+        /// </summary>
+        void ICanBeDirty.ResetDirtyProperties()
+        {
+            _tracker.ResetDirtyProperties();
+        }
+
+        bool IRememberBeingDirty.WasDirty()
+        {
+            return _tracker.WasDirty();
+        }
+
+        bool IRememberBeingDirty.WasPropertyDirty(string propertyName)
+        {
+            return _tracker.WasPropertyDirty(propertyName);
+        }
+
+        void IRememberBeingDirty.ForgetPreviouslyDirtyProperties()
+        {
+            _tracker.ForgetPreviouslyDirtyProperties();
+        }
+
+        public void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        {
+            _tracker.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+        }
+
+        private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
+        private class PropertySelectors
+        {
+            public readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.Email);
+            public readonly PropertyInfo UserNameSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.UserName);
+            public readonly PropertyInfo LastLoginDateUtcSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, DateTime?>(x => x.LastLoginDateUtc);
+            public readonly PropertyInfo EmailConfirmedSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, bool>(x => x.EmailConfirmed);
+            public readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.Name);
+            public readonly PropertyInfo AccessFailedCountSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, int>(x => x.AccessFailedCount);
+            public readonly PropertyInfo PasswordHashSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.PasswordHash);
+            public readonly PropertyInfo CultureSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, string>(x => x.Culture);
+            public readonly PropertyInfo StartMediaIdsSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, int[]>(x => x.StartMediaIds);
+            public readonly PropertyInfo StartContentIdsSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, int[]>(x => x.StartContentIds);
+            public readonly PropertyInfo GroupsSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, IReadOnlyUserGroup[]>(x => x.Groups);
+            public readonly PropertyInfo LoginsSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, IEnumerable<IIdentityUserLogin>>(x => x.Logins);
+            public readonly PropertyInfo RolesSelector = ExpressionHelper.GetPropertyInfo<BackOfficeIdentityUser, IEnumerable<IdentityUserRole<string>>>(x => x.Roles);
+
+            //Custom comparer for enumerables
+            public readonly DelegateEqualityComparer<IReadOnlyUserGroup[]> GroupsComparer = new DelegateEqualityComparer<IReadOnlyUserGroup[]>(
+                (groups, enumerable) => groups.Select(x => x.Alias).UnsortedSequenceEqual(enumerable.Select(x => x.Alias)),
+                groups => groups.GetHashCode());
+            public readonly DelegateEqualityComparer<int[]> StartIdsComparer = new DelegateEqualityComparer<int[]>(
+                (groups, enumerable) => groups.UnsortedSequenceEqual(enumerable),
+                groups => groups.GetHashCode());
+
+        }
+
+        private readonly ChangeTracker _tracker = new ChangeTracker();
+        private string _email;
+        private string _userName;
+        private int _id;
+        private bool _hasIdentity = false;
+        private DateTime? _lastLoginDateUtc;
+        private bool _emailConfirmed;
+        private string _name;
+        private int _accessFailedCount;
+        private string _passwordHash;
+        private string _culture;
+        private ObservableCollection<IIdentityUserLogin> _logins;
+        private Lazy<IEnumerable<IIdentityUserLogin>> _getLogins;
+        private IReadOnlyUserGroup[] _groups;
+        private string[] _allowedSections;
+        private int[] _startMediaIds;
+        private int[] _startContentIds;
+
+        /// <summary>
+        /// internal class used to track changes for properties that have it enabled
+        /// </summary>        
+        private class ChangeTracker : TracksChangesEntityBase
+        {
+            /// <summary>
+            /// Make this public so that it's usable
+            /// </summary>
+            /// <param name="propertyInfo"></param>
+            public new void OnPropertyChanged(PropertyInfo propertyInfo)
+            {
+                base.OnPropertyChanged(propertyInfo);
+            }
+        } 
+        #endregion
+
+
     }
 }

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

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using AutoMapper;
-
+using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Security;
@@ -13,28 +13,42 @@ namespace Umbraco.Core.Models.Identity
         public override void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext)
         {
             config.CreateMap<IUser, BackOfficeIdentityUser>()
+                .BeforeMap((user, identityUser) =>
+                {
+                    identityUser.DisableChangeTracking();
+                })
+                .ConstructUsing(user => new BackOfficeIdentityUser(user.Id, user.Groups))
                 .ForMember(user => user.LastLoginDateUtc, expression => expression.MapFrom(user => user.LastLoginDate.ToUniversalTime()))
                 .ForMember(user => user.Email, expression => expression.MapFrom(user => user.Email))
+                .ForMember(user => user.EmailConfirmed, expression => expression.MapFrom(user => user.EmailConfirmedDate.HasValue))
                 .ForMember(user => user.Id, expression => expression.MapFrom(user => user.Id))
                 .ForMember(user => user.LockoutEndDateUtc, expression => expression.MapFrom(user => user.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?)null))                
                 .ForMember(user => user.UserName, expression => expression.MapFrom(user => user.Username))
                 .ForMember(user => user.PasswordHash, expression => expression.MapFrom(user => GetPasswordHash(user.RawPasswordValue)))
                 .ForMember(user => user.Culture, expression => expression.MapFrom(user => user.GetUserCulture(applicationContext.Services.TextService)))
                 .ForMember(user => user.Name, expression => expression.MapFrom(user => user.Name))
-                .ForMember(user => user.StartMediaId, expression => expression.MapFrom(user => user.StartMediaId))
-                .ForMember(user => user.StartContentId, expression => expression.MapFrom(user => user.StartContentId))
-                .ForMember(user => user.UserTypeAlias, expression => expression.MapFrom(user => user.UserType.Alias))
+                .ForMember(user => user.StartMediaIds, expression => expression.MapFrom(user => user.StartMediaIds))
+                .ForMember(user => user.StartContentIds, expression => expression.MapFrom(user => user.StartContentIds))
                 .ForMember(user => user.AccessFailedCount, expression => expression.MapFrom(user => user.FailedPasswordAttempts))
-                .ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()));
-
+                .ForMember(user => user.CalculatedContentStartNodeIds, expression => expression.MapFrom(user => user.CalculateContentStartNodeIds(applicationContext.Services.EntityService)))
+                .ForMember(user => user.CalculatedMediaStartNodeIds, expression => expression.MapFrom(user => user.CalculateMediaStartNodeIds(applicationContext.Services.EntityService)))
+                .ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()))
+                .AfterMap((user, identityUser) =>
+                {
+                    identityUser.ResetDirtyProperties(true);
+                    identityUser.EnableChangeTracking();
+                });
+            
             config.CreateMap<BackOfficeIdentityUser, UserData>()
                 .ConstructUsing((BackOfficeIdentityUser user) => new UserData(Guid.NewGuid().ToString("N"))) //this is the 'session id'
                 .ForMember(detail => detail.Id, opt => opt.MapFrom(user => user.Id))
                 .ForMember(detail => detail.AllowedApplications, opt => opt.MapFrom(user => user.AllowedSections))
+                .ForMember(detail => detail.Roles, opt => opt.MapFrom(user => user.Roles.Select(x => x.RoleId).ToArray()))
                 .ForMember(detail => detail.RealName, opt => opt.MapFrom(user => user.Name))
-                .ForMember(detail => detail.Roles, opt => opt.MapFrom(user => new[] { user.UserTypeAlias }))
-                .ForMember(detail => detail.StartContentNode, opt => opt.MapFrom(user => user.StartContentId))
-                .ForMember(detail => detail.StartMediaNode, opt => opt.MapFrom(user => user.StartMediaId))
+                //When mapping to UserData which is used in the authcookie we want ALL start nodes including ones defined on the groups
+                .ForMember(detail => detail.StartContentNodes, opt => opt.MapFrom(user => user.CalculatedContentStartNodeIds))
+                //When mapping to UserData which is used in the authcookie we want ALL start nodes including ones defined on the groups
+                .ForMember(detail => detail.StartMediaNodes, opt => opt.MapFrom(user => user.CalculatedMediaStartNodeIds))
                 .ForMember(detail => detail.Username, opt => opt.MapFrom(user => user.UserName))
                 .ForMember(detail => detail.Culture, opt => opt.MapFrom(user => user.Culture))
                 .ForMember(detail => detail.SessionId, opt => opt.MapFrom(user => user.SecurityStamp.IsNullOrWhiteSpace() ? Guid.NewGuid().ToString("N") : user.SecurityStamp));

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

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models.Membership
+{
+    /// <summary>
+    /// Represents an <see cref="IContent"/> -> user group & permission key value pair collection
+    /// </summary>
+    /// <remarks>
+    /// This implements <see cref="IAggregateRoot"/> purely so it can be used with the repository layer which is why it's explicitly implemented.
+    /// </remarks>
+    public class ContentPermissionSet : EntityPermissionSet, IAggregateRoot
+    {
+        private readonly IContent _content;
+
+        public ContentPermissionSet(IContent content, EntityPermissionCollection permissionsSet)
+            : base(content.Id, permissionsSet)
+        {
+            _content = content;
+        }
+
+        public override int EntityId
+        {
+            get { return _content.Id; }
+        }
+
+        #region Explicit implementation of IAggregateRoot
+        int IEntity.Id
+        {
+            get { return EntityId; }
+            set { throw new NotImplementedException(); }
+        }
+
+        bool IEntity.HasIdentity
+        {
+            get { return EntityId > 0; }
+        }
+
+        Guid IEntity.Key { get; set; }
+
+        DateTime IEntity.CreateDate { get; set; }
+
+        DateTime IEntity.UpdateDate { get; set; }
+
+        DateTime? IDeletableEntity.DeletedDate { get; set; }
+
+        object IDeepCloneable.DeepClone()
+        {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+}

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

@@ -1,26 +1,66 @@
-using System.Collections;
+using System;
 
 namespace Umbraco.Core.Models.Membership
 {
     /// <summary>
-    /// Represents a user -> entity permission
+    /// Represents an entity permission (defined on the user group and derived to retrieve permissions for a given user)
     /// </summary>
-    public class EntityPermission
+    public class EntityPermission : IEquatable<EntityPermission>
     {
-        public EntityPermission(int userId, int entityId, string[] assignedPermissions)
+        public EntityPermission(int groupId, int entityId, string[] assignedPermissions)
         {
-            UserId = userId;
+            UserGroupId = groupId;
             EntityId = entityId;
             AssignedPermissions = assignedPermissions;
+            IsDefaultPermissions = false;
+        }
+
+        public EntityPermission(int groupId, int entityId, string[] assignedPermissions, bool isDefaultPermissions)
+        {
+            UserGroupId = groupId;
+            EntityId = entityId;
+            AssignedPermissions = assignedPermissions;
+            IsDefaultPermissions = isDefaultPermissions;
         }
 
-        public int UserId { get; private set; }
         public int EntityId { get; private set; }
+        public int UserGroupId { get; private set; }
 
         /// <summary>
         /// The assigned permissions for the user/entity combo
         /// </summary>
         public string[] AssignedPermissions { get; private set; }
+
+        /// <summary>
+        /// True if the permissions assigned to this object are the group's default permissions and not explicitly defined permissions
+        /// </summary>
+        /// <remarks>
+        /// This will be the case when looking up entity permissions and falling back to the default permissions
+        /// </remarks>
+        public bool IsDefaultPermissions { get; private set; }        
+
+        public bool Equals(EntityPermission other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return EntityId == other.EntityId && UserGroupId == other.UserGroupId;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((EntityPermission) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (EntityId * 397) ^ UserGroupId;
+            }
+        }
     }
 
 }

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

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Models.Membership
+{
+    /// <summary>
+    /// A <see cref="HashSet{T}"/> of <see cref="EntityPermission"/>
+    /// </summary>
+    public class EntityPermissionCollection : HashSet<EntityPermission>
+    {
+        public EntityPermissionCollection()
+        {
+        }
+
+        public EntityPermissionCollection(IEnumerable<EntityPermission> collection) : base(collection)
+        {
+        }
+
+        /// <summary>
+        /// Returns the aggregate permissions in the permission set
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// This value is only calculated once
+        /// </remarks>
+        public IEnumerable<string> GetAllPermissions()
+        {
+            return _aggregatePermissions ?? (_aggregatePermissions =
+                       this.SelectMany(x => x.AssignedPermissions).Distinct().ToArray());
+        }
+
+        private string[] _aggregatePermissions;
+    }
+}

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

@@ -1,59 +1,55 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Umbraco.Core.Models.Membership
 {
     /// <summary>
-    /// Represents an entity -> user & permission key value pair collection
-    /// </summary>
+    /// Represents an entity -> user group & permission key value pair collection
+    /// </summary>    
     public class EntityPermissionSet
     {
+        private static readonly Lazy<EntityPermissionSet> EmptyInstance = new Lazy<EntityPermissionSet>(() => new EntityPermissionSet(-1, new EntityPermissionCollection()));
+        /// <summary>
+        /// Returns an empty permission set
+        /// </summary>
+        /// <returns></returns>
+        public static EntityPermissionSet Empty()
+        {
+            return EmptyInstance.Value;
+        }
+
+        public EntityPermissionSet(int entityId, EntityPermissionCollection permissionsSet)
+        {
+            EntityId = entityId;
+            PermissionsSet = permissionsSet;
+        }
+
         /// <summary>
         /// The entity id with permissions assigned
         /// </summary>
-        public int EntityId { get; private set; }
+        public virtual int EntityId { get; private set; }
 
         /// <summary>
-        /// The key/value pairs of user id & single permission
+        /// The key/value pairs of user group id & single permission
         /// </summary>
-        public IEnumerable<UserPermission> UserPermissionsSet { get; private set; }
+        public EntityPermissionCollection PermissionsSet { get; private set; }
 
-        public EntityPermissionSet(int entityId, IEnumerable<UserPermission> userPermissionsSet)
+
+        /// <summary>
+        /// Returns the aggregate permissions in the permission set
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// This value is only calculated once
+        /// </remarks>
+        public IEnumerable<string> GetAllPermissions()
         {
-            EntityId = entityId;
-            UserPermissionsSet = userPermissionsSet;
+            return PermissionsSet.GetAllPermissions();
         }
 
-        public class UserPermission
-        {
-            public UserPermission(int userId, string permission)
-            {
-                UserId = userId;
-                Permission = permission;
-            }
 
-            public int UserId { get; private set; }
-            public string Permission { get; private set; }
 
-            protected bool Equals(UserPermission other)
-            {
-                return UserId == other.UserId && string.Equals(Permission, other.Permission);
-            }
 
-            public override bool Equals(object obj)
-            {
-                if (ReferenceEquals(null, obj)) return false;
-                if (ReferenceEquals(this, obj)) return true;
-                if (obj.GetType() != this.GetType()) return false;
-                return Equals((UserPermission) obj);
-            }
-
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    return (UserId*397) ^ Permission.GetHashCode();
-                }
-            }
-        }
     }
 }

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

@@ -1,15 +1,11 @@
 namespace Umbraco.Core.Models.Membership
 {
     /// <summary>
-    /// Defines the the Profile interface
-    /// </summary>
-    /// <remarks>
-    /// This interface is pretty useless but has been exposed publicly from 6.x so we're stuck with it. It would make more sense 
-    /// if the Id was an int but since it's not people have to cast it to int all of the time!
-    /// </remarks>
+    /// Defines the the User Profile interface
+    /// </summary>   
     public interface IProfile
     {
-        object Id { get; set; }
-        string Name { get; set; }
+        int Id { get; }
+        string Name { get; }
     }
 }

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

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.Membership
+{
+    /// <summary>
+    /// A readonly user group providing basic information
+    /// </summary>
+    public interface IReadOnlyUserGroup
+    {
+        string Name { get; }
+        string Icon { get; }
+        int Id { get; }
+        int? StartContentId { get; }
+        int? StartMediaId { get; }
+
+        /// <summary>
+        /// The alias
+        /// </summary>
+        string Alias { get; }
+
+        /// <summary>
+        /// The set of default permissions
+        /// </summary>
+        /// <remarks>
+        /// By default each permission is simply a single char but we've made this an enumerable{string} to support a more flexible permissions structure in the future.
+        /// </remarks>
+        IEnumerable<string> Permissions { get; set; }
+
+        IEnumerable<string> AllowedSections { get; }
+    }
+}

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

@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;
 
 namespace Umbraco.Core.Models.Membership
 {
@@ -10,29 +11,39 @@ namespace Umbraco.Core.Models.Membership
     /// <remarks>Will be left internal until a proper Membership implementation is part of the roadmap</remarks>
     public interface IUser : IMembershipUser, IRememberBeingDirty, ICanBeDirty
     {
+        UserState UserState { get; }
+
         string Name { get; set; }
         int SessionTimeout { get; set; }
-        int StartContentId { get; set; }
-        int StartMediaId { get; set; }
-        string Language { get; set; }
+        int[] StartContentIds { get; set; }
+        int[] StartMediaIds { get; set; }
+        string Language { get; set; }
+
+        [Obsolete("This should not be used it exists for legacy reasons only, use user groups instead, it will be removed in future versions")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        IUserType UserType { get; set; }
+
+        DateTime? EmailConfirmedDate { get; set; }
+        DateTime? InvitedDate { get; set; }
+
+        /// <summary>
+        /// Gets the groups that user is part of
+        /// </summary>
+        IEnumerable<IReadOnlyUserGroup> Groups { get; }        
+
+        void RemoveGroup(string group);
+        void ClearGroups();
+        void AddGroup(IReadOnlyUserGroup group);
         
-        /// <summary>
-        /// Gets/sets the user type for the user
-        /// </summary>
-        IUserType UserType { get; set; }
-
-        //TODO: This should be a private set 
-        /// <summary>
-        /// The default permission set for the user
-        /// </summary>
-        /// <remarks>
-        /// Currently in umbraco each permission is a single char but with an Enumerable{string} collection this allows for flexible changes to this in the future
-        /// </remarks>
-        IEnumerable<string> DefaultPermissions { get; set; }
-
         IEnumerable<string> AllowedSections { get; }
+
+        [Obsolete("This should not be used it exists for legacy reasons only, use user groups instead, it will be removed in future versions")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         void RemoveAllowedSection(string sectionAlias);
-        void AddAllowedSection(string sectionAlias);
+
+        [Obsolete("This should not be used it exists for legacy reasons only, use user groups instead, it will be removed in future versions")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        void AddAllowedSection(string sectionAlias);
 
         /// <summary>
         /// Exposes the basic profile data
@@ -43,5 +54,10 @@ namespace Umbraco.Core.Models.Membership
         /// The security stamp used by ASP.Net identity
         /// </summary>
         string SecurityStamp { get; set; }
+
+        /// <summary>
+        /// Will hold the media file system relative path of the users custom avatar if they uploaded one
+        /// </summary>
+        string Avatar { get; set; }
     }
 }

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

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models.Membership
+{
+    public interface IUserGroup : IAggregateRoot
+    {
+        string Alias { get; set; }
+
+        int? StartContentId { get; set; }
+        int? StartMediaId { get; set; }
+
+        /// <summary>
+        /// The icon
+        /// </summary>
+        string Icon { get; set; }
+        
+        /// <summary>
+        /// The name
+        /// </summary>
+        string Name { get; set; }
+
+        /// <summary>
+        /// The set of default permissions
+        /// </summary>
+        /// <remarks>
+        /// By default each permission is simply a single char but we've made this an enumerable{string} to support a more flexible permissions structure in the future.
+        /// </remarks>
+        IEnumerable<string> Permissions { get; set; }
+
+        IEnumerable<string> AllowedSections { get; }
+
+        void RemoveAllowedSection(string sectionAlias);
+
+        void AddAllowedSection(string sectionAlias);
+
+        void ClearAllowedSections();
+
+        /// <summary>
+        /// Specifies the number of users assigned to this group
+        /// </summary>
+        int UserCount { get; }
+    }
+}

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

@@ -1,28 +1,17 @@
-using System.Collections.Generic;
-using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;
-
-namespace Umbraco.Core.Models.Membership
-{
-
-    public interface IUserType : IAggregateRoot
-    {
-        /// <summary>
-        /// The user type alias
-        /// </summary>
-        string Alias { get; set; }
-
-        /// <summary>
-        /// The user type name
-        /// </summary>
-        string Name { get; set; }
-
-        /// <summary>
-        /// The set of default permissions for the user type
-        /// </summary>
-        /// <remarks>
-        /// By default each permission is simply a single char but we've made this an enumerable{string} to support a more flexible permissions structure in the future.
-        /// </remarks>
-        IEnumerable<string> Permissions { get; set; }
-    }
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models.Membership
+{
+    [Obsolete("This should not be used it exists for legacy reasons only, use user groups instead, it will be removed in future versions")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public interface IUserType : IAggregateRoot
+    {
+        string Alias { get; set; }
+        string Name { get; set; }        
+        IEnumerable<string> Permissions { get; set; }
+
+    }
 }

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

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Models.Membership
+{
+    public class ReadOnlyUserGroup : IReadOnlyUserGroup, IEquatable<ReadOnlyUserGroup>
+    {
+        public ReadOnlyUserGroup(int id, string name, string icon, int? startContentId, int? startMediaId, string @alias, 
+            IEnumerable<string> allowedSections, IEnumerable<string> permissions)
+        {
+            Name = name;
+            Icon = icon;
+            Id = id;
+            Alias = alias;
+            AllowedSections = allowedSections.ToArray();
+            Permissions = permissions.ToArray();
+
+            //Zero is invalid and will be treated as Null
+            StartContentId = startContentId == 0 ? null : startContentId;
+            StartMediaId = startMediaId == 0 ? null : startMediaId;
+        }
+
+        public int Id { get; private set; }
+        public string Name { get; private set; }
+        public string Icon { get; private set; }
+        public int? StartContentId { get; private set; }
+        public int? StartMediaId { get; private set; }
+        public string Alias { get; private set; }
+
+        /// <summary>
+        /// The set of default permissions
+        /// </summary>
+        /// <remarks>
+        /// By default each permission is simply a single char but we've made this an enumerable{string} to support a more flexible permissions structure in the future.
+        /// </remarks>
+        public IEnumerable<string> Permissions { get; set; }
+        public IEnumerable<string> AllowedSections { get; private set; }
+
+        public bool Equals(ReadOnlyUserGroup other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+            return string.Equals(Alias, other.Alias);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((ReadOnlyUserGroup) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Alias.GetHashCode();
+        }
+
+        public static bool operator ==(ReadOnlyUserGroup left, ReadOnlyUserGroup right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(ReadOnlyUserGroup left, ReadOnlyUserGroup right)
+        {
+            return !Equals(left, right);
+        }
+    }
+}

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

@@ -34,12 +34,11 @@ namespace Umbraco.Core.Models.Membership
         /// <param name="lastLockoutDate">The last lockout date.</param>
         /// <param name="fullName">The full name.</param>
         /// <param name="language">The language.</param>
-        /// <param name="userType">Type of the user.</param>
         /// <param name="user"></param>
         public UmbracoMembershipUser(string providerName, string name, object providerUserKey, string email, 
             string passwordQuestion, string comment, bool isApproved, bool isLockedOut, 
             DateTime creationDate, DateTime lastLoginDate, DateTime lastActivityDate, DateTime lastPasswordChangedDate,
-            DateTime lastLockoutDate, string fullName, string language, IUserType userType, T user) 
+            DateTime lastLockoutDate, string fullName, string language, T user) 
             : base( providerName, name, providerUserKey, email, passwordQuestion, comment, isApproved, isLockedOut, 
                 creationDate, lastLoginDate, lastActivityDate, lastPasswordChangedDate, lastLockoutDate)
         {