Merge branch 'temp-U4-7220' into dev-v7

Merge branch 'dev-v7' into temp-U4-7220
Fixed a few more split separators.
2015-12-01 10:35:38 +01:00 · 2015-12-01 09:57:44 +01:00 · 2015-11-30 19:29:23 +01:00 · 2015-11-30 19:18:57 +01:00 · 2015-11-30 18:13:51 +01:00 · 2015-11-27 21:23:24 +01:00
1892 changed files with 60361 additions and 66610 deletions
@@ -76,6 +76,7 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js

@@ -129,3 +130,5 @@ src/*.boltdata/
 /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
@@ -1,9 +1,9 @@
-# The MIT License (MIT) #
-
-Copyright (c) 2013 Umbraco
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# The MIT License (MIT) #
+
+Copyright (c) 2013 Umbraco
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -7,9 +7,9 @@ The easiest way to get started is to run `build/build.bat` which will build both
 
 If you're interested in making changes to Belle 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/umbraco%207.0.0/) so you don't have to build the code yourself.

-## Watch a five minute introduction video ##
+## Watch a introduction video ##

-[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](http://umbraco.org/help-and-support/video-tutorials/getting-started/what-is-umbraco)
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)

 ## Umbraco - the simple, flexible and friendly ASP.NET CMS ##

@@ -23,14 +23,15 @@ ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %rel

 ECHO Installing the Microsoft.Bcl.Build package before anything else, otherwise you'd have to run build.cmd twice
 SET nuGetFolder=%CD%\..\src\packages\
-..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore
+..\src\.nuget\NuGet.exe sources Remove -Name MyGetUmbracoCore >NUL
 ..\src\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
-..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder%
-..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder%
-..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder%
+..\src\.nuget\NuGet.exe install ..\src\Umbraco.Web.UI\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe install ..\src\umbraco.businesslogic\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet
+..\src\.nuget\NuGet.exe install ..\src\Umbraco.Core\packages.config -OutputDirectory %nuGetFolder% -Verbosity quiet

-ECHO Removing the belle build folder to make sure everything is clean as a whistle
+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 Removing existing built files to make sure everything is clean as a whistle
 RMDIR /Q /S _BuildOutput
@@ -42,23 +43,23 @@ DEL /F /Q webpihash.txt
 ECHO Making sure Git is in the path so that the build can succeed
 CALL InstallGit.cmd
 ECHO Performing MSBuild and producing Umbraco binaries zip files
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment% /verbosity:minimal

 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

 ECHO Adding Web.config transform files to the NuGet package
-REN .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Xslt\Web.config Web.config.transform

 ECHO Packing the NuGet release files
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoCms.nuspec -Version %version%
-..\src\.nuget\NuGet.exe Pack NuSpecs\UmbracoExamine.PDF.nuspec
+..\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 :showerror

+ECHO No errors were detected but you still may see some in the output, then it's time to investigate.
+ECHO You might see some warnings but that is completely normal.
 GOTO :EOF

 :showerror
@@ -1,4 +1,3 @@
-
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <!-- 
@@ -14,18 +13,18 @@

  <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">
+
+  <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" />
+      <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 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)
@@ -48,11 +47,11 @@
                    }
                }
            ]]>
-        </Code>
+      </Code>
    </Task>
- </UsingTask>
+  </UsingTask>
+

- 
  <!-- 
 ****************************************************
 VARIABLES 
@@ -69,6 +68,12 @@
  <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>
@@ -76,35 +81,24 @@
    <BuildZipFileName>UmbracoCms$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileName>
    <BuildZipFileNameBin>UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameBin>
    <BuildZipFileNameWebPi>UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip</BuildZipFileNameWebPi>
-    <BuildZipExaminePDFName>UmbracoExamine.PDF.0.6.0.zip</BuildZipExaminePDFName>
    <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>
+    <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>
-    <ExaminePDFPath>$(BuildFolderAbsolutePath)UmbracoExamine.PDF\</ExaminePDFPath>
-    <ExamineAzurePath>$(BuildFolderAbsolutePath)UmbracoExamine.Azure\</ExamineAzurePath>
-    <ExaminePDFAzurePath>$(BuildFolderAbsolutePath)UmbracoExamine.PDF.Azure\</ExaminePDFAzurePath>
  </PropertyGroup>

  <ItemGroup>
-    <SystemFolders Include="$(WebAppFolder)App_Plugins" />
-    <SystemFolders Include="$(WebAppFolder)App_Code" />
    <SystemFolders Include="$(WebAppFolder)App_Data" />
    <SystemFolders Include="$(WebAppFolder)Media" />
-    <SystemFolders Include="$(WebAppFolder)Masterpages" />
-    <SystemFolders Include="$(WebAppFolder)Scripts" />
-    <SystemFolders Include="$(WebAppFolder)Css" />
-    <SystemFolders Include="$(WebAppFolder)Xslt" />
-    <SystemFolders Include="$(WebAppFolder)UserControls" />
    <SystemFolders Include="$(WebAppFolder)Views" />
  </ItemGroup>

@@ -114,16 +108,16 @@
 *****************************************************
 -->

- <Target Name="Build" DependsOnTargets="GenerateWebPiHash">
+  <Target Name="Build" DependsOnTargets="GenerateWebPiHash">
    <Message Text="Build finished" />
- </Target>
- 
- <Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
-   <ItemGroup>
+  </Target>
+
+  <Target Name="GenerateWebPiHash" DependsOnTargets="ZipWebPiApp">
+    <ItemGroup>
      <WebPiFile Include="$(BuildZipFileNameWebPi)" />
-   </ItemGroup>
-   <Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
-   <GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
+    </ItemGroup>
+    <Message Text="Calculating hash for $(BuildZipFileNameWebPi)" />
+    <GenerateHash InputFiles="@(WebPiFile)" OutputFile="webpihash.txt" />
  </Target>

  <Target Name="CleanUp" DependsOnTargets="ZipWebPiApp">
@@ -150,26 +144,18 @@
        DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />

    <!-- Zip the files -->
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
+    <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="ZipUmbracoExaminePDF" >
+  <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" />
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22 -x!dotLess.Core.dll" />
+    <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="ZipUmbracoExaminePDF" DependsOnTargets="CreateSystemFolders" >
-    <Message Text="Starting to zip to $(buildDate)-$(BuildZipExaminePDFName)" Importance="high" />
-
-    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipExaminePDFName)%22 %22$(ExaminePDFPath)*%22" />
-
-    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipExaminePDFName)" Importance="high" />
-  </Target>
-
  <Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
    <MakeDir Directories="@(SystemFolders)" />
  </Target>
@@ -177,14 +163,14 @@
  <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" />
+    </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>
@@ -217,7 +203,7 @@
  </Target>

  <!-- Copy the transformed web.config file to the root -->
- <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
+  <Target Name="CopyTransformedWebConfig"  DependsOnTargets="CopyTransformedConfig">
    <ItemGroup>
      <WebConfigFile Include="..\src\Umbraco.Web.UI\web.$(BuildConfiguration).Config.transformed" />
    </ItemGroup>
@@ -226,24 +212,30 @@
        DestinationFiles="$(WebAppFolder)Web.config"
        OverwriteReadOnlyFiles="true"
        SkipUnchangedFiles="false" />
- </Target>
- 
- <!-- Copy the config files and rename them to *.config.transform -->
- <Target Name="CopyTransformedConfig"  DependsOnTargets="CopyXmlDocumentation">
+  </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" />
-	 <WebConfigTransformFile Include="$(WebAppFolder)Web.config" />
-   </ItemGroup>
-   
-   <Copy SourceFiles="@(ConfigFiles)"
-       DestinationFiles="@(ConfigFiles->'$(ConfigsFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
-       OverwriteReadOnlyFiles="true"
-       SkipUnchangedFiles="false" />
-	   
-   <Copy SourceFiles="@(WebConfigTransformFile)"
-	   DestinationFiles="$(ConfigsFolder)Web.config.transform"
-	   OverwriteReadOnlyFiles="true"
-	   SkipUnchangedFiles="false" />
+      <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 -->
@@ -261,78 +253,95 @@

  <!-- 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>
+      <PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
    </ItemGroup>
-	<RemoveDir Directories="@(PresentationFolderToDelete)" />
+    <RemoveDir Directories="@(PresentationFolderToDelete)" />
  </Target>

-  <Target Name="CompileProjects" DependsOnTargets="CompileExternalExamineProjects">
-    
+  <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)" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+    <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">
    </MSBuild>
-    
+
    <!-- DONE -->
    <Message Text="Finished compiling projects" Importance="high" />
  </Target>

-  <Target Name="CompileExternalExamineProjects" DependsOnTargets="SetVersionNumber">
-    <Message Text="Building externally shipped examine projects" Importance="high" />
-
-    <!-- First remove old files from the examine builds -->
-    <ItemGroup>
-      <FilesToDeleteBeforeBuild Include="$(ExaminePDFPath)*;$(ExamineAzurePath)*"/>
-    </ItemGroup>
-    <Delete Files="@(FilesToDeleteBeforeBuild)" />
-    <!-- 
-      Build the UmbracoExamine.PDF.Azure library ... this builds the 3 projects that we want to bundle separately so no need to build each one separately .
-      We'll just build this one and then manually copy the DLLs to where we want them.
-    -->
-    <MSBuild Projects="..\src\UmbracoExamine.PDF.Azure\UmbracoExamine.PDF.Azure.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);PipelineDependsOnBuild=False;OutDir=$(ExaminePDFAzurePath);" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
-    </MSBuild>
-    <ItemGroup>
-      <ExaminePDFFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.pdf;$(ExaminePDFAzurePath)**\UmbracoExamine.PDF.xml;$(ExaminePDFAzurePath)**\itextsharp.dll" />
-      <ExamineAzureFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.pdb;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.xml" />
-      <ExaminePDFAzureFiles Include="$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.dll;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.pdb;$(ExaminePDFAzurePath)**\UmbracoExamine.Azure.PDF.xml" />
-    </ItemGroup>
-    <!-- Now copy the built files to their correct deployment folders-->
-    <Copy SourceFiles="@(ExaminePDFFiles)"
-        DestinationFolder="$(ExaminePDFPath)"
-        OverwriteReadOnlyFiles="true"
-        SkipUnchangedFiles="false" />
-    <Copy SourceFiles="@(ExamineAzureFiles)"
-        DestinationFolder="$(ExamineAzurePath)"
-        OverwriteReadOnlyFiles="true"
-        SkipUnchangedFiles="false" />
-    <!-- Then just delete the files we don't want to ship in the UmbracoExamine.Azure.PDF folder -->
-    <ItemGroup>
-      <FilesToDeleteAfterBuild Include="$(ExaminePDFAzurePath)*" Exclude="$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.dll;$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.pdb;$(ExaminePDFAzurePath)UmbracoExamine.PDF.Azure.xml"/>
-    </ItemGroup>
-    <Delete Files="@(FilesToDeleteAfterBuild)" />
-  </Target>
-
+    
  <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
-	<PropertyGroup>
-		<NewVersion>$(BUILD_RELEASE)</NewVersion>
-		<NewVersion Condition="'$(BUILD_COMMENT)'!=''">$(BUILD_RELEASE)-$(BUILD_COMMENT)</NewVersion>
-	</PropertyGroup>
-	
-	<!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
+    <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;([a-zA-Z]+)?&quot;"
+      Regex="CurrentComment { get { return &quot;(.+)?&quot;"
      ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&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)" />
+
+    <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>
@@ -6,7 +6,7 @@ SET nuGetFolder=%CD%\..\src\packages\
 ECHO Configured packages folder: %nuGetFolder%
 ECHO Current folder: %CD%

-%CD%\..\src\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%
+%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\"
@@ -24,9 +24,9 @@ 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 install
-call npm install -g grunt-cli
-call npm install -g bower
+call npm install --quiet
+call npm install -g grunt-cli --quiet
+call npm install -g bower --quiet
 call grunt build --buildversion=%release%

 ECHO Reset path to what it was before
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>UmbracoCms.Core.AllBinaries</id>
-    <version>6.1.2</version>
-    <title>Umbraco Cms Core All Binaries</title>
-    <authors>Morten Christensen</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-    <summary>Contains the core assemblies and all of the dependant assemblies needed to run Umbraco Cms</summary>
-    <language>en-US</language>
-    <tags>umbraco</tags>
-  </metadata>
-  <files>
-    <file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
-    <file src="..\_BuildOutput\bin\AutoMapper.dll" target="lib\AutoMapper.dll" />
-    <file src="..\_BuildOutput\bin\AutoMapper.Net4.dll" target="lib\AutoMapper.Net4.dll" />
-    <file src="..\_BuildOutput\bin\businesslogic.dll" target="lib\businesslogic.dll" />
-    <file src="..\_BuildOutput\bin\ClientDependency.Core.dll" target="lib\ClientDependency.Core.dll" />
-    <file src="..\_BuildOutput\bin\ClientDependency.Core.Mvc.dll" target="lib\ClientDependency.Core.Mvc.dll" />
-    <file src="..\_BuildOutput\bin\cms.dll" target="lib\cms.dll" />
-    <file src="..\_BuildOutput\bin\controls.dll" target="lib\controls.dll" />
-    <file src="..\_BuildOutput\bin\CookComputing.XmlRpcV2.dll" target="lib\CookComputing.XmlRpcV2.dll" />
-    <file src="..\_BuildOutput\bin\Examine.dll" target="lib\Examine.dll" />
-    <file src="..\_BuildOutput\bin\HtmlAgilityPack.dll" target="lib\HtmlAgilityPack.dll" />
-    <file src="..\_BuildOutput\bin\ICSharpCode.SharpZipLib.dll" target="lib\ICSharpCode.SharpZipLib.dll" />
-    <file src="..\_BuildOutput\bin\ImageProcessor.dll" target="lib\ImageProcessor.dll" />
-    <file src="..\_BuildOutput\bin\ImageProcessor.Web.dll" target="lib\ImageProcessor.Web.dll" />
-    <file src="..\_BuildOutput\bin\interfaces.dll" target="lib\interfaces.dll" />
-    <file src="..\_BuildOutput\bin\log4net.dll" target="lib\log4net.dll" />
-    <file src="..\_BuildOutput\bin\Lucene.Net.dll" target="lib\Lucene.Net.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.dll" target="lib\Microsoft.Threading.Tasks.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.Threading.Tasks.Extensions.dll" target="lib\Microsoft.Threading.Tasks.Extensions.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.Web.Infrastructure.dll" target="lib\Microsoft.Web.Infrastructure.dll" />
-    <file src="..\_BuildOutput\bin\Microsoft.Web.Mvc.FixedDisplayModes.dll" target="lib\Microsoft.Web.Mvc.FixedDisplayModes.dll" />
-    <file src="..\_BuildOutput\bin\MiniProfiler.dll" target="lib\MiniProfiler.dll" />
-    <file src="..\_BuildOutput\bin\MySql.Data.dll" target="lib\MySql.Data.dll" />
-    <file src="..\_BuildOutput\bin\Newtonsoft.Json.dll" target="lib\Newtonsoft.Json.dll" />
-    <file src="..\_BuildOutput\bin\NuGet.Core.dll" target="lib\NuGet.Core.dll" />
-    <file src="..\_BuildOutput\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
-    <file src="..\_BuildOutput\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
-    <file src="..\_BuildOutput\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.dll" target="lib\System.Net.Http.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.Extensions.dll" target="lib\System.Net.Http.Extensions.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.Formatting.dll" target="lib\System.Net.Http.Formatting.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.Primitives.dll" target="lib\System.Net.Http.Primitives.dll" />
-    <file src="..\_BuildOutput\bin\System.Net.Http.WebRequest.dll" target="lib\System.Net.Http.WebRequest.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Helpers.dll" target="lib\System.Web.Helpers.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Http.dll" target="lib\System.Web.Http.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Http.WebHost.dll" target="lib\System.Web.Http.WebHost.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Mvc.dll" target="lib\System.Web.Mvc.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.Razor.dll" target="lib\System.Web.Razor.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.WebPages.Administration.dll" target="lib\System.Web.WebPages.Administration.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.WebPages.Deployment.dll" target="lib\System.Web.WebPages.Deployment.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.WebPages.dll" target="lib\System.Web.WebPages.dll" />
-    <file src="..\_BuildOutput\bin\System.Web.WebPages.Razor.dll" target="lib\System.Web.WebPages.Razor.dll" />
-    <file src="..\_BuildOutput\bin\TidyNet.dll" target="lib\TidyNet.dll" />
-    <file src="..\_BuildOutput\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.dll" target="lib\umbraco.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
-    <file src="..\_BuildOutput\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
-    <file src="..\_BuildOutput\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
-    <file src="..\_BuildOutput\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
-    <file src="..\_BuildOutput\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
-  </files>
-</package>
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>UmbracoCms.Core</id>
-    <version>7.0.0</version>
-    <title>Umbraco Cms Core Binaries</title>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-    <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
-    <language>en-US</language>
-    <tags>umbraco</tags>
-  </metadata>
-  <files>
-    <file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.dll" target="lib" />
-    <file src="..\..\src\SQLCE4Umbraco\obj\Debug\SQLCE4Umbraco.pdb" target="lib" />
-    <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
-
-    <file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.dll" target="lib" />
-    <file src="..\..\src\umbraco.businesslogic\obj\Debug\businesslogic.pdb" target="lib" />
-    <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
-
-    <file src="..\..\src\umbraco.cms\obj\Debug\cms.dll" target="lib" />
-    <file src="..\..\src\umbraco.cms\obj\Debug\cms.pdb" target="lib" />
-    <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
-
-    <file src="..\..\src\umbraco.controls\obj\Debug\controls.dll" target="lib" />
-    <file src="..\..\src\umbraco.controls\obj\Debug\controls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
-
-    <file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.dll" target="lib" />
-    <file src="..\..\src\umbraco.interfaces\obj\Debug\interfaces.pdb" target="lib" />
-    <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
-
-    <file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.dll" target="lib" />
-    <file src="..\..\src\Umbraco.Core\obj\Debug\Umbraco.Core.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
-
-    <file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.dll" target="lib" />
-    <file src="..\..\src\umbraco.datalayer\obj\Debug\umbraco.DataLayer.pdb" target="lib" />
-    <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
-
-    <file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.dll" target="lib" />
-    <file src="..\..\src\umbraco.editorControls\obj\Debug\umbraco.editorControls.pdb" target="lib" />
-    <file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
-
-    <file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.dll" target="lib" />
-    <file src="..\..\src\umbraco.MacroEngines\obj\Debug\umbraco.MacroEngines.pdb" target="lib" />
-    <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
-
-    <file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.dll" target="lib" />
-    <file src="..\..\src\umbraco.providers\obj\Debug\umbraco.providers.pdb" target="lib" />
-    <file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
-
-    <file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.dll" target="lib" />
-    <file src="..\..\src\Umbraco.Web\obj\Debug\umbraco.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
-
-    <file src="..\..\src\bin\Debug\Umbraco.Web.UI.dll" target="lib" />
-    <file src="..\..\src\bin\Debug\Umbraco.Web.UI.pdb" target="lib" />
-    <file src="..\..\src\Umbraco.Web.UI\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
-
-    <file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.dll" target="lib" />
-    <file src="..\..\src\UmbracoExamine\obj\Debug\UmbracoExamine.pdb" target="lib" />
-    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
-  </files>
-</package>
@@ -6,7 +6,7 @@
    <title>Umbraco Cms Core Binaries</title>
    <authors>Umbraco HQ</authors>
    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
    <projectUrl>http://umbraco.com/</projectUrl>
    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -15,26 +15,29 @@
    <language>en-US</language>
    <tags>umbraco</tags>
    <dependencies>
-      <dependency id="Microsoft.AspNet.Mvc" version="[4.0.30506.0,6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi" version="[4.0.30506,6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi.WebHost" version="[4.0.30506, 6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi.Core" version="[4.0.30506, 6.0.0)" />
-      <dependency id="Microsoft.AspNet.WebApi.Client" version="[4.0.30506, 6.0.0)" />
-      <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" />
-      <dependency id="Microsoft.Net.Http" version="[2.0.20710.0, 3.0.0)" />
+      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.3,6.0.0)" />
+      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.3,6.0.0)" />
+      <dependency id="Microsoft.Net.Http" version="[2.2.29, 3.0.0)" />
+      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1, 3.0.0)" />
+      <dependency id="Microsoft.Owin.Security.Cookies" version="[3.0.1, 4.0.0)" />
+      <dependency id="Microsoft.Owin.Security.OAuth" version="[3.0.1, 4.0.0)" />
+      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.0.1, 4.0.0)" />      
      <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
-      <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
+      <dependency id="HtmlAgilityPack" version="[1.4.9, 2.0.0)" />
      <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
      <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
-      <dependency id="MySql.Data" version="[6.6.5]" />
+      <dependency id="MySql.Data" version="[6.9.8, 7.0.0)" />
      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.8.2.1, 2.0.0)" />
-      <dependency id="ClientDependency-Mvc" version="[1.8.0, 2.0.0)" />
-      <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
-      <dependency id="Examine" version="[0.1.60, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[1.9.5, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[3.3.1, 5.0.0)" />
+      <dependency id="ClientDependency" version="[1.8.4, 2.0.0)" />
+      <dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
+      <dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 7.0.0)" />
+      <dependency id="Examine" version="[0.1.68, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.3.0, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.4.0, 5.0.0)" />
+      <dependency id="semver" version="[1.1.2, 2.0.0)" />
+      <dependency id="Microsoft.AspNet.WebHelpers" version="[3.2.3, 4.0.0)" />
+      <dependency id="Microsoft.AspNet.WebPages.Data" version="[3.2.3, 4.0.0)" />
    </dependencies>
  </metadata>
  <files>
@@ -49,6 +52,7 @@
    <file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
    <file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\SQLCE4Umbraco.xml" />
    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
    <file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
    <file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
@@ -65,8 +69,38 @@
    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
    <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
+    <file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.xml" target="lib\UmbracoExamine.xml" />
    <file src="..\_BuildOutput\WebApp\bin\UrlRewritingNet.UrlRewriter.dll" target="lib\UrlRewritingNet.UrlRewriter.dll" />
    <file src="tools\install.core.ps1" target="tools\install.ps1" />
+
+	<!-- Added to be able to produce a symbols package -->
+	<file src="..\_BuildOutput\bin\SQLCE4Umbraco.pdb" target="lib" />
+    <file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
+	<file src="..\_BuildOutput\bin\businesslogic.pdb" target="lib" />
+    <file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
+	<file src="..\_BuildOutput\bin\cms.pdb" target="lib" />
+    <file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
+	<file src="..\_BuildOutput\bin\controls.pdb" target="lib" />
+    <file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
+	<file src="..\_BuildOutput\bin\interfaces.pdb" target="lib" />
+    <file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
+	<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="..\_BuildOutput\bin\umbraco.DataLayer.pdb" target="lib" />
+    <file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
+	<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="..\_BuildOutput\bin\umbraco.MacroEngines.pdb" target="lib" />
+    <file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
+	<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="..\_BuildOutput\bin\umbraco.pdb" target="lib" />
+    <file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
+	<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="..\_BuildOutput\bin\UmbracoExamine.pdb" target="lib" />
+    <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />	
  </files>
 </package>
@@ -6,7 +6,7 @@
    <title>Umbraco Cms</title>
    <authors>Umbraco HQ</authors>
    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
    <projectUrl>http://umbraco.com/</projectUrl>
    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -26,7 +26,6 @@
    <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\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
    <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" />
@@ -34,12 +33,14 @@
    <file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
    <file src="tools\install.ps1" target="tools\install.ps1" />
    <file src="tools\Readme.txt" target="tools\Readme.txt" />
+    <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
    <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
    <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
    <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
    <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
    <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
    <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
+    <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
    <file src="build\**" target="build" />
  </files>
 </package>
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>UmbracoExamine.PDF</id>
-    <version>0.7.0</version>
-    <authors>Umbraco HQ</authors>
-    <owners>Umbraco HQ</owners>
-    <licenseUrl>http://umbraco.codeplex.com/license</licenseUrl>
-    <projectUrl>http://umbraco.com/</projectUrl>
-    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>UmbracoExmine.PDF</description>
-    <tags>umbraco</tags>
-    <dependencies>
-      <dependency id="UmbracoCms.Core" version="[7.0.0, 8.0.0)" />
-      <dependency id="iTextSharp" version="[5.5.3, 6.0.0)" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\_BuildOutput\UmbracoExamine.PDF\UmbracoExamine.PDF.dll" target="lib\UmbracoExamine.PDF.dll" />
-    <file src="..\_BuildOutput\UmbracoExamine.PDF\UmbracoExamine.PDF.XML" target="lib\UmbracoExamine.PDF.XML" />
-  </files>
-</package>
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyUmbracoFilesToWebRootForDeploy" AfterTargets="CopyAllFilesToSingleFolderForMsdeploy">
+    <PropertyGroup>
+      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
+    </ItemGroup>
+    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="$(_PackageTempDir)\%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>  
  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
+	<!-- This copies the files listed in `AddUmbracoFilesToOutput` to the webroot during NuGet install and should -->
+	<!-- not be altered to support automated builds, use `CopyUmbracoFilesToWebRootForDeploy` for that instead -->
    <PropertyGroup>
      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
    </PropertyGroup>
@@ -47,4 +58,4 @@
      </FilesForPackagingFromProject>
    </ItemGroup>
  </Target>
-</Project>
+</Project>
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Welcome"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
      <control showOnce="true" addPanel="true" panelCaption="" xdt:Transform="InsertIfMissing">
@@ -20,7 +20,7 @@
    </tab>
  </section>

-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
      <control showOnce="true" addPanel="true" panelCaption="">
        views/dashboard/developer/developerdashboardvideos.html
@@ -29,15 +29,20 @@
    <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
  </section>
  
-  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
      <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
      <control>
        views/dashboard/developer/examinemanagement.html
      </control>
    </tab>    
+    <tab caption="Xml Data Integrity Report" xdt:Transform="InsertIfMissing">
+      <control>
+        views/dashboard/developer/xmldataintegrityreport.html
+      </control>
+    </tab>  
  </section>
  
-  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="Replace">
@@ -47,7 +52,7 @@
    </tab>
  </section>
  
-  <section alias="StartupDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Get Started" xdt:Transform="Insert">
      <access>
@@ -57,17 +62,10 @@
        views/dashboard/default/startupdashboardintro.html
      </control>
    </tab>
-    <tab caption="Change password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Change Password" xdt:Transform="Insert">
-      <control showOnce="false" addPanel="false" panelCaption="">
-        views/dashboard/ChangePassword.html
-      </control>
-    </tab>
    <tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
  </section>
  
-  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)">
+  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Get Started" xdt:Transform="Insert">
      <control showOnce="true" addPanel="true" panelCaption="">
@@ -8,21 +8,11 @@
                                                   
 ----------------------------------------------------

-A note about running Umbraco from Visual Studio.
-
 Don't forget to build!

 When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
 file (and config files in the config folder). 

-We've done our best to transform your configuration files but in case something is not quite right: remember we
-backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
-
-We've overwritten all the files in the Umbraco and Umbraco_Client folder, these have been backed up in 
-App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or 
-a package might have added. Only the existing files were overwritten. If you customized anything then make 
-sure to do a compare and merge with the NuGetBackup folder.
-
 This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 
 Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
 Publish this won't affect you.
@@ -0,0 +1,30 @@
+
+  _    _ __  __ ____  _____           _____ ____  
+ | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
+ | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
+ | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
+ | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
+  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
+                                                   
+----------------------------------------------------
+
+Don't forget to build!
+
+We've done our best to transform your configuration files but in case something is not quite right: remember we
+backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.
+
+We've overwritten all the files in the Umbraco and Umbraco_Client folder, these have been backed up in 
+App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or 
+a package might have added. Only the existing files were overwritten. If you customized anything then make 
+sure to do a compare and merge with the NuGetBackup folder.
+
+This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 
+Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
+Publish this won't affect you.
+The following items will now be automatically included when creating a deploy package or publishing to the file 
+system: umbraco, umbraco_client, config\splashes and global.asax.
+
+Please read the release notes on our.umbraco.org:
+http://our.umbraco.org/contribute/releases
+
+- Umbraco
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)" />
+    </sectionGroup>
+  </configSections>
+  
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(factoryType)" 
+		xdt:Transform="SetAttributes(factoryType)" />
+  </system.web.webPages.razor>
+  
+  <system.web>
+      <pages
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+			xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)" 
+			xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
+      <controls>
+        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" 
+			xdt:Locator="Match(namespace)" 
+			xdt:Transform="SetAttributes(assembly)" />
+      </controls>
+    </pages>
+  </system.web>
+  
+</configuration>
@@ -20,9 +20,9 @@

  <appSettings xdt:Transform="InsertIfMissing" />
  <appSettings>
-    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+    <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
  </appSettings>
-
+  
  <umbracoConfiguration xdt:Transform="InsertIfMissing">
    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
    <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
@@ -37,8 +37,10 @@
    <DbProviderFactories xdt:Transform="InsertIfMissing">
      <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
-      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
+      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />	  
+      <add invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="Remove" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+      <add invariant="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(type)" />
    </DbProviderFactories>
  </system.data>
  <clientDependency xdt:Transform="RemoveAttributes(version)" />
@@ -46,6 +48,13 @@
  <system.web xdt:Transform="InsertIfMissing" />
  <system.web>
    <siteMap xdt:Transform="Remove" />
+	<siteMap xdt:Transform="InsertIfMissing">
+      <providers xdt:Transform="InsertIfMissing">
+        <remove name="MySqlSiteMapProvider"  xdt:Transform="InsertIfMissing" />
+      </providers>
+      </siteMap>	
+    <httpRuntime xdt:Transform="InsertIfMissing" />
+    <httpRuntime targetFramework="4.5" xdt:Transform="SetAttributes(targetFramework)" />
    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
@@ -72,6 +81,10 @@
    </compilation>

    <compilation>
+      <assemblies>
+        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+      </assemblies>
      <assemblies>
        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
@@ -141,6 +154,12 @@
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
    </assemblyBinding>
  </runtime>

@@ -156,7 +175,31 @@
      </dependentAssembly>
      <dependentAssembly xdt:Transform="Insert">
        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.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" />
+      </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" />
+      </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" />
+      </dependentAssembly>	  	 
+	  <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
@@ -58,12 +58,13 @@ if ($project) {
 		if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\MySql.Data.dll) { Remove-Item $umbracoBinFolder\MySql.Data.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
@@ -47,93 +47,46 @@ if ($project) {
 		robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
 		robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
 	}
-	
-	$copyWebconfig = $false

-	# SJ - What can I say: big up for James Newton King for teaching us a hack for detecting if this is a new install vs. an upgrade!
-	# https://github.com/JamesNK/Newtonsoft.Json/pull/387 - would never have seen this without the controversial pull request..	
-	Try		
+	$copyWebconfig = $true
+	$destinationWebConfig = Join-Path $projectDestinationPath "Web.config"
+
+	if(Test-Path $destinationWebConfig) 
 	{
-		# see if user is installing from VS NuGet console		
-		# get reference to the window, the console host and the input history		
-		# copy web.config if "install-package UmbracoCms" was last input		
-		# this is in a try-catch as they might be using the regular NuGet dialog 
-		# instead of package manager console
-		
-		$dte2 = Get-Interface $dte ([EnvDTE80.DTE2])		
-
-		$consoleWindow = $(Get-VSComponentModel).GetService([NuGetConsole.IPowerConsoleWindow])		
+		Try 
+		{
+			[xml]$config = Get-Content $destinationWebConfig
 			
-		$props = $consoleWindow.GetType().GetProperties([System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)		
-			
-		$prop = $props | ? { $_.Name -eq "ActiveHostInfo" } | select -first 1
-			
-		$hostInfo = $prop.GetValue($consoleWindow)
-			
-		$history = $hostInfo.WpfConsole.InputHistory.History		
-			
-		$lastCommand = $history | select -last 1
-			
-		if ($lastCommand)		
-		{		
-			$lastCommand = $lastCommand.Trim().ToLower()		
-			if ($lastCommand.StartsWith("install-package") -and $lastCommand.Contains("umbracocms"))		
-			{		
-				$copyWebconfig = $true
+			$config.configuration.appSettings.ChildNodes | ForEach-Object { 
+				if($_.key -eq "umbracoConfigurationStatus") 
+				{
+					# The web.config has an umbraco-specific appSetting in it
+					# don't overwrite it and let config transforms do their thing
+					$copyWebconfig = $false 
+				}
 			}
-		}
+		} 
+		Catch { }
 	}
-	Catch { }
-	
-	Try		
-	{	
-		# user is installing from VS NuGet dialog		
-		# get reference to the window, then smart output console provider		
-		# copy web.config if messages in buffered console contains "installing...UmbracoCms" in last operation		
-		
-		$instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor [System.Reflection.BindingFlags]::NonPublic)		
-		$consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)		
-		
-		$instance = $instanceField.GetValue($null)		
-		
-		$consoleProvider = $consoleField.GetValue($instance)		
-			
-		$console = $consoleProvider.CreateOutputConsole($false)		
-		
-		$messagesField = $console.GetType().GetField("_messages", [System.Reflection.BindingFlags]::Instance -bor [System.Reflection.BindingFlags]::NonPublic)		
-			
-		$messages = $messagesField.GetValue($console)		
-	
-		$operations = $messages -split "=============================="		
-			
-		$lastOperation = $operations | select -last 1		
-			
-		if ($lastOperation)		
-		{		
-			$lastOperation = $lastOperation.ToLower()
-			$lines = $lastOperation -split "`r`n"
-			$installMatch = $lines | ? { $_.Contains("...umbracocms ") } | select -first 1
-			
-			if ($installMatch)		
-			{
-				$copyWebconfig = $true
-			}
-		}
-	} 
-	Catch { }
 	
 	if($copyWebconfig -eq $true) 
 	{
 		$packageWebConfigSource = Join-Path $rootPath "UmbracoFiles\Web.config"
-		$destinationWebConfig = Join-Path $projectDestinationPath "Web.config"
 		Copy-Item $packageWebConfigSource $destinationWebConfig -Force
-	}
+	} 

 	$installFolder = Join-Path $projectDestinationPath "Install"
 	if(Test-Path $installFolder) {
 		Remove-Item $installFolder -Force -Recurse -Confirm:$false
 	}
 	
-	# Open readme.txt file
-	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
+	# Open appropriate readme
+	if($copyWebconfig -eq $true)  
+	{
+		$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
+	} 
+	else 
+	{	
+		$DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt')
+	}
 }
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<log4net xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <appender name="AsynchronousLog4NetAppender" xdt:Transform="Remove" xdt:Locator="Match(name)" /> 
+  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core" xdt:Transform="Insert" >
+    <appender-ref ref="rollingFile" />
+  </appender>
+  
+  <appender name="rollingFile" type="log4net.Appender.RollingFileAppender" xdt:Transform="InsertIfMissing">
+    <file value="App_Data\Logs\UmbracoTraceLog.txt" />
+    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    <appendToFile value="true" />
+    <rollingStyle value="Date" />
+    <maximumFileSize value="5MB" />
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    </layout>
+    <encoding value="utf-8" />
+  </appender>
+</log4net>
+
@@ -7,12 +7,12 @@
  <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="templates" title="Templates" type="umbraco.loadTemplates, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
+  <add application="settings" alias="templates" title="Templates" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="1" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add alias="dictionary" xdt:Locator="Match(alias)" xdt:Transform="RemoveAttributes(action)" />
-  <add application="settings" alias="languages" title="Languages" type="umbraco.loadLanguages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
+  <add application="settings" alias="languages" title="Languages" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="5" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="mediaTypes" title="Media Types" type="umbraco.loadMediaTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add application="settings" alias="nodeTypes" title="Document Types" type="umbraco.loadNodeTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
  <add initialize="true" sortOrder="0" alias="datatype" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes()" />
@@ -45,9 +45,6 @@ del ..\src\Umbraco.Web.UI\UserControls\*.*
 echo Removing masterpage files
 del ..\src\Umbraco.Web.UI\masterpages\*.*

-echo Removing view files
-del ..\src\Umbraco.Web.UI\Views\*.*
-
 echo Removing razor files
 del ..\src\Umbraco.Web.UI\macroScripts\*.*

@@ -104,7 +101,9 @@ echo Removing user control files
 FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A

 echo Removing view files
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
+ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
+ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S

 echo Removing razor files
 FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
@@ -54,9 +54,6 @@ del ..\src\Umbraco.Web.UI\UserControls\*.*
 echo Removing masterpage files
 del ..\src\Umbraco.Web.UI\masterpages\*.*

-echo Removing view files
-del ..\src\Umbraco.Web.UI\Views\*.*
-
 echo Removing razor files
 del ..\src\Umbraco.Web.UI\macroScripts\*.*

@@ -122,7 +119,9 @@ echo Removing user control files
 FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A

 echo Removing view files
-FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A
+ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
+ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S

 echo Removing razor files
 FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
@@ -151,6 +150,9 @@ rmdir "..\src\Umbraco.Web.UI\usercontrols\umbracoContour\" /S /Q
 echo Start with a clean web.config
 copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y

+echo Start with a clean web.config
+copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
+
 echo "Umbraco install reverted to clean install"
 pause 
 exit
@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.2.2
+7.3.3
@@ -1,13 +0,0 @@
-Umbraco CMS version 4.5 is licensed under the OSI approved MIT License:
-
-Copyright (c) 2007-2010 umbraco I/S.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Umbraco versions prior to 4.5 were licensed under a combination of MIT and a propriatary UI license.  The license history can be found here:
-http://umbraco.codeplex.com/license
@@ -1,33 +0,0 @@
-Umbraco - the simple, flexible and friendly ASP.NET CMS
-=======================================================
-For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 57.000 active websites including Heinz.com, Peugeot.com, NAIAS.com and Microsofts documentinteropinitiative.org website you can be sure that the technology is proven, stable and scales.
-
-More info at http://umbraco.com
-
-Exploring the repository
-========================
-Most contributors will work on their own fork and should pick the branch in which they need their fix. For more information see:
-http://our.umbraco.org/contribute/guidelines-for-core-contribution
-
-Exploring the source
-====================
-The Umbraco source code is never required for you to start building sites. If you are not using the source code for debugging purposes or to contribute to the source then please download the binaries listed at http://umbraco.codeplex.com
-
-With that said, the Umbraco solution can be opened in Visual Studio 2010 with SP1 installed or Visual Studio 2012.
-
-Contributing
-============
-Umbraco is Open Source which means you can contribute to make it great!
-Read all about it at http://our.umbraco.org/contribute
-
-Forums
-======
-We have a forum running on http://our.umbraco.org for friendly community support.
-
-Documentation
-=============
-Our documentation section provides help on installing and using Umbraco including API reference documentation: http://our.umbraco.org/documentation
-
-Submitting Issues
-=================
-Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our online guide at http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="umbracocore" value="http://www.myget.org/f/umbracocore/" />
+  </packageSources>
+</configuration>
@@ -77,8 +77,9 @@
    <Compile Include="SqlCEUtility.cs" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp50</s:String></wpf:ResourceDictionary>
@@ -14,6 +14,22 @@
        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.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" />
+      </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" />
+      </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" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
@@ -1,8 +1,8 @@
-using System.Reflection;
+using System.Reflection;
 using System.Resources;

-[assembly: AssemblyCompany("umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2012")]
+[assembly: AssemblyCompany("Umbraco")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -10,3 +10,6 @@ using System.Resources;


 [assembly: AssemblyVersion("1.0.*")]
+
+[assembly: AssemblyFileVersion("7.3.3")]
+[assembly: AssemblyInformationalVersion("7.3.3")]
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;

@@ -10,15 +11,16 @@ namespace Umbraco.Core
 	/// <summary>
 	/// A resolver to return all IAction objects
 	/// </summary>
-	internal sealed class ActionsResolver : LazyManyObjectsResolverBase<ActionsResolver, IAction>
+	public sealed class ActionsResolver : LazyManyObjectsResolverBase<ActionsResolver, IAction>
 	{
-
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="packageActions"></param>		
-		internal ActionsResolver(Func<IEnumerable<Type>> packageActions)
-			: base(packageActions)
+	    /// <summary>
+	    /// Constructor
+	    /// </summary>
+	    /// <param name="serviceProvider"></param>
+	    /// <param name="logger"></param>
+	    /// <param name="packageActions"></param>		
+	    internal ActionsResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> packageActions)
+            : base(serviceProvider, logger, packageActions)
 		{

 		}
@@ -55,7 +57,7 @@ namespace Umbraco.Core
 				var instance = type.GetProperty("Instance", BindingFlags.Public | BindingFlags.Static);
 				//if the singletone initializer is not found, try simply creating an instance of the IAction if it supports public constructors
 				if (instance == null)
-					typeInstance = PluginManager.Current.CreateInstance<IAction>(type);
+					typeInstance = ServiceProvider.GetService(type) as IAction;
 				else
 					typeInstance = instance.GetValue(null, null) as IAction;

@@ -1,8 +1,6 @@
-using System;
-
 namespace Umbraco.Core
 {
-	/// <summary>
+    /// <summary>
 	/// Helper methods for Activation
 	/// </summary>
 	internal static class ActivatorHelper
@@ -14,7 +12,9 @@ namespace Umbraco.Core
 		/// <returns></returns>
 		public static T CreateInstance<T>() where T : class, new()
 		{
-			return Activator.CreateInstance(typeof(T)) as T;
+		    return new ActivatorServiceProvider().GetService(typeof (T)) as T;
 		}
+
+	    
 	}
 }
@@ -0,0 +1,12 @@
+using System;
+
+namespace Umbraco.Core
+{
+    internal class ActivatorServiceProvider : IServiceProvider
+    {
+        public object GetService(Type serviceType)
+        {
+            return Activator.CreateInstance(serviceType);
+        }
+    }
+}
@@ -1,15 +1,14 @@
 using System;
 using System.Configuration;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Web;
-using System.Web.Caching;
-using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
+using Umbraco.Core.Profiling;
 using Umbraco.Core.Services;
-
+using Umbraco.Core.Sync;

 namespace Umbraco.Core
 {
@@ -21,30 +20,65 @@ namespace Umbraco.Core
    /// </remarks>
    public class ApplicationContext : IDisposable
    {
-        
        /// <summary>
        /// Constructor
        /// </summary>
        /// <param name="dbContext"></param>
        /// <param name="serviceContext"></param>
        /// <param name="cache"></param>
-        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
-        {
+        /// <param name="logger"></param>
+        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, ProfilingLogger logger)
+	    {
            if (dbContext == null) throw new ArgumentNullException("dbContext");
            if (serviceContext == null) throw new ArgumentNullException("serviceContext");
            if (cache == null) throw new ArgumentNullException("cache");
+            if (logger == null) throw new ArgumentNullException("logger");
            _databaseContext = dbContext;
            _services = serviceContext;
            ApplicationCache = cache;
+            ProfilingLogger = logger;
+
+            Init();
+	    }
+
+	    /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="dbContext"></param>
+        /// <param name="serviceContext"></param>
+        /// <param name="cache"></param>
+        [Obsolete("Use the other constructor specifying a ProfilingLogger instead")]
+        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
+            : this(dbContext, serviceContext, cache, 
+                new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler))
+        {
        }

        /// <summary>
        /// Creates a basic app context
        /// </summary>
        /// <param name="cache"></param>
+        [Obsolete("Use the other constructor specifying a ProfilingLogger instead")]
        public ApplicationContext(CacheHelper cache)
        {
+            if (cache == null) throw new ArgumentNullException("cache");
            ApplicationCache = cache;
+            ProfilingLogger = new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);
+            Init();
+        }
+
+	    /// <summary>
+	    /// Creates a basic app context
+	    /// </summary>
+	    /// <param name="cache"></param>
+	    /// <param name="logger"></param>
+	    public ApplicationContext(CacheHelper cache, ProfilingLogger logger)
+        {
+	        if (cache == null) throw new ArgumentNullException("cache");
+	        if (logger == null) throw new ArgumentNullException("logger");
+	        ApplicationCache = cache;
+	        ProfilingLogger = logger;
+            Init();
        }

 	    /// <summary>
@@ -60,13 +94,13 @@ namespace Umbraco.Core
 	    /// </remarks>
 	    public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
 	    {
-            if (ApplicationContext.Current != null)
+            if (Current != null)
            {
                if (!replaceContext)
-                    return ApplicationContext.Current;
+                    return Current;
            }
-            ApplicationContext.Current = appContext;
-            return ApplicationContext.Current;
+            Current = appContext;
+            return Current;
 	    }

 	    /// <summary>
@@ -83,16 +117,44 @@ namespace Umbraco.Core
 	    /// <remarks>
 	    /// This is NOT thread safe 
 	    /// </remarks>
+        [Obsolete("Use the other method specifying an ProfilingLogger instead")]
 	    public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
        {
-            if (ApplicationContext.Current != null)
+            if (Current != null)
            {
                if (!replaceContext)
-                    return ApplicationContext.Current;
+                    return Current;
            }
            var ctx = new ApplicationContext(dbContext, serviceContext, cache);
-            ApplicationContext.Current = ctx;
-            return ApplicationContext.Current;
+            Current = ctx;
+            return Current;
+        }
+
+	    /// <summary>
+	    /// A method used to create and ensure that a global ApplicationContext singleton is created.
+	    /// </summary>
+	    /// <param name="cache"></param>
+	    /// <param name="logger"></param>
+	    /// <param name="replaceContext">
+	    /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app 
+	    /// startup if for some reason the boot manager is not the umbraco boot manager.
+	    /// </param>
+	    /// <param name="dbContext"></param>
+	    /// <param name="serviceContext"></param>
+	    /// <returns></returns>
+	    /// <remarks>
+	    /// This is NOT thread safe 
+	    /// </remarks>
+        public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, ProfilingLogger logger, bool replaceContext)
+        {
+            if (Current != null)
+            {
+                if (!replaceContext)
+                    return Current;
+            }
+            var ctx = new ApplicationContext(dbContext, serviceContext, cache, logger);
+            Current = ctx;
+            return Current;
        }

 	    /// <summary>
@@ -108,7 +170,13 @@ namespace Umbraco.Core
 		/// </remarks>
 		public CacheHelper ApplicationCache { get; private set; }

-    	// IsReady is set to true by the boot manager once it has successfully booted
+        /// <summary>
+        /// Exposes the global ProfilingLogger - this should generally not be accessed via the UmbracoContext and should normally just be exposed 
+        /// on most base classes or injected with IoC
+        /// </summary>
+        public ProfilingLogger ProfilingLogger { get; private set; }
+
+	    // IsReady is set to true by the boot manager once it has successfully booted
        // note - the original umbraco module checks on content.Instance in umbraco.dll
        //   now, the boot task that setup the content store ensures that it is ready
        bool _isReady = false;
@@ -141,56 +209,117 @@ namespace Umbraco.Core
        //   GlobalSettings.CurrentVersion returns the hard-coded "current version"
        //   the system is configured if they match
        //   if they don't, install runs, updates web.config (presumably) and updates GlobalSettings.ConfiguredStatus
-        //
-        //   then there is Application["umbracoNeedConfiguration"] which makes no sense... getting rid of it... SD: I have actually remove that now!
-        //
+        
        public bool IsConfigured
        {
-            // todo - we should not do this - ok for now
+            get { return _configured.Value; }
+        }
+
+        /// <summary>
+        /// If the db is configured, there is a database context and there is an umbraco schema, but we are not 'configured' , then it means we are upgrading
+        /// </summary>
+	    public bool IsUpgrading
+	    {
            get
            {
-            	return Configured;
+                if (IsConfigured == false 
+                    && DatabaseContext != null 
+                    && DatabaseContext.IsDatabaseConfigured)
+                {
+                    var schemaresult = DatabaseContext.ValidateDatabaseSchema();
+                    if (schemaresult.ValidTables.Count > 0) return true;
+                }
+
+                return false;
+            }
+	    }
+
+	    /// <summary>
+        /// The application url.
+        /// </summary>
+        /// <remarks>
+        /// The application url is the url that should be used by services to talk to the application,
+        /// eg keep alive or scheduled publishing services. It must exist on a global context because
+        /// some of these services may not run within a web context.
+        /// The format of the application url is:
+        /// - has a scheme (http or https)
+        /// - has the SystemDirectories.Umbraco path
+        /// - does not end with a slash
+        /// It is initialized on the first request made to the server, by UmbracoModule.EnsureApplicationUrl:
+        /// - if umbracoSettings:settings/web.routing/@umbracoApplicationUrl is set, use the value (new setting)
+        /// - if umbracoSettings:settings/scheduledTasks/@baseUrl is set, use the value (backward compatibility)
+        /// - otherwise, use the url of the (first) request.
+        /// Not locking, does not matter if several threads write to this.
+        /// See also issues:
+        /// - http://issues.umbraco.org/issue/U4-2059
+        /// - http://issues.umbraco.org/issue/U4-6788
+        /// - http://issues.umbraco.org/issue/U4-5728
+        /// - http://issues.umbraco.org/issue/U4-5391
+        /// </remarks>
+        internal string UmbracoApplicationUrl
+        {
+            get
+            {
+                ApplicationUrlHelper.EnsureApplicationUrl(this);
+                return _umbracoApplicationUrl;
            }
        }

-	    /// <summary>
-        /// The original/first url that the web application executes
-        /// </summary>
-        /// <remarks>
-        /// we need to set the initial url in our ApplicationContext, this is so our keep alive service works and this must
-        /// exist on a global context because the keep alive service doesn't run in a web context.
-        /// we are NOT going to put a lock on this because locking will slow down the application and we don't really care
-        /// if two threads write to this at the exact same time during first page hit.
-        /// see: http://issues.umbraco.org/issue/U4-2059
-        /// </remarks>
-        internal string OriginalRequestUrl { get; set; }
+	    // ReSharper disable once InconsistentNaming
+	    internal string _umbracoApplicationUrl;

-        /// <summary>
-        /// Checks if the version configured matches the assembly version
-        /// </summary>
-		private bool Configured
+        private Lazy<bool> _configured;
+        internal MainDom MainDom { get; private set; }
+       
+	    private void Init()
 		{
-			get
-			{
-				try
-				{
-					string configStatus = ConfigurationStatus;
-					string currentVersion = UmbracoVersion.Current.ToString(3);
+            MainDom = new MainDom(ProfilingLogger.Logger);
+            MainDom.Acquire();
+            
+            //Create the lazy value to resolve whether or not the application is 'configured'
+            _configured = new Lazy<bool>(() =>
+            {
+                try
+                {
+                    var configStatus = ConfigurationStatus;
+                    var currentVersion = UmbracoVersion.GetSemanticVersion();

+                    var ok =
+                        //we are not configured if this is null    
+                        string.IsNullOrWhiteSpace(configStatus) == false
+                        //they must match
+                        && configStatus == currentVersion;

-					if (currentVersion != configStatus)
-					{
-						LogHelper.Info<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
-					}
-						
+                    if (ok)
+                    {
+                        //The versions are the same in config, but are they the same in the database. We can only check this
+                        // if we have a db context available, if we don't then we are not installed anyways
+                        if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.CanConnect)
+                        {
+                            var found = Services.MigrationEntryService.FindEntry(GlobalSettings.UmbracoMigrationName, UmbracoVersion.GetSemanticVersion());
+                            if (found == null)
+                            {
+                                //we haven't executed this migration in this environment, so even though the config versions match, 
+                                // this db has not been updated.
+                                ProfilingLogger.Logger.Debug<ApplicationContext>(string.Format("The migration for version: '{0} has not been executed, there is no record in the database", currentVersion.ToSemanticString()));
+                                ok = false;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        ProfilingLogger.Logger.Debug<ApplicationContext>(string.Format("CurrentVersion different from configStatus: '{0}','{1}'", currentVersion.ToSemanticString(), configStatus));
+                    }

-					return (configStatus == currentVersion);
-				}
-				catch
-				{
-					return false;
-				}
-			}
+                    return ok;
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<ApplicationContext>("Error determining if application is configured, returning false", ex);
+                    return false;
+                }
+
+            }); 
 		}

 		private string ConfigurationStatus
@@ -208,12 +337,6 @@ namespace Umbraco.Core
 			}			
 		}

-        private void AssertIsReady()
-        {
-            if (!this.IsReady)
-                throw new Exception("ApplicationContext is not ready yet.");
-        }
-
        private void AssertIsNotReady()
        {
            if (this.IsReady)
@@ -254,6 +377,11 @@ namespace Umbraco.Core
 			internal set { _services = value; }
 		}

+	    internal ServerRole GetCurrentServerRole()
+	    {
+	        var registrar = ServerRegistrarResolver.Current.Registrar as IServerRegistrar2;
+            return registrar == null ? ServerRole.Unknown : registrar.GetCurrentServerRole();
+	    }

        private volatile bool _disposed;
        private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
@@ -289,7 +417,7 @@ namespace Umbraco.Core
                this.ApplicationCache = null;
                if (_databaseContext != null) //need to check the internal field here
                {
-                    if (DatabaseContext.IsDatabaseConfigured)
+                    if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.Database != null)
                    {
                        DatabaseContext.Database.Dispose();       
                    }                    
@@ -74,7 +74,7 @@ namespace Umbraco.Core
        /// <returns></returns>
        private bool ShouldExecute(ApplicationContext applicationContext)
        {
-            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.CanConnect)
+            if (applicationContext.IsConfigured && applicationContext.DatabaseContext.IsDatabaseConfigured)
            {
                return true;
            }
@@ -84,7 +84,7 @@ namespace Umbraco.Core
                return true;
            }

-            if (!applicationContext.DatabaseContext.CanConnect && ExecuteWhenDatabaseNotConfigured)
+            if (!applicationContext.DatabaseContext.IsDatabaseConfigured && ExecuteWhenDatabaseNotConfigured)
            {
                return true;
            }
@@ -0,0 +1,203 @@
+using System;
+using System.Runtime.ConstrainedExecution;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core
+{
+    // http://blogs.msdn.com/b/pfxteam/archive/2012/02/12/10266988.aspx
+    //
+    // notes:
+    // - this is NOT a reader/writer lock
+    // - this is NOT a recursive lock
+    //
+    // using a named Semaphore here and not a Mutex because mutexes have thread
+    // affinity which does not work with async situations
+    //
+    // it is important that managed code properly release the Semaphore before
+    // going down else it will maintain the lock - however note that when the
+    // whole process (w3wp.exe) goes down and all handles to the Semaphore have
+    // been closed, the Semaphore system object is destroyed - so in any case
+    // an iisreset should clean up everything
+    //
+    internal class AsyncLock
+    {
+        private readonly SemaphoreSlim _semaphore;
+        private readonly Semaphore _semaphore2;
+        private readonly IDisposable _releaser;
+        private readonly Task<IDisposable> _releaserTask;
+
+        public AsyncLock()
+            : this (null)
+        { }
+
+        public AsyncLock(string name)
+        {
+            // WaitOne() waits until count > 0 then decrements count
+            // Release() increments count
+            // initial count: the initial count value
+            // maximum count: the max value of count, and then Release() throws
+
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                // anonymous semaphore
+                // use one unique releaser, that will not release the semaphore when finalized
+                // because the semaphore is destroyed anyway if the app goes down
+
+                _semaphore = new SemaphoreSlim(1, 1); // create a local (to the app domain) semaphore
+                _releaser = new SemaphoreSlimReleaser(_semaphore);
+                _releaserTask = Task.FromResult(_releaser);
+            }
+            else
+            {
+                // named semaphore
+                // use dedicated releasers, that will release the semaphore when finalized
+                // because the semaphore is system-wide and we cannot leak counts
+
+                _semaphore2 = new Semaphore(1, 1, name); // create a system-wide named semaphore
+            }
+        }
+
+        private IDisposable CreateReleaser()
+        {
+            // for anonymous semaphore, use the unique releaser, else create a new one
+            return _semaphore != null
+                ? _releaser // (IDisposable)new SemaphoreSlimReleaser(_semaphore)
+                : new NamedSemaphoreReleaser(_semaphore2);
+        }
+
+        public Task<IDisposable> LockAsync()
+        {
+            var wait = _semaphore != null 
+                ? _semaphore.WaitAsync()
+                : _semaphore2.WaitOneAsync();
+
+            return wait.IsCompleted 
+                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+                : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
+                    this, CancellationToken.None,
+                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+        }
+
+        public Task<IDisposable> LockAsync(int millisecondsTimeout)
+        {
+            var wait = _semaphore != null
+                ? _semaphore.WaitAsync(millisecondsTimeout)
+                : _semaphore2.WaitOneAsync(millisecondsTimeout);
+
+            return wait.IsCompleted
+                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+                : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
+                    this, CancellationToken.None,
+                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+        }
+
+        public IDisposable Lock()
+        {
+            if (_semaphore != null)
+                _semaphore.Wait();
+            else
+                _semaphore2.WaitOne();
+            return _releaser ?? CreateReleaser(); // anonymous vs named
+        }
+
+        public IDisposable Lock(int millisecondsTimeout)
+        {
+            var entered = _semaphore != null
+                ? _semaphore.Wait(millisecondsTimeout)
+                : _semaphore2.WaitOne(millisecondsTimeout);
+            if (entered == false)
+                throw new TimeoutException("Failed to enter the lock within timeout.");
+            return _releaser ?? CreateReleaser(); // anonymous vs named
+        }
+
+        // note - before making those classes some structs, read 
+        // about "impure methods" and mutating readonly structs...
+
+        private class NamedSemaphoreReleaser : CriticalFinalizerObject, IDisposable
+        {
+            private readonly Semaphore _semaphore;
+            private GCHandle _handle;
+
+            internal NamedSemaphoreReleaser(Semaphore semaphore)
+            {
+                _semaphore = semaphore;
+                _handle = GCHandle.Alloc(_semaphore);
+            }
+
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this); // finalize will not run
+            }
+
+            private void Dispose(bool disposing)
+            {
+                // critical
+                _handle.Free();
+                _semaphore.Release();
+                _semaphore.Dispose();
+            }
+
+            // we WANT to release the semaphore because it's a system object, ie a critical 
+            // non-managed resource - and if it is not released then noone else can acquire
+            // the lock - so we inherit from CriticalFinalizerObject which means that the 
+            // finalizer "should" run in all situations - there is always a chance that it
+            // does not run and the semaphore remains "acquired" but then chances are the
+            // whole process (w3wp.exe...) is going down, at which point the semaphore will
+            // be destroyed by Windows.
+
+            // however, the semaphore is a managed object, and so when the finalizer runs it
+            // might have been finalized already, and then we get a, ObjectDisposedException
+            // in the finalizer - which is bad.
+
+            // in order to prevent this we do two things
+            // - use a GCHandler to ensure the semaphore is still there when the finalizer
+            //   runs, so we can actually release it
+            // - wrap the finalizer code in a try...catch to make sure it never throws
+
+            ~NamedSemaphoreReleaser()
+            {
+                try
+                {
+                    Dispose(false);
+                }
+                catch
+                {
+                    // we do NOT want the finalizer to throw - never ever
+                }
+            }
+        }
+
+        private class SemaphoreSlimReleaser : IDisposable
+        {
+            private readonly SemaphoreSlim _semaphore;
+
+            internal SemaphoreSlimReleaser(SemaphoreSlim semaphore)
+            {
+                _semaphore = semaphore;
+            }
+
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
+            private void Dispose(bool disposing)
+            {
+                if (disposing)
+                {
+                    // normal
+                    _semaphore.Release();
+                }
+            }
+
+            ~SemaphoreSlimReleaser()
+            {
+                Dispose(false);
+            }
+        }
+    }
+}
@@ -1,13 +1,17 @@
-namespace Umbraco.Core.Auditing
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core.Auditing
 {
-	/// <summary>
-	/// Public method to create new audit trail
-	/// </summary>
+    [Obsolete("Use Umbraco.Core.Services.IAuditService instead")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
    public static class Audit
    {
-         public static void Add(AuditTypes type, string comment, int userId, int objectId)
+        public static void Add(Umbraco.Core.Auditing.AuditTypes type, string comment, int userId, int objectId)
         {
-             AuditTrail.Current.AddEntry(type, comment, userId, objectId);
+             ApplicationContext.Current.Services.AuditService.Add(
+                 Enum<Umbraco.Core.Models.AuditType>.Parse(type.ToString()), 
+                 comment, userId, objectId);
         }
    }
 }
@@ -1,30 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Auditing
-{
-    /// <summary>
-    /// Represents the Audit implementation
-    /// </summary>
-    internal class AuditTrail
-    {
-        #region Singleton
-
-        private static readonly Lazy<AuditTrail> lazy = new Lazy<AuditTrail>(() => new AuditTrail());
-
-        public static AuditTrail Current { get { return lazy.Value; } }
-
-        private AuditTrail()
-        {
-            WriteProvider = new DataAuditWriteProvider();
-        }
-
-        #endregion
-
-        private IAuditWriteProvider WriteProvider { get; set; }
-
-        public void AddEntry(AuditTypes type, string comment, int userId, int objectId)
-        {
-            WriteProvider.WriteEntry(objectId, userId, DateTime.Now, type.ToString(), comment);
-        }
-    }
-}
@@ -1,8 +1,10 @@
-namespace Umbraco.Core.Auditing
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core.Auditing
 {
-    /// <summary>
-    /// Enums for vailable types of auditing
-    /// </summary>
+    [Obsolete("Use Umbraco.Core.Models.AuditType instead")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
    public enum AuditTypes
    {
        /// <summary>
@@ -1,29 +0,0 @@
-using System;
-using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
-
-namespace Umbraco.Core.Auditing
-{
-    internal class DataAuditWriteProvider : IAuditWriteProvider
-    {
-        /// <summary>
-        /// Writes an audit entry to the underlaying datastore.
-        /// </summary>
-        /// <param name="objectId">Id of the object (Content, ContentType, Media, etc.)</param>
-        /// <param name="userId">Id of the user</param>
-        /// <param name="date">Datestamp</param>
-        /// <param name="header">Audit header</param>
-        /// <param name="comment">Audit comment</param>
-        public void WriteEntry(int objectId, int userId, DateTime date, string header, string comment)
-        {
-            ApplicationContext.Current.DatabaseContext.Database.Insert(new LogDto
-                                                        {
-                                                            Comment = comment,
-                                                            Datestamp = date,
-                                                            Header = header,
-                                                            NodeId = objectId,
-                                                            UserId = userId
-                                                        });
-        }
-    }
-}
@@ -1,17 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Auditing
-{
-    internal interface IAuditWriteProvider
-    {
-        /// <summary>
-        /// Writes an audit entry to the underlaying datastore.
-        /// </summary>
-        /// <param name="objectId">Id of the object (Content, ContentType, Media, etc.)</param>
-        /// <param name="userId">Id of the user</param>
-        /// <param name="date">Datestamp</param>
-        /// <param name="header">Audit header</param>
-        /// <param name="comment">Audit comment</param>
-        void WriteEntry(int objectId, int userId, DateTime date, string header, string comment);
-    }
-}
@@ -29,6 +29,8 @@ namespace Umbraco.Core.Cache
        public const string MemberBusinessLogicCacheKey = "MemberCacheItem_";
        
        public const string TemplateFrontEndCacheKey = "template";
+
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
        public const string TemplateBusinessLogicCacheKey = "UmbracoTemplateCache";

        public const string UserContextCacheKey = "UmbracoUserContext";
@@ -45,14 +47,21 @@ namespace Umbraco.Core.Cache
        
        public const string PropertyTypeCacheKey = "UmbracoPropertyTypeCache";

+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
        public const string LanguageCacheKey = "UmbracoLanguageCache";

+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
        public const string DomainCacheKey = "UmbracoDomainList";

+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
        public const string StylesheetCacheKey = "UmbracoStylesheet";
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
        public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty";

        public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
        public const string DataTypePreValuesCacheKey = "UmbracoPreVal";
+
+        public const string IdToKeyCacheKey = "UI2K";
+        public const string KeyToIdCacheKey = "UK2I";
    }
 }
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// Extensions for strongly typed access
    /// </summary>
-    internal static class CacheProviderExtensions
+    public static class CacheProviderExtensions
    {
        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
            string cacheKey,
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Cache
        protected const string CacheItemPrefix = "umbrtmche";

        // an object that represent a value that has not been created yet
-        protected readonly object ValueNotCreated = new object();
+        protected internal static readonly object ValueNotCreated = new object();

        // manupulate the underlying cache entries
        // these *must* be called from within the appropriate locks
@@ -30,21 +30,58 @@ namespace Umbraco.Core.Cache
            return string.Format("{0}-{1}", CacheItemPrefix, key);
        }

-        protected object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        protected internal static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
        {
+            // try to generate the value and if it fails,
+            // wrap in an ExceptionHolder - would be much simpler
+            // to just use lazy.IsValueFaulted alas that field is
+            // internal
+            return new Lazy<object>(() =>
+            {
+                try
+                {
+                    return getCacheItem();
+                }
+                catch (Exception e)
+                {
+                    return new ExceptionHolder(e);
+                }
+            });
+        }
+
+        protected internal static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        {
+            // if onlyIfValueIsCreated, do not trigger value creation
+            // must return something, though, to differenciate from null values
+            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
+
+            // if execution has thrown then lazy.IsValueCreated is false
+            // and lazy.IsValueFaulted is true (but internal) so we use our
+            // own exception holder (see Lazy<T> source code) to return null
+            if (lazy.Value is ExceptionHolder) return null;
+
+            // we have a value and execution has not thrown so returning
+            // here does not throw - unless we're re-entering, take care of it
            try
            {
-                // if onlyIfValueIsCreated, do not trigger value creation
-                // must return something, though, to differenciate from null values
-                if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
                return lazy.Value;
            }
-            catch
+            catch (InvalidOperationException e)
            {
-                return null;
+                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
            }
        }

+        internal class ExceptionHolder
+        {
+            public ExceptionHolder(Exception e)
+            {
+                Exception = e;
+            }
+
+            public Exception Exception { get; private set; }
+        }
+
        #region Clear

        public virtual void ClearAllCache()
@@ -68,6 +105,9 @@ namespace Umbraco.Core.Cache

        public virtual void ClearCacheObjectTypes(string typeName)
        {
+            var type = TypeFinder.GetTypeByName(typeName);
+            if (type == null) return;
+            var isInterface = type.IsInterface;
            using (WriteLock)
            {
                foreach (var entry in GetDictionaryEntries()
@@ -77,7 +117,10 @@ namespace Umbraco.Core.Cache
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType().ToString().InvariantEquals(typeName);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
                    })
                    .ToArray())
                    RemoveEntry((string) entry.Key);
@@ -87,6 +130,7 @@ namespace Umbraco.Core.Cache
        public virtual void ClearCacheObjectTypes<T>()
        {
            var typeOfT = typeof(T);
+            var isInterface = typeOfT.IsInterface;
            using (WriteLock)
            {
                foreach (var entry in GetDictionaryEntries()
@@ -97,7 +141,10 @@ namespace Umbraco.Core.Cache
                        // compare on exact type, don't use "is"
                        // get non-created as NonCreatedValue & exceptions as null
                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType() == typeOfT;
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
                    })
                    .ToArray())
                    RemoveEntry((string) entry.Key);
@@ -107,6 +154,7 @@ namespace Umbraco.Core.Cache
        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
        {
            var typeOfT = typeof(T);
+            var isInterface = typeOfT.IsInterface;
            var plen = CacheItemPrefix.Length + 1;
            using (WriteLock)
            {
@@ -119,9 +167,12 @@ namespace Umbraco.Core.Cache
                        // get non-created as NonCreatedValue & exceptions as null
                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
                        if (value == null) return true;
-                        return value.GetType() == typeOfT
-                            // run predicate on the 'public key' part only, ie without prefix
-                            && predicate(((string)x.Key).Substring(plen), (T)value);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return (isInterface ? (value is T) : (value.GetType() == typeOfT))
+                               // run predicate on the 'public key' part only, ie without prefix
+                               && predicate(((string) x.Key).Substring(plen), (T) value);
                    }))
                    RemoveEntry((string) entry.Key);
            }
@@ -102,20 +102,27 @@ namespace Umbraco.Core.Cache
                // cannot create value within the lock, so if result.IsValueCreated is false, just
                // do nothing here - means that if creation throws, a race condition could cause
                // more than one thread to reach the return statement below and throw - accepted.
-                
+
                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = new Lazy<object>(getCacheItem);
+                    result = GetSafeLazy(getCacheItem);
                    ContextItems[cacheKey] = result;
                }
            }

-            // this may throw if getCacheItem throws, but this is the only place where
-            // it would throw as everywhere else we use GetLazySaveValue() to hide exceptions
-            // and pretend exceptions were never inserted into cache to begin with.
-            return result.Value;
+            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
+            // exceptions (but try again and again) and silently eat them - however at
+            // some point we have to report them - so need to re-throw here
+
+            // this does not throw anymore
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            var eh = value as ExceptionHolder;
+            if (eh != null) throw eh.Exception; // throw once!
+            return value;
        }
-        
+
        #endregion

        #region Insert
@@ -20,16 +20,22 @@ namespace Umbraco.Core.Cache

        private readonly System.Web.Caching.Cache _cache;

+        /// <summary>
+        /// Used for debugging
+        /// </summary>
+        internal Guid InstanceId { get; private set; }
+
        public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
        {
            _cache = cache;
+            InstanceId = Guid.NewGuid();
        }

        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
        {
            const string prefix = CacheItemPrefix + "-";
            return _cache.Cast<DictionaryEntry>()
-                .Where(x => x.Key is string && ((string) x.Key).StartsWith(prefix));
+                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
        }

        protected override void RemoveEntry(string key)
@@ -129,19 +135,27 @@ namespace Umbraco.Core.Cache

                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = new Lazy<object>(getCacheItem);
+                    result = GetSafeLazy(getCacheItem);
                    var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
                    var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);

                    lck.UpgradeToWriteLock();
+                    //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
                    _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
                }
            }

-            // this may throw if getCacheItem throws, but this is the only place where
-            // it would throw as everywhere else we use GetLazySaveValue() to hide exceptions
-            // and pretend exceptions were never inserted into cache to begin with.
-            return result.Value;
+            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
+            // exceptions (but try again and again) and silently eat them - however at
+            // some point we have to report them - so need to re-throw here
+
+            // this does not throw anymore
+            //return result.Value;
+
+            value = result.Value; // will not throw (safe lazy)
+            var eh = value as ExceptionHolder;
+            if (eh != null) throw eh.Exception; // throw once!
+            return value;
        }

        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
@@ -173,17 +187,18 @@ namespace Umbraco.Core.Cache
            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
            // and make sure we don't store a null value.

-            var result = new Lazy<object>(getCacheItem);
+            var result = GetSafeLazy(getCacheItem);
            var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
            if (value == null) return; // do not store null values (backward compat)

-            cacheKey = GetCacheKey(cacheKey);           
+            cacheKey = GetCacheKey(cacheKey);

            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);

            using (new WriteLock(_locker))
            {
+                //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
                _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
            }
        }
@@ -8,13 +8,51 @@ namespace Umbraco.Core.Cache
    /// </summary>
    public interface ICacheProvider
    {
+        /// <summary>
+        /// Removes all items from the cache.
+        /// </summary>
        void ClearAllCache();
+
+        /// <summary>
+        /// Removes an item from the cache, identified by its key.
+        /// </summary>
+        /// <param name="key">The key of the item.</param>
        void ClearCacheItem(string key);
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type.
+        /// </summary>
+        /// <param name="typeName">The name of the type to remove.</param>
+        /// <remarks>
+        /// <para>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</para>
+        /// <para>Performs a case-sensitive search.</para>
+        /// </remarks>
        void ClearCacheObjectTypes(string typeName);
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of the items to remove.</typeparam>
+        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</remarks>
        void ClearCacheObjectTypes<T>();
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type, satisfying a predicate.
+        /// </summary>
+        /// <typeparam name="T">The type of the items to remove.</typeparam>
+        /// <param name="predicate">The predicate to satisfy.</param>
+        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</remarks>
        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
+
        void ClearCacheByKeySearch(string keyStartsWith);
        void ClearCacheByKeyExpression(string regexString);
+
        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
        
@@ -0,0 +1,16 @@
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache refresher that supports refreshing cache based on a custom payload
+    /// </summary>
+    interface IPayloadCacheRefresher : IJsonCacheRefresher
+    {
+        /// <summary>
+        /// Refreshes, clears, etc... any cache based on the information provided in the payload
+        /// </summary>
+        /// <param name="payload"></param>
+        void Refresh(object payload);
+    }
+}
@@ -4,17 +4,16 @@ using umbraco.interfaces;
 namespace Umbraco.Core.Cache
 {
    /// <summary>
-    /// A base class for json cache refreshers that ensures the correct events are raised when 
-    /// cache refreshing occurs.
+    /// Provides a base class for "json" cache refreshers.
    /// </summary>
-    /// <typeparam name="TInstanceType">The real cache refresher type, this is used for raising strongly typed events</typeparam>
-    public abstract class JsonCacheRefresherBase<TInstanceType> : CacheRefresherBase<TInstanceType>, IJsonCacheRefresher 
-        where TInstanceType : ICacheRefresher
+    /// <typeparam name="TInstance">The actual cache refresher type.</typeparam>
+    /// <remarks>Ensures that the correct events are raised when cache refreshing occurs.</remarks>
+    public abstract class JsonCacheRefresherBase<TInstance> : CacheRefresherBase<TInstance>, IJsonCacheRefresher
+        where TInstance : ICacheRefresher
    {        
-
-        public virtual void Refresh(string jsonPayload)
+        public virtual void Refresh(string json)
        {            
-            OnCacheUpdated(Instance, new CacheRefresherEventArgs(jsonPayload, MessageType.RefreshByJson));
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(json, MessageType.RefreshByJson));
        }
    }
 }
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.Caching;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -16,30 +17,19 @@ namespace Umbraco.Core.Cache
    /// </summary>
    internal class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
    {
+
        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
        internal ObjectCache MemoryCache;

-        // an object that represent a value that has not been created yet
-        protected readonly object ValueNotCreated = new object();
+        /// <summary>
+        /// Used for debugging
+        /// </summary>
+        internal Guid InstanceId { get; private set; }

        public ObjectCacheRuntimeCacheProvider()
        {
            MemoryCache = new MemoryCache("in-memory");
-        }
-
-        protected object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
-        {
-            try
-            {
-                // if onlyIfValueIsCreated, do not trigger value creation
-                // must return something, though, to differenciate from null values
-                if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
-                return lazy.Value;
-            }
-            catch
-            {
-                return null;
-            }
+            InstanceId = Guid.NewGuid();
        }

        #region Clear
@@ -59,11 +49,14 @@ namespace Umbraco.Core.Cache
            {
                if (MemoryCache[key] == null) return;
                MemoryCache.Remove(key);
-            }            
+            }
        }

        public virtual void ClearCacheObjectTypes(string typeName)
        {
+            var type = TypeFinder.GetTypeByName(typeName);
+            if (type == null) return;
+            var isInterface = type.IsInterface;
            using (new WriteLock(_locker))
            {
                foreach (var key in MemoryCache
@@ -72,8 +65,11 @@ namespace Umbraco.Core.Cache
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType().ToString().InvariantEquals(typeName);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
                    })
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
@@ -86,14 +82,19 @@ namespace Umbraco.Core.Cache
            using (new WriteLock(_locker))
            {
                var typeOfT = typeof (T);
+                var isInterface = typeOfT.IsInterface;
                foreach (var key in MemoryCache
                    .Where(x =>
                    {
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        return value == null || value.GetType() == typeOfT;
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
+
                    })
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
@@ -106,16 +107,20 @@ namespace Umbraco.Core.Cache
            using (new WriteLock(_locker))
            {
                var typeOfT = typeof(T);
+                var isInterface = typeOfT.IsInterface;
                foreach (var key in MemoryCache
                    .Where(x =>
                    {
                        // x.Value is Lazy<object> and not null, its value may be null
                        // remove null values as well, does not hurt
                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
                        if (value == null) return true;
-                        return value.GetType() == typeOfT
-                            && predicate(x.Key, (T) value);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return (isInterface ? (value is T) : (value.GetType() == typeOfT))
+                               && predicate(x.Key, (T)value);
                    })
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
@@ -132,7 +137,7 @@ namespace Umbraco.Core.Cache
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
                    MemoryCache.Remove(key);
-            }            
+            }
        }

        public virtual void ClearCacheByKeyExpression(string regexString)
@@ -144,7 +149,7 @@ namespace Umbraco.Core.Cache
                    .Select(x => x.Key)
                    .ToArray()) // ToArray required to remove
                    MemoryCache.Remove(key);
-            }     
+            }
        }

        #endregion
@@ -161,7 +166,7 @@ namespace Umbraco.Core.Cache
                    .ToArray(); // evaluate while locked
            }
            return entries
-                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
                .Where(x => x != null) // backward compat, don't store null values in the cache
                .ToList();
        }
@@ -176,7 +181,7 @@ namespace Umbraco.Core.Cache
                    .ToArray(); // evaluate while locked
            }
            return entries
-                .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
                .Where(x => x != null) // backward compat, don't store null values in the cache
                .ToList();
        }
@@ -188,7 +193,7 @@ namespace Umbraco.Core.Cache
            {
                result = MemoryCache.Get(cacheKey) as Lazy<object>; // null if key not found
            }
-            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+            return result == null ? null : DictionaryCacheProviderBase.GetSafeLazyValue(result); // return exceptions as null
        }

        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
@@ -196,7 +201,7 @@ namespace Umbraco.Core.Cache
            return GetCacheItem(cacheKey, getCacheItem, null);
        }

-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal,CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
        {
            // see notes in HttpRuntimeCacheProvider

@@ -205,17 +210,23 @@ namespace Umbraco.Core.Cache
            using (var lck = new UpgradeableReadLock(_locker))
            {
                result = MemoryCache.Get(cacheKey) as Lazy<object>;
-                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                if (result == null || DictionaryCacheProviderBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
-                    result = new Lazy<object>(getCacheItem);
+                    result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);

                    lck.UpgradeToWriteLock();
+                    //NOTE: This does an add or update
                    MemoryCache.Set(cacheKey, result, policy);
                }
            }

-            return result.Value;
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            var eh = value as DictionaryCacheProviderBase.ExceptionHolder;
+            if (eh != null) throw eh.Exception; // throw once!
+            return value;
        }

        #endregion
@@ -227,11 +238,12 @@ namespace Umbraco.Core.Cache
            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
            // and make sure we don't store a null value.

-            var result = new Lazy<object>(getCacheItem);
+            var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
            var value = result.Value; // force evaluation now
            if (value == null) return; // do not store null values (backward compat)

            var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+            //NOTE: This does an add or update
            MemoryCache.Set(cacheKey, result, policy);
        }

@@ -252,7 +264,7 @@ namespace Umbraco.Core.Cache
            {
                policy.ChangeMonitors.Add(new HostFileChangeMonitor(dependentFiles.ToList()));
            }
-            
+
            if (removedCallback != null)
            {
                policy.RemovedCallback = arguments =>
@@ -283,6 +295,5 @@ namespace Umbraco.Core.Cache
            }
            return policy;
        }
-        
    }
 }
@@ -0,0 +1,27 @@
+using Umbraco.Core.Sync;
+using umbraco.interfaces;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Provides a base class for "payload" cache refreshers.
+    /// </summary>
+    /// <typeparam name="TInstance">The actual cache refresher type.</typeparam>
+    /// <remarks>Ensures that the correct events are raised when cache refreshing occurs.</remarks>
+    public abstract class PayloadCacheRefresherBase<TInstance> : JsonCacheRefresherBase<TInstance>, IPayloadCacheRefresher
+        where TInstance : ICacheRefresher
+    {
+        protected abstract object Deserialize(string json);
+
+        public override void Refresh(string json)
+        {
+            var payload = Deserialize(json);
+            Refresh(payload);
+        }
+
+        public virtual void Refresh(object payload)
+        {
+            OnCacheUpdated(Instance, new CacheRefresherEventArgs(payload, MessageType.RefreshByPayload));
+        }
+    }
+}
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;

@@ -12,13 +13,14 @@ namespace Umbraco.Core
 	/// </summary>
 	internal sealed class CacheRefreshersResolver : LegacyTransientObjectsResolver<CacheRefreshersResolver, ICacheRefresher>
 	{
-	
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="refreshers"></param>		
-		internal CacheRefreshersResolver(Func<IEnumerable<Type>> refreshers)
-			: base(refreshers)
+	    /// <summary>
+	    /// Constructor
+	    /// </summary>
+	    /// <param name="serviceProvider"></param>
+	    /// <param name="logger"></param>
+	    /// <param name="refreshers"></param>		
+	    internal CacheRefreshersResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> refreshers)
+            : base(serviceProvider, logger, refreshers)
 		{
 			
 		}
@@ -8,10 +8,13 @@ namespace Umbraco.Core.Configuration
 {
    internal class ClientDependencyConfiguration
    {
+        private readonly ILogger _logger;
        private readonly string _fileName;

-        public ClientDependencyConfiguration()
+        public ClientDependencyConfiguration(ILogger logger)
        {
+            if (logger == null) throw new ArgumentNullException("logger");
+            _logger = logger;
            _fileName = IOHelper.MapPath(string.Format("{0}/ClientDependency.config", SystemDirectories.Config));
        }

@@ -35,13 +38,13 @@ namespace Umbraco.Core.Configuration
                    versionAttribute.SetValue(newVersion);
                    clientDependencyConfigXml.Save(_fileName, SaveOptions.DisableFormatting);

-                    LogHelper.Info<ClientDependencyConfiguration>(string.Format("Updated version number from {0} to {1}", oldVersion, newVersion));
+                    _logger.Info<ClientDependencyConfiguration>(string.Format("Updated version number from {0} to {1}", oldVersion, newVersion));
                    return true;
                }
            }
            catch (Exception ex)
            {
-                LogHelper.Error<ClientDependencyConfiguration>("Couldn't update ClientDependency version number", ex);
+                _logger.Error<ClientDependencyConfiguration>("Couldn't update ClientDependency version number", ex);
            }

            return false;
@@ -36,7 +36,7 @@ namespace Umbraco.Core.Configuration
        //make this volatile so that we can ensure thread safety with a double check lock
    	private static volatile string _reservedUrlsCache;
        private static string _reservedPathsCache;
-        private static StartsWithContainer _reservedList = new StartsWithContainer();
+        private static HashSet<string> _reservedList = new HashSet<string>();
        private static string _reservedPaths;
        private static string _reservedUrls;
        //ensure the built on (non-changeable) reserved paths are there at all times
@@ -174,7 +174,7 @@ namespace Umbraco.Core.Configuration
        /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
        /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
        /// </remarks>
-        internal static string UmbracoMvcArea
+        public static string UmbracoMvcArea
        {
            get
            {
@@ -242,6 +242,7 @@ namespace Umbraco.Core.Configuration
            }
        }

+        //TODO: Move these to constants!
        public const string UmbracoConnectionName = "umbracoDbDSN";
        public const string UmbracoMigrationName = "Umbraco";

@@ -420,14 +421,15 @@ namespace Umbraco.Core.Configuration
        /// Gets a value indicating whether the current version of umbraco is configured.
        /// </summary>
        /// <value><c>true</c> if configured; otherwise, <c>false</c>.</value>
-        public static bool Configured
+        [Obsolete("Do not use this, it is no longer in use and will be removed from the codebase in future versions")]
+        internal static bool Configured
        {
            get
            {
                try
                {
                    string configStatus = ConfigurationStatus;
-                    string currentVersion = UmbracoVersion.Current.ToString(3);
+                    string currentVersion = UmbracoVersion.GetSemanticVersion().ToSemanticString();


                    if (currentVersion != configStatus)
@@ -594,10 +596,7 @@ namespace Umbraco.Core.Configuration
        [Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)]
        public static string CurrentVersion
        {
-            get
-            {
-                return UmbracoVersion.Current.ToString(3);
-            }
+            get { return UmbracoVersion.GetSemanticVersion().ToSemanticString(); }
        }

        /// <summary>
@@ -768,38 +767,31 @@ namespace Umbraco.Core.Configuration
                        // store references to strings to determine changes
                        _reservedPathsCache = GlobalSettings.ReservedPaths;
                        _reservedUrlsCache = GlobalSettings.ReservedUrls;
-
-                        string _root = SystemDirectories.Root.Trim().ToLower();
-
+                        
                        // add URLs and paths to a new list
-                        StartsWithContainer _newReservedList = new StartsWithContainer();
-                        foreach (string reservedUrl in _reservedUrlsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+                        var newReservedList = new HashSet<string>();
+                        foreach (var reservedUrlTrimmed in _reservedUrlsCache
+                            .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
+                            .Select(x => x.Trim().ToLowerInvariant())
+                            .Where(x => x.IsNullOrWhiteSpace() == false)
+                            .Select(reservedUrl => IOHelper.ResolveUrl(reservedUrl).Trim().EnsureStartsWith("/"))
+                            .Where(reservedUrlTrimmed => reservedUrlTrimmed.IsNullOrWhiteSpace() == false))
                        {
-                            if (string.IsNullOrWhiteSpace(reservedUrl))
-                               continue;
-                            
-
-                            //resolves the url to support tilde chars
-                            string reservedUrlTrimmed = IOHelper.ResolveUrl(reservedUrl.Trim()).Trim().ToLower();
-                            if (reservedUrlTrimmed.Length > 0)
-                                _newReservedList.Add(reservedUrlTrimmed);
+                            newReservedList.Add(reservedUrlTrimmed);
                        }

-                        foreach (string reservedPath in _reservedPathsCache.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
+                        foreach (var reservedPathTrimmed in _reservedPathsCache
+                            .Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
+                            .Select(x => x.Trim().ToLowerInvariant())
+                            .Where(x => x.IsNullOrWhiteSpace() == false)
+                            .Select(reservedPath => IOHelper.ResolveUrl(reservedPath).Trim().EnsureStartsWith("/").EnsureEndsWith("/"))
+                            .Where(reservedPathTrimmed => reservedPathTrimmed.IsNullOrWhiteSpace() == false))
                        {
-                            bool trimEnd = !reservedPath.EndsWith("/");
-                            if (string.IsNullOrWhiteSpace(reservedPath))
-                                continue;
-                           
-                            //resolves the url to support tilde chars
-                            string reservedPathTrimmed = IOHelper.ResolveUrl(reservedPath.Trim()).Trim().ToLower();
-
-                            if (reservedPathTrimmed.Length > 0)
-                                _newReservedList.Add(reservedPathTrimmed + (reservedPathTrimmed.EndsWith("/") ? "" : "/"));
+                            newReservedList.Add(reservedPathTrimmed);
                        }

                        // use the new list from now on
-                        _reservedList = _newReservedList;
+                        _reservedList = newReservedList;
                    }
                }
            }
@@ -807,107 +799,17 @@ namespace Umbraco.Core.Configuration
            //The url should be cleaned up before checking:
            // * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/'
            // * We shouldn't be comparing the query at all
-            var pathPart = url.Split('?')[0];
-            if (!pathPart.Contains(".") && !pathPart.EndsWith("/"))
+            var pathPart = url.Split(new[] {'?'}, StringSplitOptions.RemoveEmptyEntries)[0].ToLowerInvariant();
+            if (pathPart.Contains(".") == false)
            {
-                pathPart += "/";
+                pathPart = pathPart.EnsureEndsWith('/');
            }

            // return true if url starts with an element of the reserved list
-            return _reservedList.StartsWith(pathPart.ToLowerInvariant());
+            return _reservedList.Any(x => pathPart.InvariantStartsWith(x));
        }

-        /// <summary>
-        /// Structure that checks in logarithmic time
-        /// if a given string starts with one of the added keys.
-        /// </summary>
-        private class StartsWithContainer
-        {
-            /// <summary>Internal sorted list of keys.</summary>
-            public SortedList<string, string> _list
-                = new SortedList<string, string>(StartsWithComparator.Instance);
-
-            /// <summary>
-            /// Adds the specified new key.
-            /// </summary>
-            /// <param name="newKey">The new key.</param>
-            public void Add(string newKey)
-            {
-                // if the list already contains an element that begins with newKey, return
-                if (String.IsNullOrEmpty(newKey) || StartsWith(newKey))
-                    return;
-
-                // create a new collection, so the old one can still be accessed
-                SortedList<string, string> newList
-                    = new SortedList<string, string>(_list.Count + 1, StartsWithComparator.Instance);
-
-                // add only keys that don't already start with newKey, others are unnecessary
-                foreach (string key in _list.Keys)
-                    if (!key.StartsWith(newKey))
-                        newList.Add(key, null);
-                // add the new key
-                newList.Add(newKey, null);
-
-                // update the list (thread safe, _list was never in incomplete state)
-                _list = newList;
-            }
-
-            /// <summary>
-            /// Checks if the given string starts with any of the added keys.
-            /// </summary>
-            /// <param name="target">The target.</param>
-            /// <returns>true if a key is found that matches the start of target</returns>
-            /// <remarks>
-            /// Runs in O(s*log(n)), with n the number of keys and s the length of target.
-            /// </remarks>
-            public bool StartsWith(string target)
-            {
-                return _list.ContainsKey(target);
-            }
-
-            /// <summary>Comparator that tests if a string starts with another.</summary>
-            /// <remarks>Not a real comparator, since it is not reflexive. (x==y does not imply y==x)</remarks>
-            private sealed class StartsWithComparator : IComparer<string>
-            {
-                /// <summary>Default string comparer.</summary>
-                private readonly static Comparer<string> _stringComparer = Comparer<string>.Default;
-
-                /// <summary>Gets an instance of the StartsWithComparator.</summary>
-                public static readonly StartsWithComparator Instance = new StartsWithComparator();
-
-                /// <summary>
-                /// Tests if whole begins with all characters of part.
-                /// </summary>
-                /// <param name="part">The part.</param>
-                /// <param name="whole">The whole.</param>
-                /// <returns>
-                /// Returns 0 if whole starts with part, otherwise performs standard string comparison.
-                /// </returns>
-                public int Compare(string part, string whole)
-                {
-                    // let the default string comparer deal with null or when part is not smaller then whole
-                    if (part == null || whole == null || part.Length >= whole.Length)
-                        return _stringComparer.Compare(part, whole);
-
-                    ////ensure both have a / on the end
-                    //part = part.EndsWith("/") ? part : part + "/"; 
-                    //whole = whole.EndsWith("/") ? whole : whole + "/";
-                    //if (part.Length >= whole.Length)
-                    //    return _stringComparer.Compare(part, whole);
-
-                    // loop through all characters that part and whole have in common
-                    int pos = 0;
-                    bool match;
-                    do
-                    {
-                        match = (part[pos] == whole[pos]);
-                    } while (match && ++pos < part.Length);
-
-                    // return result of last comparison
-                    return match ? 0 : (part[pos] < whole[pos] ? -1 : 1);
-                }
-            }
-        }
+      

    }

@@ -0,0 +1,16 @@
+using System.IO;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    class GridConfig : IGridConfig
+    {
+        public GridConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+        {
+            EditorsConfig = new GridEditorsConfig(logger, runtimeCache, appPlugins, configFolder, isDebug);
+        }
+
+        public IGridEditorsConfig EditorsConfig { get; private set; }
+    }
+}
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    class GridEditorsConfig : IGridEditorsConfig
+    {
+        private readonly ILogger _logger;
+        private readonly IRuntimeCacheProvider _runtimeCache;
+        private readonly DirectoryInfo _appPlugins;
+        private readonly DirectoryInfo _configFolder;
+        private readonly bool _isDebug;
+
+        public GridEditorsConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+        {
+            _logger = logger;
+            _runtimeCache = runtimeCache;
+            _appPlugins = appPlugins;
+            _configFolder = configFolder;
+            _isDebug = isDebug;
+        }
+
+        public IEnumerable<IGridEditorConfig> Editors
+        {
+            get
+            {
+                Func<List<GridEditor>> getResult = () =>
+                {
+                    var editors = new List<GridEditor>();
+                    var gridConfig = Path.Combine(_configFolder.FullName, "grid.editors.config.js");
+                    if (File.Exists(gridConfig))
+                    {
+                        try
+                        {
+                            var arr = JArray.Parse(File.ReadAllText(gridConfig));
+                            //ensure the contents parse correctly to objects
+                            var parsed = ManifestParser.GetGridEditors(arr);
+                            editors.AddRange(parsed);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Error<GridEditorsConfig>("Could not parse the contents of grid.editors.config.js into a JSON array", ex);
+                        }
+                    }
+
+                    var parser = new ManifestParser(_appPlugins, _runtimeCache);
+                    var builder = new ManifestBuilder(_runtimeCache, parser);
+                    foreach (var gridEditor in builder.GridEditors)
+                    {
+                        //no duplicates! (based on alias)
+                        if (editors.Contains(gridEditor) == false)
+                        {
+                            editors.Add(gridEditor);
+                        }
+                    }
+                    return editors;
+                };
+
+                //cache the result if debugging is disabled
+                var result = _isDebug
+                    ? getResult()
+                    : _runtimeCache.GetCacheItem<List<GridEditor>>(
+                        typeof(GridEditorsConfig) + "Editors",
+                        () => getResult(),
+                        TimeSpan.FromMinutes(10));
+
+                return result;
+            }
+            
+        }
+    }
+}
@@ -0,0 +1,14 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    public interface IGridConfig
+    {
+
+        IGridEditorsConfig EditorsConfig { get; }
+
+    }
+}
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    public interface IGridEditorConfig
+    {
+        string Name { get; }
+        string Alias { get; }
+        string View { get; }
+        string Render { get; }
+        string Icon { get; }
+        IDictionary<string, object> Config { get; }
+    }
+}
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Grid
+{
+    public interface IGridEditorsConfig
+    {
+        IEnumerable<IGridEditorConfig> Editors { get; }
+    }
+}
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Configuration
        {
            get
            {
-                var converted = ObjectExtensions.TryConvertTo<T>(RawValue);
+                var converted = RawValue.TryConvertTo<T>();
                if (converted.Success == false)
                    throw new InvalidCastException("Could not convert value " + RawValue + " to type " + typeof(T));
                return converted.Result;
@@ -2,10 +2,13 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Threading;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration.BaseRest;
 using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;

@@ -67,6 +70,7 @@ namespace Umbraco.Core.Configuration
        private IDashboardSection _dashboardSection;
        private IUmbracoSettingsSection _umbracoSettings;
        private IBaseRestSection _baseRestExtensions;
+        private IGridConfig _gridConfig;

        /// <summary>
        /// Gets the IDashboardSection
@@ -83,14 +87,20 @@ namespace Umbraco.Core.Configuration
            return _dashboardSection;
        }        

-        //ONLY for unit testing
+        /// <summary>
+        /// Only for testing
+        /// </summary>
+        /// <param name="value"></param>
        internal void SetDashboardSettings(IDashboardSection value)
        {
            _dashboardSection = value;
        }

-        //ONLY for unit testing
-        internal void SetUmbracoSettings(IUmbracoSettingsSection value)
+        /// <summary>
+        /// Only for testing
+        /// </summary>
+        /// <param name="value"></param>
+        public void SetUmbracoSettings(IUmbracoSettingsSection value)
        {
            _umbracoSettings = value;
        }
@@ -110,7 +120,10 @@ namespace Umbraco.Core.Configuration
            return _umbracoSettings;
        }
        
-        //ONLY for unit testing
+        /// <summary>
+        /// Only for testing
+        /// </summary>
+        /// <param name="value"></param>
        public void SetBaseRestExtensions(IBaseRestSection value)
        {
            _baseRestExtensions = value;
@@ -131,6 +144,28 @@ namespace Umbraco.Core.Configuration
            return _baseRestExtensions;
        }

+        /// <summary>
+        /// Only for testing
+        /// </summary>
+        /// <param name="value"></param>
+        public void SetGridConfig(IGridConfig value)
+        {
+            _gridConfig = value;
+        }
+
+        /// <summary>
+        /// Gets the IGridConfig
+        /// </summary>
+        public IGridConfig GridConfig(ILogger logger, IRuntimeCacheProvider runtimeCache, DirectoryInfo appPlugins, DirectoryInfo configFolder, bool isDebug)
+        {
+            if (_gridConfig == null)
+            {
+                _gridConfig = new GridConfig(logger, runtimeCache, appPlugins, configFolder, isDebug);
+            }
+
+            return _gridConfig;
+        }
+
        //TODO: Add other configurations here !
    }
 }
@@ -1,8 +1,9 @@
-using System.Xml.Linq;
+using System;
+using System.Xml.Linq;

 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class ContentErrorPageElement : InnerTextConfigurationElement<int>, IContentErrorPage
+    internal class ContentErrorPageElement : InnerTextConfigurationElement<string>, IContentErrorPage
    {
        public ContentErrorPageElement(XElement rawXml)
            : base(rawXml)
@@ -14,7 +15,43 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            
        }

+        public bool HasContentId
+        {
+            get { return ContentId != int.MinValue; }
+        }
+
+        public bool HasContentKey
+        {
+            get { return ContentKey != Guid.Empty; }
+        }
+
        public int ContentId
+        {
+            get
+            {
+                int parsed;
+                if (int.TryParse(Value, out parsed))
+                {
+                    return parsed;
+                }
+                return int.MinValue;
+            }
+        }
+
+        public Guid ContentKey
+        {
+            get
+            {
+                Guid parsed;
+                if (Guid.TryParse(Value, out parsed))
+                {
+                    return parsed;
+                }
+                return Guid.Empty;
+            }
+        }
+
+        public string ContentXPath
        {
            get { return Value; }
        }
@@ -1,8 +1,14 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
 {
    public interface IContentErrorPage
    {
        int ContentId { get; }
+        Guid ContentKey { get; }
+        string ContentXPath { get; }
+        bool HasContentId { get; }
+        bool HasContentKey { get; }
        string Culture { get; set; }
    }
 }
@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
 {
    public interface ITemplatesSection : IUmbracoConfigurationSection
    {
@@ -8,6 +10,7 @@

        RenderingEngine DefaultRenderingEngine { get; }

+        [Obsolete("This has no affect and will be removed in future versions")]
        bool EnableTemplateFolders { get; }
    }
 }
@@ -6,7 +6,13 @@

        bool InternalRedirectPreservesTemplate { get; }

+        bool DisableAlternativeTemplates { get; }
+
+        bool DisableFindContentByIdPath { get; }
+
        string UrlProviderMode { get; }
+
+        string UmbracoApplicationUrl { get; }
    }

 }
@@ -1,4 +1,5 @@
-using System.Configuration;
+using System;
+using System.Configuration;

 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
@@ -40,6 +41,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            }
        }

+        [Obsolete("This has no affect and will be removed in future versions")]
        [ConfigurationProperty("enableTemplateFolders")]
        internal InnerTextConfigurationElement<bool> EnableTemplateFolders
        {
@@ -67,6 +69,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            get { return DefaultRenderingEngine; }
        }

+        [Obsolete("This has no affect and will be removed in future versions")]
        bool ITemplatesSection.EnableTemplateFolders
        {
            get { return EnableTemplateFolders; }
@@ -16,11 +16,27 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            get { return (bool) base["internalRedirectPreservesTemplate"]; }
        }

+        [ConfigurationProperty("disableAlternativeTemplates", DefaultValue = "false")]
+        public bool DisableAlternativeTemplates
+        {
+            get { return (bool) base["disableAlternativeTemplates"]; }
+        }
+        [ConfigurationProperty("disableFindContentByIdPath", DefaultValue = "false")]
+        public bool DisableFindContentByIdPath
+        {
+            get { return (bool) base["disableFindContentByIdPath"]; }
+        }
+
        [ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
        public string UrlProviderMode
        {
-            get { return (string)base["urlProviderMode"]; }
+            get { return (string) base["urlProviderMode"]; }
        }

+        [ConfigurationProperty("umbracoApplicationUrl", DefaultValue = null)]
+        public string UmbracoApplicationUrl
+        {
+            get { return (string)base["umbracoApplicationUrl"]; }
+        }
    }
 }
@@ -1,11 +1,12 @@
 using System;
 using System.Reflection;
+using Semver;

 namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.2.2");
+        private static readonly Version Version = new Version("7.3.3");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -28,5 +29,15 @@ namespace Umbraco.Core.Configuration
        // 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
        public static string AssemblyVersion { get { return new AssemblyName(typeof(ActionsResolver).Assembly.FullName).Version.ToString(); } }
+
+        public static SemVersion GetSemanticVersion()
+        {
+            return new SemVersion(
+                Current.Major, 
+                Current.Minor,
+                Current.Build, 
+                CurrentComment.IsNullOrWhiteSpace() ? null : CurrentComment,
+                Current.Revision > 0 ? Current.Revision.ToInvariantString() : null);
+        }
    }
 }
@@ -43,7 +43,7 @@
 			public const string Users = "users";

            /// <summary>
-            /// Application alias for the users section.
+            /// Application alias for the forms section.
            /// </summary>
            public const string Forms = "forms";
 		}
@@ -78,12 +78,12 @@
 			/// </summary>
 			public const string Dictionary = "dictionary";

-            //TODO: Fill in the rest!
+            public const string Stylesheets = "stylesheets";

            /// <summary>
-            /// alias for the media tree.
+            /// alias for the template tree.
            /// </summary>
-            public const string Templates = "template";
+            public const string Templates = "templates";

            public const string RelationTypes = "relationTypes";

@@ -91,6 +91,7 @@

            public const string Languages = "languages";

+            //TODO: Fill in the rest!
        }
 	}

@@ -11,6 +11,26 @@ namespace Umbraco.Core
 		/// </summary>
 		public static class Conventions
 		{
+		    public static class PublicAccess
+		    {
+                public const string MemberUsernameRuleType = "MemberUsername";               
+                public const string MemberRoleRuleType = "MemberRole";
+
+                [Obsolete("No longer supported, this is here for backwards compatibility only")]
+                public const string MemberIdRuleType = "MemberId";
+                [Obsolete("No longer supported, this is here for backwards compatibility only")]
+                public const string MemberGroupIdRuleType = "MemberGroupId";
+		    }
+
+		    public static class Localization
+		    {
+                /// <summary>
+                /// The root id for all top level dictionary items
+                /// </summary>
+                [Obsolete("There is no dictionary root item id anymore, it is simply null")]
+                public const string DictionaryItemRootId = "41c7638d-f529-4bff-853e-59a0c2fb1bde";
+		    }
+
 		    public static class DataTypes
 		    {
 		        public const string ListViewPrefix = "List View - ";
@@ -192,73 +212,64 @@ namespace Umbraco.Core
 		                {
 		                    {
 		                        Comments,
-		                        new PropertyType(PropertyEditors.TextboxMultipleAlias, DataTypeDatabaseType.Ntext, true)
+		                        new PropertyType(PropertyEditors.TextboxMultipleAlias, DataTypeDatabaseType.Ntext, true, Comments)
 		                            {
-		                                Alias = Comments,
 		                                Name = CommentsLabel
 		                            }
 		                    },
 		                    {
 		                        FailedPasswordAttempts,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Integer, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Integer, true, FailedPasswordAttempts)
 		                            {
-		                                Alias = FailedPasswordAttempts,
 		                                Name = FailedPasswordAttemptsLabel
 		                            }
 		                    },
 		                    {
 		                        IsApproved,
-		                        new PropertyType(PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, true)
+		                        new PropertyType(PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, true, IsApproved)
 		                            {
-		                                Alias = IsApproved,
 		                                Name = IsApprovedLabel
 		                            }
 		                    },
 		                    {
 		                        IsLockedOut,
-		                        new PropertyType(PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, true)
+		                        new PropertyType(PropertyEditors.TrueFalseAlias, DataTypeDatabaseType.Integer, true, IsLockedOut)
 		                            {
-		                                Alias = IsLockedOut,
 		                                Name = IsLockedOutLabel
 		                            }
 		                    },
 		                    {
 		                        LastLockoutDate,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true, LastLockoutDate)
 		                            {
-		                                Alias = LastLockoutDate,
 		                                Name = LastLockoutDateLabel
 		                            }
 		                    },
 		                    {
 		                        LastLoginDate,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true, LastLoginDate)
 		                            {
-		                                Alias = LastLoginDate,
 		                                Name = LastLoginDateLabel
 		                            }
 		                    },
 		                    {
 		                        LastPasswordChangeDate,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Date, true, LastPasswordChangeDate)
 		                            {
-		                                Alias = LastPasswordChangeDate,
 		                                Name = LastPasswordChangeDateLabel
 		                            }
 		                    },
 		                    {
 		                        PasswordAnswer,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Nvarchar, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Nvarchar, true, PasswordAnswer)
 		                            {
-		                                Alias = PasswordAnswer,
 		                                Name = PasswordAnswerLabel
 		                            }
 		                    },
 		                    {
 		                        PasswordQuestion,
-		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Nvarchar, true)
+		                        new PropertyType(PropertyEditors.NoEditAlias, DataTypeDatabaseType.Nvarchar, true, PasswordQuestion)
 		                            {
-		                                Alias = PasswordQuestion,
 		                                Name = PasswordQuestionLabel
 		                            }
 		                    }
@@ -293,7 +304,7 @@ namespace Umbraco.Core
 			}
            
            /// <summary>
-            /// Defines the alias identifiers for Umbraco relation types.
+            /// Defines the alias identifiers for built-in Umbraco relation types.
            /// </summary>
            public static class RelationTypes
            {
@@ -306,6 +317,16 @@ namespace Umbraco.Core
                /// ContentType alias for default relation type "Relate Document On Copy".
                /// </summary>
                public const string RelateDocumentOnCopyAlias = "relateDocumentOnCopy";
+
+                /// <summary>
+                /// ContentType name for default relation type "Relate Parent Document On Delete".
+                /// </summary>
+                public const string RelateParentDocumentOnDeleteName = "Relate Parent Document On Delete";
+
+                /// <summary>
+                /// ContentType alias for default relation type "Relate Parent Document On Delete".
+                /// </summary>
+                public const string RelateParentDocumentOnDeleteAlias = "relateParentDocumentOnDelete";
            }
 		}
 	}
@@ -1,86 +1,97 @@
-namespace Umbraco.Core
+using System;
+
+namespace Umbraco.Core
 {
-	public static partial class Constants
-	{
-		/// <summary>
-		/// Defines the identifiers for Umbraco object types as constants for easy centralized access/management.
-		/// </summary>
-		public static class ObjectTypes
-		{
-			/// <summary>
-			/// Guid for a Content Item object.
-			/// </summary>
-			public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A";
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Defines the identifiers for Umbraco object types as constants for easy centralized access/management.
+        /// </summary>
+        public static class ObjectTypes
+        {
+            /// <summary>
+            /// Guid for a Content Item object.
+            /// </summary>
+            public const string ContentItem = "10E2B09F-C28B-476D-B77A-AA686435E44A";

-			/// <summary>
-			/// Guid for a Content Item Type object.
-			/// </summary>
-			public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532";
+            /// <summary>
+            /// Guid for a Content Item Type object.
+            /// </summary>
+            public const string ContentItemType = "7A333C54-6F43-40A4-86A2-18688DC7E532";

-			/// <summary>
-			/// Guid for the Content Recycle Bin.
-			/// </summary>
-			public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8";
+            /// <summary>
+            /// Guid for the Content Recycle Bin.
+            /// </summary>
+            public const string ContentRecycleBin = "01BB7FF2-24DC-4C0C-95A2-C24EF72BBAC8";

-			/// <summary>
-			/// Guid for a DataType object.
-			/// </summary>
-			public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C";
+            /// <summary>
+            /// Guid for a DataType object.
+            /// </summary>
+            public const string DataType = "30A2A501-1978-4DDB-A57B-F7EFED43BA3C";

-			/// <summary>
-			/// Guid for a Document object.
-			/// </summary>
-			public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
+            /// <summary>
+            /// Guid for a Document object.
+            /// </summary>
+            public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";

-			/// <summary>
-			/// Guid for a Document Type object.
-			/// </summary>
-			public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB";
+            /// <summary>
+            /// Guid for a Document Type object.
+            /// </summary>
+            public const string DocumentType = "A2CB7800-F571-4787-9638-BC48539A0EFB";

-			/// <summary>
-			/// Guid for a Media object.
-			/// </summary>
-			public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C";
+            /// <summary>
+            /// Guid for a Media object.
+            /// </summary>
+            public const string Media = "B796F64C-1F99-4FFB-B886-4BF4BC011A9C";

-			/// <summary>
-			/// Guid for the Media Recycle Bin.
-			/// </summary>
-			public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113";
+            /// <summary>
+            /// Guid for the Media Recycle Bin.
+            /// </summary>
+            public const string MediaRecycleBin = "CF3D8E34-1C1C-41e9-AE56-878B57B32113";

-			/// <summary>
-			/// Guid for a Media Type object.
-			/// </summary>
-			public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E";
+            /// <summary>
+            /// Guid for a Media Type object.
+            /// </summary>
+            public const string MediaType = "4EA4382B-2F5A-4C2B-9587-AE9B3CF3602E";

-			/// <summary>
-			/// Guid for a Member object.
-			/// </summary>
-			public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560";
+            /// <summary>
+            /// Guid for a Member object.
+            /// </summary>
+            public const string Member = "39EB0F98-B348-42A1-8662-E7EB18487560";

-			/// <summary>
-			/// Guid for a Member Group object.
-			/// </summary>
-			public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";
+            /// <summary>
+            /// Guid for a Member Group object.
+            /// </summary>
+            public const string MemberGroup = "366E63B9-880F-4E13-A61C-98069B029728";

-			/// <summary>
-			/// Guid for a Member Type object.
-			/// </summary>
-			public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43";
+            /// <summary>
+            /// Guid for a Member Type object.
+            /// </summary>
+            public const string MemberType = "9B5416FB-E72F-45A9-A07B-5A9A2709CE43";

-			/// <summary>
-			/// Guid for a Stylesheet object.
-			/// </summary>
-			public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840";
+            /// <summary>
+            /// Guid for a Stylesheet object.
+            /// </summary>
+            [Obsolete("This no longer exists in the database")]
+            public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840";

-			/// <summary>
-			/// Guid for the System Root.
-			/// </summary>
-			public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D";
+            [Obsolete("This no longer exists in the database")]
+            internal const string StylesheetProperty = "5555da4f-a123-42b2-4488-dcdfb25e4111";

-			/// <summary>
-			/// Guid for a Template object.
-			/// </summary>
-			public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D";
-		}
-	}
+            /// <summary>
+            /// Guid for the System Root.
+            /// </summary>
+            public const string SystemRoot = "EA7D8624-4CFE-4578-A871-24AA946BF34D";
+
+            /// <summary>
+            /// Guid for a Template object.
+            /// </summary>
+            public const string Template = "6FBDE604-4178-42CE-A10B-8A2600A2F07D";
+
+            /// <summary>
+            /// Guid for a Lock object.
+            /// </summary>
+            public const string LockObject = "87A9F1FF-B1E4-4A25-BABB-465A4A47EC41";
+        }
+    }
 }
@@ -310,13 +310,13 @@ namespace Umbraco.Core
            public const string TextboxAlias = "Umbraco.Textbox";

            /// <summary>
-            /// Guid for the Textbox multiple datatype.
+            /// Guid for the Textarea datatype.
            /// </summary>
            [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
            public const string TextboxMultiple = "67DB8357-EF57-493E-91AC-936D305E0F2A";

            /// <summary>
-            /// Alias for the Textbox multiple datatype.
+            /// Alias for the Textarea datatype.
            /// </summary>
            public const string TextboxMultipleAlias = "Umbraco.TextboxMultiple";

@@ -26,6 +26,8 @@
            public const int DefaultMediaListViewDataTypeId = -96;
            public const int DefaultMembersListViewDataTypeId = -97;

+            // identifiers for lock objects
+		    public const int ServersLock = -331;
 		}
 	}
 }
@@ -1,4 +1,7 @@
-namespace Umbraco.Core
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core
 {
 	public static partial class Constants
 	{		
@@ -15,8 +18,35 @@
            /// <summary>
            /// The auth cookie name
            /// </summary>
+            [Obsolete("DO NOT USE THIS, USE ISecuritySection.AuthCookieName, this will be removed in future versions")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
            public const string AuthCookieName = "UMB_UCONTEXT";

        }
+
+	    public static class Security
+	    {
+
+            public const string BackOfficeAuthenticationType = "UmbracoBackOffice";
+	        public const string BackOfficeExternalAuthenticationType = "UmbracoExternalCookie";
+            public const string BackOfficeExternalCookieName = "UMB_EXTLOGIN";
+            public const string BackOfficeTokenAuthenticationType = "UmbracoBackOfficeToken";
+            public const string BackOfficeTwoFactorAuthenticationType = "UmbracoTwoFactorCookie";
+
+            /// <summary>
+            /// The prefix used for external identity providers for their authentication type
+            /// </summary>
+            /// <remarks>
+            /// By default we don't want to interfere with front-end external providers and their default setup, for back office the 
+            /// providers need to be setup differently and each auth type for the back office will be prefixed with this value
+            /// </remarks>
+            public const string BackOfficeExternalAuthenticationTypePrefix = "Umbraco.";
+
+	        public const string StartContentNodeIdClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/startcontentnode";
+            public const string StartMediaNodeIdClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/startmedianode";
+            public const string AllowedApplicationsClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/allowedapp";
+            public const string SessionIdClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/sessionid";
+
+	    }
 	}
 }
@@ -1,10 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Web;
 using AutoMapper;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Events;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.Models.PublishedContent;
@@ -21,6 +26,7 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Publishing;
 using Umbraco.Core.Macros;
+using Umbraco.Core.Manifest;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 using Umbraco.Core.Strings;
@@ -29,101 +35,165 @@ using MigrationsVersionFourNineZero = Umbraco.Core.Persistence.Migrations.Upgrad
 namespace Umbraco.Core
 {
    /// <summary>
-	/// A bootstrapper for the Umbraco application which initializes all objects for the Core of the application 
-	/// </summary>
-	/// <remarks>
-	/// This does not provide any startup functionality relating to web objects
-	/// </remarks>
-	public class CoreBootManager : IBootManager
-	{
-
-		private DisposableTimer _timer;
-		private bool _isInitialized = false;
-		private bool _isStarted = false;
-		private bool _isComplete = false;
+    /// A bootstrapper for the Umbraco application which initializes all objects for the Core of the application 
+    /// </summary>
+    /// <remarks>
+    /// This does not provide any startup functionality relating to web objects
+    /// </remarks>
+    public class CoreBootManager : IBootManager
+    {
+        protected ProfilingLogger ProfilingLogger { get; private set; }
+        private DisposableTimer _timer;
+        private bool _isInitialized = false;
+        private bool _isStarted = false;
+        private bool _isComplete = false;
+        private readonly IServiceProvider _serviceProvider = new ActivatorServiceProvider();
        private readonly UmbracoApplicationBase _umbracoApplication;
-		protected ApplicationContext ApplicationContext { get; set; }
-        protected CacheHelper ApplicationCache { get; set; }
+        protected ApplicationContext ApplicationContext { get; private set; }
+        protected CacheHelper ApplicationCache { get; private set; }
+        protected PluginManager PluginManager { get; private set; }

-	    protected UmbracoApplicationBase UmbracoApplication
-	    {
-	        get { return _umbracoApplication; }
-	    }
+        protected UmbracoApplicationBase UmbracoApplication
+        {
+            get { return _umbracoApplication; }
+        }

-	    public CoreBootManager(UmbracoApplicationBase umbracoApplication)
-        {            
+        protected IServiceProvider ServiceProvider
+        {
+            get { return _serviceProvider; }
+        }
+
+        public CoreBootManager(UmbracoApplicationBase umbracoApplication)
+        {
            if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication");
            _umbracoApplication = umbracoApplication;
        }

-	    public virtual IBootManager Initialize()
-		{
-			if (_isInitialized)
-				throw new InvalidOperationException("The boot manager has already been initialized");
+        internal CoreBootManager(UmbracoApplicationBase umbracoApplication, ProfilingLogger logger)
+        {
+            if (umbracoApplication == null) throw new ArgumentNullException("umbracoApplication");
+            if (logger == null) throw new ArgumentNullException("logger");
+            _umbracoApplication = umbracoApplication;
+            ProfilingLogger = logger;
+        }

-	        InitializeProfilerResolver();
+        public virtual IBootManager Initialize()
+        {
+            if (_isInitialized)
+                throw new InvalidOperationException("The boot manager has already been initialized");

-            _timer = DisposableTimer.DebugDuration<CoreBootManager>("Umbraco application starting", "Umbraco application startup complete");
-            
-	        CreateApplicationCache();
+            InitializeLoggerResolver();
+            InitializeProfilerResolver();
+
+            ProfilingLogger = ProfilingLogger?? new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);
+
+            _timer = ProfilingLogger.TraceDuration<CoreBootManager>(
+                string.Format("Umbraco {0} application starting on {1}", UmbracoVersion.GetSemanticVersion().ToSemanticString(), NetworkHelper.MachineName),
+                "Umbraco application startup complete");
+
+            ApplicationCache = CreateApplicationCache();
+
+            //create and set the plugin manager (I'd much prefer to not use this singleton anymore but many things are using it unfortunately and
+            // the way that it is setup, there must only ever be one per app so without IoC it would be hard to make this not a singleton)
+            PluginManager = new PluginManager(ServiceProvider, ApplicationCache.RuntimeCache, ProfilingLogger);
+            PluginManager.Current = PluginManager;

            //Create the legacy prop-eds mapping
            LegacyPropertyEditorIdToAliasConverter.CreateMappingsForCoreEditors();
            LegacyParameterEditorAliasConverter.CreateMappingsForCoreEditors();

-			//create database and service contexts for the app context
-			var dbFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName);
-		    Database.Mapper = new PetaPocoMapper();
-			var dbContext = new DatabaseContext(dbFactory);
-			var serviceContext = new ServiceContext(
-				new PetaPocoUnitOfWorkProvider(dbFactory), 
-				new FileUnitOfWorkProvider(), 
-				new PublishingStrategy(),
-                ApplicationCache);
+            //create database and service contexts for the app context
+            var dbFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, ProfilingLogger.Logger);
+            Database.Mapper = new PetaPocoMapper();

-            CreateApplicationContext(dbContext, serviceContext);
-
-            InitializeApplicationEventsResolver();
-
-			InitializeResolvers();
+            var dbContext = new DatabaseContext(
+                dbFactory,
+                ProfilingLogger.Logger,
+                SqlSyntaxProviders.CreateDefault(ProfilingLogger.Logger));

            //initialize the DatabaseContext
            dbContext.Initialize();

+            //get the service context
+            var serviceContext = CreateServiceContext(dbContext, dbFactory);
+
+            //set property and singleton from response
+            ApplicationContext.Current = ApplicationContext = CreateApplicationContext(dbContext, serviceContext);
+
+            InitializeApplicationEventsResolver();
+
+            InitializeResolvers();
+
            InitializeModelMappers();

-            //now we need to call the initialize methods
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationInitialized(UmbracoApplication, ApplicationContext));
+            using (ProfilingLogger.DebugDuration<CoreBootManager>(
+                string.Format("Executing {0} IApplicationEventHandler.OnApplicationInitialized", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                "Finished executing IApplicationEventHandler.OnApplicationInitialized"))
+	        {
+                //now we need to call the initialize methods
+                ApplicationEventsResolver.Current.ApplicationEventHandlers
+                    .ForEach(x =>
+                    {
+                        try
+                        {
+                            x.OnApplicationInitialized(UmbracoApplication, ApplicationContext);
+                        }
+                        catch (Exception ex)
+                        {
+                            ProfilingLogger.Logger.Error<CoreBootManager>("An error occurred running OnApplicationInitialized for handler " + x.GetType(), ex);
+                            throw;
+                        }
+                    });
+	        }

-			_isInitialized = true;
+            _isInitialized = true;

-			return this;
-		}
-
-        /// <summary>
-        /// Creates and assigns the application context singleton
-        /// </summary>
-        /// <param name="dbContext"></param>
-        /// <param name="serviceContext"></param>
-        protected virtual void CreateApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
-        {
-            //create the ApplicationContext
-            ApplicationContext = ApplicationContext.Current = new ApplicationContext(dbContext, serviceContext, ApplicationCache);
+            return this;
        }

        /// <summary>
-        /// Creates and assigns the ApplicationCache based on a new instance of System.Web.Caching.Cache
+        /// Creates and returns the service context for the app
        /// </summary>
-        protected virtual void CreateApplicationCache()
+        /// <param name="dbContext"></param>
+        /// <param name="dbFactory"></param>
+        /// <returns></returns>
+        protected virtual ServiceContext CreateServiceContext(DatabaseContext dbContext, IDatabaseFactory dbFactory)
+        {
+            //default transient factory
+            var msgFactory = new TransientMessagesFactory();
+            return new ServiceContext(
+                new RepositoryFactory(ApplicationCache, ProfilingLogger.Logger, dbContext.SqlSyntax, UmbracoConfig.For.UmbracoSettings()),
+                new PetaPocoUnitOfWorkProvider(dbFactory),
+                new FileUnitOfWorkProvider(),
+                new PublishingStrategy(msgFactory, ProfilingLogger.Logger),
+                ApplicationCache,
+                ProfilingLogger.Logger,
+                msgFactory);
+        }
+
+        /// <summary>
+        /// Creates and returns the application context for the app
+        /// </summary>
+        /// <param name="dbContext"></param>
+        /// <param name="serviceContext"></param>
+        protected virtual ApplicationContext CreateApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext)
+        {
+            //create the ApplicationContext
+            return new ApplicationContext(dbContext, serviceContext, ApplicationCache, ProfilingLogger);
+        }
+
+        /// <summary>
+        /// Creates and returns the CacheHelper for the app
+        /// </summary>
+        protected virtual CacheHelper CreateApplicationCache()
        {
            var cacheHelper = new CacheHelper(
-                        new ObjectCacheRuntimeCacheProvider(),
-                        new StaticCacheProvider(),
-                        //we have no request based cache when not running in web-based context
-                        new NullCacheProvider());
+                new ObjectCacheRuntimeCacheProvider(),
+                new StaticCacheProvider(),
+                //we have no request based cache when not running in web-based context
+                new NullCacheProvider());

-            ApplicationCache = cacheHelper;
+            return cacheHelper;
        }

        /// <summary>
@@ -144,18 +214,31 @@ namespace Umbraco.Core
                });
        }

+        /// <summary>
+        /// Special method to initialize the LoggerResolver
+        /// </summary>
+        protected virtual void InitializeLoggerResolver()
+        {
+            LoggerResolver.Current = new LoggerResolver(ProfilingLogger == null ? Logger.CreateWithDefaultLog4NetConfiguration() : ProfilingLogger.Logger)
+            {
+                //This is another special resolver that needs to be resolvable before resolution is frozen
+                //since it is used for profiling the application startup
+                CanResolveBeforeFrozen = true
+            };
+        }
+
        /// <summary>
        /// Special method to initialize the ProfilerResolver
        /// </summary>
        protected virtual void InitializeProfilerResolver()
        {
            //By default we'll initialize the Log profiler (in the web project, we'll override with the web profiler)
-            ProfilerResolver.Current = new ProfilerResolver(new LogProfiler())
-                {
-                    //This is another special resolver that needs to be resolvable before resolution is frozen
-                    //since it is used for profiling the application startup
-                    CanResolveBeforeFrozen = true
-                };
+            ProfilerResolver.Current = new ProfilerResolver(ProfilingLogger == null ? new LogProfiler(LoggerResolver.Current.Logger) : ProfilingLogger.Profiler)
+            {
+                //This is another special resolver that needs to be resolvable before resolution is frozen
+                //since it is used for profiling the application startup
+                CanResolveBeforeFrozen = true
+            };
        }

        /// <summary>
@@ -170,7 +253,9 @@ namespace Umbraco.Core
            //ApplicationStartupHandler.RegisterHandlers();
            //... and set the special flag to let us resolve before frozen resolution
            ApplicationEventsResolver.Current = new ApplicationEventsResolver(
-                PluginManager.Current.ResolveApplicationStartupHandlers())
+                ServiceProvider, 
+                ProfilingLogger.Logger,
+                PluginManager.ResolveApplicationStartupHandlers())
            {
                CanResolveBeforeFrozen = true
            };
@@ -184,49 +269,90 @@ namespace Umbraco.Core
        /// <param name="rootPath">Absolute</param>
        protected virtual void InitializeApplicationRootPath(string rootPath)
        {
-            Umbraco.Core.IO.IOHelper.SetRootDirectory(rootPath);
+            IOHelper.SetRootDirectory(rootPath);
        }

-		/// <summary>
-		/// Fires after initialization and calls the callback to allow for customizations to occur & 
+        /// <summary>
+        /// Fires after initialization and calls the callback to allow for customizations to occur & 
        /// Ensure that the OnApplicationStarting methods of the IApplicationEvents are called
-		/// </summary>
-		/// <param name="afterStartup"></param>
-		/// <returns></returns>
-		public virtual IBootManager Startup(Action<ApplicationContext> afterStartup)
-		{
-			if (_isStarted)
-				throw new InvalidOperationException("The boot manager has already been initialized");
+        /// </summary>
+        /// <param name="afterStartup"></param>
+        /// <returns></returns>
+        public virtual IBootManager Startup(Action<ApplicationContext> afterStartup)
+        {
+            if (_isStarted)
+                throw new InvalidOperationException("The boot manager has already been initialized");

-            //call OnApplicationStarting of each application events handler
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationStarting(UmbracoApplication, ApplicationContext));
+            using (ProfilingLogger.DebugDuration<CoreBootManager>(
+                string.Format("Executing {0} IApplicationEventHandler.OnApplicationStarting", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                "Finished executing IApplicationEventHandler.OnApplicationStarting"))
+		    {
+		        //call OnApplicationStarting of each application events handler
+		        ApplicationEventsResolver.Current.ApplicationEventHandlers
+		            .ForEach(x =>
+		            {
+		                try
+		                {
+		                    x.OnApplicationStarting(UmbracoApplication, ApplicationContext);
+		                }
+		                catch (Exception ex)
+		                {
+                            ProfilingLogger.Logger.Error<CoreBootManager>("An error occurred running OnApplicationStarting for handler " + x.GetType(), ex);
+		                    throw;
+		                }
+		            });
+		    }

-            if (afterStartup != null)
+		    if (afterStartup != null)
            {
                afterStartup(ApplicationContext.Current);
            }

-			_isStarted = true;
+            _isStarted = true;

-			return this;
-		}
+            return this;
+        }

-		/// <summary>
-		/// Fires after startup and calls the callback once customizations are locked
-		/// </summary>
-		/// <param name="afterComplete"></param>
-		/// <returns></returns>
-		public virtual IBootManager Complete(Action<ApplicationContext> afterComplete)
-		{
-			if (_isComplete)
-				throw new InvalidOperationException("The boot manager has already been completed");
-
-		    FreezeResolution();
+        /// <summary>
+        /// Fires after startup and calls the callback once customizations are locked
+        /// </summary>
+        /// <param name="afterComplete"></param>
+        /// <returns></returns>
+        public virtual IBootManager Complete(Action<ApplicationContext> afterComplete)
+        {
+            if (_isComplete)
+                throw new InvalidOperationException("The boot manager has already been completed");
            
-            //call OnApplicationStarting of each application events handler
-            ApplicationEventsResolver.Current.ApplicationEventHandlers
-                .ForEach(x => x.OnApplicationStarted(UmbracoApplication, ApplicationContext));
+            FreezeResolution();
+
+            //Here we need to make sure the db can be connected to
+		    EnsureDatabaseConnection();
+
+
+            //This is a special case for the user service, we need to tell it if it's an upgrade, if so we need to ensure that
+            // exceptions are bubbled up if a user is attempted to be persisted during an upgrade (i.e. when they auth to login)
+            ((UserService) ApplicationContext.Services.UserService).IsUpgrading = true;
+
+
+            using (ProfilingLogger.DebugDuration<CoreBootManager>(
+                string.Format("Executing {0} IApplicationEventHandler.OnApplicationStarted", ApplicationEventsResolver.Current.ApplicationEventHandlers.Count()),
+                "Finished executing IApplicationEventHandler.OnApplicationStarted"))
+            {
+                //call OnApplicationStarting of each application events handler
+                ApplicationEventsResolver.Current.ApplicationEventHandlers
+                    .ForEach(x =>
+                    {
+                        try
+                        {
+                            x.OnApplicationStarted(UmbracoApplication, ApplicationContext);
+                        }
+                        catch (Exception ex)
+                        {
+                            ProfilingLogger.Logger.Error<CoreBootManager>("An error occurred running OnApplicationStarted for handler " + x.GetType(), ex);
+                            throw;
+                        }
+                    }); 
+            }

            //Now, startup all of our legacy startup handler
            ApplicationEventsResolver.Current.InstantiateLegacyStartupHandlers();
@@ -236,16 +362,46 @@ namespace Umbraco.Core
                afterComplete(ApplicationContext.Current);
            }

-			_isComplete = true;
+            _isComplete = true;

            // we're ready to serve content!
            ApplicationContext.IsReady = true;

            //stop the timer and log the output
            _timer.Dispose();
-			return this;
+            return this;
 		}

+        /// <summary>
+        /// We cannot continue if the db cannot be connected to
+        /// </summary>
+        private void EnsureDatabaseConnection()
+        {
+            if (ApplicationContext.IsConfigured == false) return;
+            if (ApplicationContext.DatabaseContext.IsDatabaseConfigured == false) return;
+
+            //try now
+            if (ApplicationContext.DatabaseContext.CanConnect)
+                return;
+
+            var currentTry = 0;
+            while (currentTry < 5)
+            {
+                //first wait, then retry
+                Thread.Sleep(1000);
+
+                if (ApplicationContext.DatabaseContext.CanConnect)
+                    break;
+
+                currentTry++;
+            }
+
+            if (currentTry == 5)
+            {
+                throw new UmbracoStartupFailedException("Umbraco cannot start. A connection string is configured but the Umbraco cannot connect to the database.");
+            }
+        }
+
        /// <summary>
        /// Freeze resolution to not allow Resolvers to be modified
        /// </summary>
@@ -253,17 +409,22 @@ namespace Umbraco.Core
        {
            Resolution.Freeze();
        }
-        
-		/// <summary>
-		/// Create the resolvers
-		/// </summary>
-		protected virtual void InitializeResolvers()
-		{
-            PropertyEditorResolver.Current = new PropertyEditorResolver(() => PluginManager.Current.ResolvePropertyEditors());
-            ParameterEditorResolver.Current = new ParameterEditorResolver(() => PluginManager.Current.ResolveParameterEditors());
+
+        /// <summary>
+        /// Create the resolvers
+        /// </summary>
+        protected virtual void InitializeResolvers()
+        {
+            var builder = new ManifestBuilder(
+                ApplicationCache.RuntimeCache,
+                new ManifestParser(new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")), ApplicationCache.RuntimeCache));
+
+            PropertyEditorResolver.Current = new PropertyEditorResolver(ServiceProvider, ProfilingLogger.Logger, () => PluginManager.ResolvePropertyEditors(), builder);
+            ParameterEditorResolver.Current = new ParameterEditorResolver(ServiceProvider, ProfilingLogger.Logger, () => PluginManager.ResolveParameterEditors(), builder);

            //setup the validators resolver with our predefined validators
-            ValidatorsResolver.Current = new ValidatorsResolver(new[]
+            ValidatorsResolver.Current = new ValidatorsResolver(
+                ServiceProvider, ProfilingLogger.Logger, new[]
                {
                    new Lazy<Type>(() => typeof (RequiredManifestValueValidator)),
                    new Lazy<Type>(() => typeof (RegexValidator)),
@@ -272,65 +433,80 @@ namespace Umbraco.Core
                    new Lazy<Type>(() => typeof (IntegerValidator)),
                });

-            //by default we'll use the standard configuration based sync
-            ServerRegistrarResolver.Current = new ServerRegistrarResolver(
-                new ConfigServerRegistrar()); 
+            //by default we'll use the db server registrar unless the developer has the legacy
+            // dist calls enabled, in which case we'll use the config server registrar
+            if (UmbracoConfig.For.UmbracoSettings().DistributedCall.Enabled)
+            {
+                ServerRegistrarResolver.Current = new ServerRegistrarResolver(new ConfigServerRegistrar());
+            }
+            else
+            {
+                ServerRegistrarResolver.Current = new ServerRegistrarResolver(
+                    new DatabaseServerRegistrar(
+                        new Lazy<IServerRegistrationService>(() => ApplicationContext.Services.ServerRegistrationService),
+                        new DatabaseServerRegistrarOptions()));
+            }
+            

-            //by default (outside of the web) we'll use the default server messenger without
-            //supplying a username/password, this will automatically disable distributed calls
-            // .. we'll override this in the WebBootManager
+            //by default we'll use the database server messenger with default options (no callbacks),
+            // this will be overridden in the web startup
            ServerMessengerResolver.Current = new ServerMessengerResolver(
-                new DefaultServerMessenger());
+                new DatabaseServerMessenger(ApplicationContext, true, new DatabaseServerMessengerOptions()));

            MappingResolver.Current = new MappingResolver(
-                () => PluginManager.Current.ResolveAssignedMapperTypes());
+                ServiceProvider, ProfilingLogger.Logger,
+                () => PluginManager.ResolveAssignedMapperTypes());

-			RepositoryResolver.Current = new RepositoryResolver(
-                new RepositoryFactory(ApplicationCache));
+           
+            //RepositoryResolver.Current = new RepositoryResolver(
+            //    new RepositoryFactory(ApplicationCache));

-		    SqlSyntaxProvidersResolver.Current = new SqlSyntaxProvidersResolver(
-                new[] { typeof(MySqlSyntaxProvider), typeof(SqlCeSyntaxProvider), typeof(SqlServerSyntaxProvider) })
-		        {
-		            CanResolveBeforeFrozen = true
-		        };
+            CacheRefreshersResolver.Current = new CacheRefreshersResolver(
+                ServiceProvider, ProfilingLogger.Logger,
+                () => PluginManager.ResolveCacheRefreshers());

-			CacheRefreshersResolver.Current = new CacheRefreshersResolver(
-				() => PluginManager.Current.ResolveCacheRefreshers());
+            DataTypesResolver.Current = new DataTypesResolver(
+                ServiceProvider, ProfilingLogger.Logger,
+                () => PluginManager.ResolveDataTypes());

-			DataTypesResolver.Current = new DataTypesResolver(
-				() => PluginManager.Current.ResolveDataTypes());
+            MacroFieldEditorsResolver.Current = new MacroFieldEditorsResolver(
+                ServiceProvider, ProfilingLogger.Logger,
+                () => PluginManager.ResolveMacroRenderings());

-			MacroFieldEditorsResolver.Current = new MacroFieldEditorsResolver(
-				() => PluginManager.Current.ResolveMacroRenderings());
+            PackageActionsResolver.Current = new PackageActionsResolver(
+                ServiceProvider, ProfilingLogger.Logger,
+                () => PluginManager.ResolvePackageActions());

-			PackageActionsResolver.Current = new PackageActionsResolver(
-				() => PluginManager.Current.ResolvePackageActions());
-
-			ActionsResolver.Current = new ActionsResolver(
-				() => PluginManager.Current.ResolveActions());
+            ActionsResolver.Current = new ActionsResolver(
+                ServiceProvider, ProfilingLogger.Logger,
+                () => PluginManager.ResolveActions());

            //the database migration objects
            MigrationResolver.Current = new MigrationResolver(
-                () => PluginManager.Current.ResolveTypes<IMigration>());
+                ProfilingLogger.Logger,
+                () => PluginManager.ResolveTypes<IMigration>());

            // todo: remove once we drop IPropertyEditorValueConverter support.
            PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
-				PluginManager.Current.ResolvePropertyEditorValueConverters());
+                ServiceProvider, ProfilingLogger.Logger,
+                PluginManager.ResolvePropertyEditorValueConverters());

-			// need to filter out the ones we dont want!!
-		    PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(
-		        PluginManager.Current.ResolveTypes<IPropertyValueConverter>());                
+            // need to filter out the ones we dont want!!
+            PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(
+                ServiceProvider, ProfilingLogger.Logger,
+                PluginManager.ResolveTypes<IPropertyValueConverter>());

            // use the new DefaultShortStringHelper
            ShortStringHelperResolver.Current = new ShortStringHelperResolver(
                //new LegacyShortStringHelper());
-                new DefaultShortStringHelper().WithDefaultConfig());
+                new DefaultShortStringHelper(UmbracoConfig.For.UmbracoSettings()).WithDefaultConfig());

-		    UrlSegmentProviderResolver.Current = new UrlSegmentProviderResolver(
-		        typeof (DefaultUrlSegmentProvider));
+            UrlSegmentProviderResolver.Current = new UrlSegmentProviderResolver(
+                ServiceProvider, ProfilingLogger.Logger,
+                typeof(DefaultUrlSegmentProvider));

            // by default, no factory is activated
-		    PublishedContentModelFactoryResolver.Current = new PublishedContentModelFactoryResolver();
-		}
-	}
+            PublishedContentModelFactoryResolver.Current = new PublishedContentModelFactoryResolver();
+        }
+    }
 }
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 using umbraco.interfaces;

@@ -11,12 +12,14 @@ namespace Umbraco.Core
    [Obsolete("IDataType is obsolete and is no longer used, it will be removed from the codebase in future versions")]
 	internal sealed class DataTypesResolver : LegacyTransientObjectsResolver<DataTypesResolver, IDataType>
 	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <param name="dataTypes"></param>		
-		internal DataTypesResolver(Func<IEnumerable<Type>> dataTypes)
-			: base(dataTypes)
+	    /// <summary>
+	    /// Constructor
+	    /// </summary>
+	    /// <param name="serviceProvider"></param>
+	    /// <param name="logger"></param>
+	    /// <param name="dataTypes"></param>		
+	    internal DataTypesResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> dataTypes)
+            : base(serviceProvider, logger, dataTypes)
 		{

 		}
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Configuration;
 using System.Xml.Linq;
+using Semver;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
@@ -13,6 +14,7 @@ using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Persistence.Migrations.Initial;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Services;

 namespace Umbraco.Core
 {
@@ -25,19 +27,61 @@ namespace Umbraco.Core
    public class DatabaseContext
    {
        private readonly IDatabaseFactory _factory;
+        private readonly ILogger _logger;
+        private readonly SqlSyntaxProviders _syntaxProviders;
        private bool _configured;
-        private bool _canConnect;
-        private volatile bool _connectCheck = false;
        private readonly object _locker = new object();
        private string _connectionString;
        private string _providerName;
        private DatabaseSchemaResult _result;

+        [Obsolete("Use the constructor specifying all dependencies instead")]
        public DatabaseContext(IDatabaseFactory factory)
+            : this(factory, LoggerResolver.Current.Logger, new SqlSyntaxProviders(new ISqlSyntaxProvider[]
+            {
+                new MySqlSyntaxProvider(LoggerResolver.Current.Logger),
+                new SqlCeSyntaxProvider(), 
+                new SqlServerSyntaxProvider()
+            }))
        {
-            _factory = factory;
        }

+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="factory"></param>
+        /// <param name="logger"></param>
+        /// <param name="syntaxProviders"></param>
+        public DatabaseContext(IDatabaseFactory factory, ILogger logger, SqlSyntaxProviders syntaxProviders)
+        {
+            if (factory == null) throw new ArgumentNullException("factory");
+            if (logger == null) throw new ArgumentNullException("logger");
+            if (syntaxProviders == null) throw new ArgumentNullException("syntaxProviders");
+
+            _factory = factory;
+            _logger = logger;
+            _syntaxProviders = syntaxProviders;
+        }
+
+        /// <summary>
+        /// Create a configured DatabaseContext
+        /// </summary>
+        /// <param name="factory"></param>
+        /// <param name="logger"></param>
+        /// <param name="sqlSyntax"></param>
+        /// <param name="providerName"></param>
+        public DatabaseContext(IDatabaseFactory factory, ILogger logger, ISqlSyntaxProvider sqlSyntax, string providerName)
+        {
+            _providerName = providerName;
+            SqlSyntax = sqlSyntax;
+            SqlSyntaxContext.SqlSyntaxProvider = SqlSyntax;
+            _factory = factory;
+            _logger = logger;
+            _configured = true;
+        }
+
+        public ISqlSyntaxProvider SqlSyntax { get; private set; }
+
        /// <summary>
        /// Gets the <see cref="Database"/> object for doing CRUD operations
        /// against custom tables that resides in the Umbraco database.
@@ -46,7 +90,7 @@ namespace Umbraco.Core
        /// This should not be used for CRUD operations or queries against the
        /// standard Umbraco tables! Use the Public services for that.
        /// </remarks>
-        public UmbracoDatabase Database
+        public virtual UmbracoDatabase Database
        {
            get { return _factory.CreateDatabase(); }
        }
@@ -54,7 +98,7 @@ namespace Umbraco.Core
        /// <summary>
        /// Boolean indicating whether the database has been configured
        /// </summary>
-        public bool IsDatabaseConfigured
+        public virtual bool IsDatabaseConfigured
        {
            get { return _configured; }
        }
@@ -62,33 +106,21 @@ namespace Umbraco.Core
        /// <summary>
        /// Determines if the db can be connected to
        /// </summary>
-        public bool CanConnect
+        public virtual bool CanConnect
        {
            get
            {
                if (IsDatabaseConfigured == false) return false;
-
-                //double check lock so that it is only checked once and is fast
-                if (_connectCheck == false)
-                {
-                    lock (_locker)
-                    {
-                        if (_canConnect == false)
-                        {
-                            _canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
-                            _connectCheck = true;
-                        }
-                    }
-                }
-
-                return _canConnect;
+                var canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
+                LogHelper.Info<DatabaseContext>("CanConnect = " + canConnect);
+                return canConnect;
            }
        }

        /// <summary>
        /// Gets the configured umbraco db connection string.
        /// </summary>
-        public string ConnectionString
+        public virtual string ConnectionString
        {
            get { return _connectionString; }
        }
@@ -106,7 +138,7 @@ namespace Umbraco.Core
                _providerName = "System.Data.SqlClient";
                if (ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName] != null)
                {
-                    if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
+                    if (string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName) == false)
                        _providerName = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName;
                }
                else
@@ -120,7 +152,7 @@ namespace Umbraco.Core
        /// <summary>
        /// Returns the Type of DatabaseProvider used
        /// </summary>
-        public DatabaseProviders DatabaseProvider
+        public virtual DatabaseProviders DatabaseProvider
        {
            get
            {
@@ -324,7 +356,7 @@ namespace Umbraco.Core

            xml.Save(fileName, SaveOptions.DisableFormatting);

-            LogHelper.Info<DatabaseContext>("Configured a new ConnectionString using the '" + providerName + "' provider.");
+            _logger.Info<DatabaseContext>("Configured a new ConnectionString using the '" + providerName + "' provider.");
        }

        /// <summary>
@@ -398,12 +430,23 @@ namespace Umbraco.Core

        internal void Initialize(string providerName)
        {
+            //only configure once!
+            if (_configured == true) return;
+
            _providerName = providerName;

            try
            {
-                SqlSyntaxContext.SqlSyntaxProvider =
-                    SqlSyntaxProvidersResolver.Current.GetByProviderNameOrDefault(providerName);
+                if (_syntaxProviders != null)
+                {
+                    SqlSyntax = _syntaxProviders.GetByProviderNameOrDefault(providerName);    
+                }
+                else if (SqlSyntax == null)
+                {
+                    throw new InvalidOperationException("No " + typeof(ISqlSyntaxProvider) + " specified or no " + typeof(SqlSyntaxProviders) + " instance specified");
+                }
+                
+                SqlSyntaxContext.SqlSyntaxProvider = SqlSyntax;
                
                _configured = true;
            }
@@ -411,8 +454,8 @@ namespace Umbraco.Core
            {
                _configured = false;

-                LogHelper.Info<DatabaseContext>("Initialization of the DatabaseContext failed with following error: " + e.Message);
-                LogHelper.Info<DatabaseContext>(e.StackTrace);
+                _logger.Info<DatabaseContext>("Initialization of the DatabaseContext failed with following error: " + e.Message);
+                _logger.Info<DatabaseContext>(e.StackTrace);
            }
        }

@@ -427,8 +470,8 @@ namespace Umbraco.Core
        /// </summary>
        private void DetermineSqlServerVersion()
        {
-            
-            var sqlServerSyntax = SqlSyntaxContext.SqlSyntaxProvider as SqlServerSyntaxProvider;
+
+            var sqlServerSyntax = SqlSyntax as SqlServerSyntaxProvider;
            if (sqlServerSyntax != null)
            {
                //this will not execute now, it is lazy so will only execute when we need to actually know
@@ -479,14 +522,14 @@ namespace Umbraco.Core
                    throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
                }

-                var database = new UmbracoDatabase(_connectionString, ProviderName);
-                var dbSchema = new DatabaseSchemaCreation(database);
+                var database = new UmbracoDatabase(_connectionString, ProviderName, _logger);
+                var dbSchema = new DatabaseSchemaCreation(database, _logger, SqlSyntax);
                _result = dbSchema.ValidateSchema();
            }
            return _result;
        }

-        internal Result CreateDatabaseSchemaAndData()
+        internal Result CreateDatabaseSchemaAndData(ApplicationContext applicationContext)
        {   
            try
            {
@@ -496,17 +539,17 @@ namespace Umbraco.Core
                    return readyForInstall.Result;
                }

-                LogHelper.Info<DatabaseContext>("Database configuration status: Started");
+                _logger.Info<DatabaseContext>("Database configuration status: Started");

                string message;

-                var database = new UmbracoDatabase(_connectionString, ProviderName);
+                var database = new UmbracoDatabase(_connectionString, ProviderName, _logger);

                // If MySQL, we're going to ensure that database calls are maintaining proper casing as to remove the necessity for checks
                // for case insensitive queries. In an ideal situation (which is what we're striving for), all calls would be case sensitive.

                /*                
-                var supportsCaseInsensitiveQueries = SqlSyntaxContext.SqlSyntaxProvider.SupportsCaseInsensitiveQueries(database);
+                var supportsCaseInsensitiveQueries = SqlSyntax.SupportsCaseInsensitiveQueries(database);
                if (supportsCaseInsensitiveQueries  == false)
                {
                    message = "<p>&nbsp;</p><p>The database you're trying to use does not support case insensitive queries. <br />We currently do not support these types of databases.</p>" +
@@ -523,21 +566,24 @@ namespace Umbraco.Core
                message = GetResultMessageForMySql();

                var schemaResult = ValidateDatabaseSchema();
-                var installedVersion = schemaResult.DetermineInstalledVersion();
+                
+                var installedSchemaVersion = schemaResult.DetermineInstalledVersion();
                
                //If Configuration Status is empty and the determined version is "empty" its a new install - otherwise upgrade the existing
-                if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus) && installedVersion.Equals(new Version(0, 0, 0)))
+                if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus) && installedSchemaVersion.Equals(new Version(0, 0, 0)))
                {
-                    database.CreateDatabaseSchema();
+                    var helper = new DatabaseSchemaHelper(database, _logger, SqlSyntax);
+                    helper.CreateDatabaseSchema(true, applicationContext);
+
                    message = message + "<p>Installation completed!</p>";

                    //now that everything is done, we need to determine the version of SQL server that is executing
-                    LogHelper.Info<DatabaseContext>("Database configuration status: " + message);
+                    _logger.Info<DatabaseContext>("Database configuration status: " + message);
                    return new Result { Message = message, Success = true, Percentage = "100" };
                }

                //we need to do an upgrade so return a new status message and it will need to be done during the next step
-                LogHelper.Info<DatabaseContext>("Database requires upgrade");
+                _logger.Info<DatabaseContext>("Database requires upgrade");
                message = "<p>Upgrading database, this may take some time...</p>";
                return new Result
                    {
@@ -557,7 +603,7 @@ namespace Umbraco.Core
        /// This assumes all of the previous checks are done!
        /// </summary>
        /// <returns></returns>
-        internal Result UpgradeSchemaAndData()
+        internal Result UpgradeSchemaAndData(IMigrationEntryService migrationEntryService)
        {
            try
            {
@@ -568,29 +614,69 @@ namespace Umbraco.Core
                    return readyForInstall.Result;
                }

-                LogHelper.Info<DatabaseContext>("Database upgrade started");
+                _logger.Info<DatabaseContext>("Database upgrade started");

-                var database = new UmbracoDatabase(_connectionString, ProviderName);
-                //var supportsCaseInsensitiveQueries = SqlSyntaxContext.SqlSyntaxProvider.SupportsCaseInsensitiveQueries(database);                
+                var database = new UmbracoDatabase(_connectionString, ProviderName, _logger);
+                //var supportsCaseInsensitiveQueries = SqlSyntax.SupportsCaseInsensitiveQueries(database);                

                var message = GetResultMessageForMySql();

                var schemaResult = ValidateDatabaseSchema();
-                var installedVersion = schemaResult.DetermineInstalledVersion();
+
+                var installedSchemaVersion = new SemVersion(schemaResult.DetermineInstalledVersion());
+
+                var installedMigrationVersion = new SemVersion(0);
+                //we cannot check the migrations table if it doesn't exist, this will occur when upgrading to 7.3
+                if (schemaResult.ValidTables.Any(x => x.InvariantEquals("umbracoMigration")))
+                {
+                    installedMigrationVersion = schemaResult.DetermineInstalledVersionByMigrations(migrationEntryService);    
+                }
+
+                var targetVersion = UmbracoVersion.Current;
                
+                //In some cases - like upgrading from 7.2.6 -> 7.3, there will be no migration information in the database and therefore it will
+                // return a version of 0.0.0 and we don't necessarily want to run all migrations from 0 -> 7.3, so we'll just ensure that the 
+                // migrations are run for the target version
+                if (installedMigrationVersion == new SemVersion(new Version(0, 0, 0)) && installedSchemaVersion > new SemVersion(new Version(0, 0, 0)))
+                {
+                    //set the installedMigrationVersion to be one less than the target so the latest migrations are guaranteed to execute
+                    installedMigrationVersion = new SemVersion(targetVersion.SubtractRevision());
+                }
+                
+                //Figure out what our current installed version is. If the web.config doesn't have a version listed, then we'll use the minimum
+                // version detected between the schema installed and the migrations listed in the migration table. 
+                // If there is a version in the web.config, we'll take the minimum between the listed migration in the db and what
+                // is declared in the web.config.
+                
+                var currentInstalledVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
+                    //Take the minimum version between the detected schema version and the installed migration version
+                    ? new[] {installedSchemaVersion, installedMigrationVersion}.Min()
+                    //Take the minimum version between the installed migration version and the version specified in the config
+                    : new[] { SemVersion.Parse(GlobalSettings.ConfigurationStatus), installedMigrationVersion }.Min();
+
+                //Ok, another edge case here. If the current version is a pre-release, 
+                // then we want to ensure all migrations for the current release are executed. 
+                if (currentInstalledVersion.Prerelease.IsNullOrWhiteSpace() == false)
+                {
+                    currentInstalledVersion  = new SemVersion(currentInstalledVersion.GetVersion().SubtractRevision());
+                }
+
                //DO the upgrade!

-                var currentVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
-                                                ? installedVersion
-                                                : new Version(GlobalSettings.ConfigurationStatus);
-                var targetVersion = UmbracoVersion.Current;
-                var runner = new MigrationRunner(currentVersion, targetVersion, GlobalSettings.UmbracoMigrationName);
+                var runner = new MigrationRunner(migrationEntryService, _logger, currentInstalledVersion, UmbracoVersion.GetSemanticVersion(), GlobalSettings.UmbracoMigrationName);
+
                var upgraded = runner.Execute(database, true);
+
+                if (upgraded == false)
+                {
+                    throw new ApplicationException("Upgrading failed, either an error occurred during the upgrade process or an event canceled the upgrade process, see log for full details");
+                }
+
                message = message + "<p>Upgrade completed!</p>";

                //now that everything is done, we need to determine the version of SQL server that is executing

-                LogHelper.Info<DatabaseContext>("Database configuration status: " + message);
+                _logger.Info<DatabaseContext>("Database configuration status: " + message);

                return new Result { Message = message, Success = true, Percentage = "100" };
            }
@@ -602,7 +688,7 @@ namespace Umbraco.Core

        private string GetResultMessageForMySql()
        {
-            if (SqlSyntaxContext.SqlSyntaxProvider.GetType() == typeof(MySqlSyntaxProvider))
+            if (SqlSyntax.GetType() == typeof(MySqlSyntaxProvider))
            {
                return "<p>&nbsp;</p><p>Congratulations, the database step ran successfully!</p>" +
                       "<p>Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.</p>" +
@@ -628,7 +714,7 @@ namespace Umbraco.Core
                          "<p>For more technical information on case sensitivity in MySQL, have a look at " +
                          "<a href='http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html'>the documentation on the subject</a></p>";
            }
-            if (SqlSyntaxContext.SqlSyntaxProvider.GetType() == typeof(MySqlSyntaxProvider))
+            if (SqlSyntax.GetType() == typeof(MySqlSyntaxProvider))
            {
                return "<p>&nbsp;</p><p>Congratulations, the database step ran successfully!</p>" +
                       "<p>Note: You're using MySQL and the database instance you're connecting to seems to support case insensitive queries.</p>" +
@@ -665,11 +751,11 @@ namespace Umbraco.Core

        private Result HandleInstallException(Exception ex)
        {
-            LogHelper.Error<DatabaseContext>("Database configuration failed", ex);
+            _logger.Error<DatabaseContext>("Database configuration failed", ex);

            if (_result != null)
            {
-                LogHelper.Info<DatabaseContext>("The database schema validation produced the following summary: \n" + _result.GetSummary());
+                _logger.Info<DatabaseContext>("The database schema validation produced the following summary: \n" + _result.GetSummary());
            }

            return new Result
@@ -0,0 +1,44 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+namespace Umbraco.Core
+{
+    public static class DelegateExtensions
+    {
+        public static Attempt<T> RetryUntilSuccessOrTimeout<T>(this Func<Attempt<T>> task, TimeSpan timeout, TimeSpan pause)
+        {
+            if (pause.TotalMilliseconds < 0)
+            {
+                throw new ArgumentException("pause must be >= 0 milliseconds");
+            }
+            var stopwatch = Stopwatch.StartNew();
+            do
+            {
+                var result = task();
+                if (result) { return result; }
+                Thread.Sleep((int)pause.TotalMilliseconds);
+            }
+            while (stopwatch.Elapsed < timeout);
+            return Attempt<T>.Fail();
+        }
+
+        public static Attempt<T> RetryUntilSuccessOrMaxAttempts<T>(this Func<int, Attempt<T>> task, int totalAttempts, TimeSpan pause)
+        {
+            if (pause.TotalMilliseconds < 0)
+            {
+                throw new ArgumentException("pause must be >= 0 milliseconds");
+            }
+            int attempts = 0;
+            do
+            {
+                attempts++;
+                var result = task(attempts);
+                if (result) { return result; }
+                Thread.Sleep((int)pause.TotalMilliseconds);
+            }
+            while (attempts < totalAttempts);
+            return Attempt<T>.Fail();
+        }
+    }
+}
@@ -1,3 +1,5 @@
+using System;
+using System.ComponentModel;
 using Umbraco.Core.ObjectResolution;

 namespace Umbraco.Core.Dictionary
@@ -12,15 +14,22 @@ namespace Umbraco.Core.Dictionary
 		{
 		}

-		/// <summary>
-		/// Can be used by developers at runtime to set their ICultureDictionaryFactory at app startup
-		/// </summary>
-		/// <param name="factory"></param>
+        [Obsolete("Use SetDictionaryFactory instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
 		public void SetContentStore(ICultureDictionaryFactory factory)
 		{
 			Value = factory;
 		}

+        /// <summary>
+        /// Can be used by developers at runtime to set their ICultureDictionaryFactory at app startup
+        /// </summary>
+        /// <param name="factory"></param>
+        public void SetDictionaryFactory(ICultureDictionaryFactory factory)
+        {
+            Value = factory;
+        }
+
 		/// <summary>
 		/// Returns the ICultureDictionaryFactory
 		/// </summary>
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;

 namespace Umbraco.Core.Dictionary
@@ -19,5 +20,12 @@ namespace Umbraco.Core.Dictionary
 		/// Returns the current culture
 		/// </summary>
 		CultureInfo Culture { get; }
+
+        /// <summary>
+        /// Returns the child dictionary entries for a given key
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+	    IDictionary<string, string> GetChildren(string key);
 	}
 }
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
 using System.Text;
-using System.Web.Mvc;
 using System.Web;

 namespace Umbraco.Core
@@ -135,20 +134,6 @@ namespace Umbraco.Core
 			return n;
 		}

-		/// <summary>
-		/// Converts a dictionary to a FormCollection
-		/// </summary>
-		/// <param name="d"></param>
-		/// <returns></returns>
-		public static FormCollection ToFormCollection(this IDictionary<string, object> d)
-		{
-			var n = new FormCollection();
-			foreach (var i in d)
-			{
-				n.Add(i.Key, Convert.ToString(i.Value));
-			}
-			return n;
-		}

 	    /// <summary>
 	    /// Merges all key/values from the sources dictionaries into the destination dictionary
@@ -4,69 +4,58 @@ using System.Threading;
 namespace Umbraco.Core
 {
 	/// <summary>
-	/// Abstract implementation of logic commonly required to safely handle disposable unmanaged resources.
+	/// Abstract implementation of IDisposable.
 	/// </summary>
+	/// <remarks>
+	/// Can also be used as a pattern for when inheriting is not possible.
+	/// 
+    /// See also: https://msdn.microsoft.com/en-us/library/b1yfkh5e%28v=vs.110%29.aspx
+    /// See also: https://lostechies.com/chrispatterson/2012/11/29/idisposable-done-right/
+    /// 
+    /// Note: if an object's ctor throws, it will never be disposed, and so if that ctor
+    /// has allocated disposable objects, it should take care of disposing them.
+	/// </remarks>
 	public abstract class DisposableObject : IDisposable
 	{
 		private bool _disposed;
-		private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
+	    private readonly object _locko = new object();

-		/// <summary>
-		/// Gets a value indicating whether this instance is disposed.
-		/// </summary>
-		/// <value>
-		/// 	<c>true</c> if this instance is disposed; otherwise, <c>false</c>.
-		/// </value>
-		public bool IsDisposed
-		{
-			get { return _disposed; }
-		}
+		// gets a value indicating whether this instance is disposed.
+        // for internal tests only (not thread safe)
+        //TODO make this internal + rename "Disposed" when we can break compatibility
+		public bool IsDisposed { get { return _disposed; } }

-		/// <summary>
-		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-		/// </summary>
-		/// <filterpriority>2</filterpriority>
+		// implements IDisposable
 		public void Dispose()
 		{
 			Dispose(true);
-
-			// Use SupressFinalize in case a subclass of this type implements a finalizer.
 			GC.SuppressFinalize(this);
 		}

+        // finalizer
 		~DisposableObject()
 		{
-			// Run dispose but let the class know it was due to the finalizer running.
 			Dispose(false);
 		}

-		protected virtual void Dispose(bool disposing)
+        //TODO make this private, non-virtual when we can break compatibility
+        protected virtual void Dispose(bool disposing)
 		{
-			// Only operate if we haven't already disposed
-			if (IsDisposed || !disposing) return;
+		    lock (_locko)
+		    {
+		        if (_disposed) return;
+		        _disposed = true;
+		    }

-			using (new WriteLock(_disposalLocker))
-			{
-				// Check again now we're inside the lock
-				if (IsDisposed) return;
+            DisposeUnmanagedResources();

-				// Call to actually release resources. This method is only
-				// kept separate so that the entire disposal logic can be used as a VS snippet
-				DisposeResources();
-
-				// Indicate that the instance has been disposed.
-				_disposed = true;
-			}
+            if (disposing)
+                DisposeResources();
 		}

-		/// <summary>
-		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
-		/// </summary>
 		protected abstract void DisposeResources();

 		protected virtual void DisposeUnmanagedResources()
-		{
-
-		}
+		{ }
 	}
 }
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Web;
 using Umbraco.Core.Logging;
@@ -9,32 +10,65 @@ namespace Umbraco.Core
 	/// <summary>
 	/// Starts the timer and invokes a  callback upon disposal. Provides a simple way of timing an operation by wrapping it in a <code>using</code> (C#) statement.
 	/// </summary>
-	/// <example>
-	/// <code>
-	/// 
-	/// using (DisposableTimer.TraceDuration{MyType}("starting", "finished"))
-	/// {
-    ///     Thread.Sleep(567);
-	/// }
-	/// 
-	/// Console.WriteLine("Testing Stopwatchdisposable, should be 567:");
-	/// using (var timer = new DisposableTimer(result => Console.WriteLine("Took {0}ms", result)))
-	/// {
-	///     Thread.Sleep(567);
-	/// }
-	/// </code>
-	/// </example>
 	public class DisposableTimer : DisposableObject
 	{
-		private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
+	    private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
 		private readonly Action<long> _callback;

-		protected DisposableTimer(Action<long> callback)
-		{
-			_callback = callback;
-		}        
+	    internal enum LogType
+	    {
+	        Debug, Info
+	    }

-		public Stopwatch Stopwatch
+        internal DisposableTimer(ILogger logger, LogType logType, IProfiler profiler, Type loggerType, string startMessage, string endMessage)
+        {
+            if (logger == null) throw new ArgumentNullException("logger");
+            if (loggerType == null) throw new ArgumentNullException("loggerType");
+
+            _callback = x =>
+            {
+                if (profiler != null)
+                {
+                    profiler.DisposeIfDisposable();
+                }
+                switch (logType)
+                {
+                    case LogType.Debug:
+                        logger.Debug(loggerType, () => endMessage + " (took " + x + "ms)");
+                        break;
+                    case LogType.Info:
+                        logger.Info(loggerType, () => endMessage + " (took " + x + "ms)");
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException("logType");
+                }
+                
+            };
+            switch (logType)
+            {
+                case LogType.Debug:
+                    logger.Debug(loggerType, startMessage);
+                    break;
+                case LogType.Info:
+                    logger.Info(loggerType, startMessage);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException("logType");
+            }
+            
+            if (profiler != null)
+            {
+                profiler.Step(loggerType, startMessage);    
+            }
+        }
+
+	    protected internal DisposableTimer(Action<long> callback)
+	    {
+	        if (callback == null) throw new ArgumentNullException("callback");
+	        _callback = callback;
+	    }
+
+	    public Stopwatch Stopwatch
 		{
 			get { return _stopwatch; }
 		}
@@ -51,25 +85,25 @@ namespace Umbraco.Core
 		}

        #region TraceDuration
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the other methods that specify strings instead of Func")]
        public static DisposableTimer TraceDuration<T>(Func<string> startMessage, Func<string> completeMessage)
        {
            return TraceDuration(typeof(T), startMessage, completeMessage);
        }

+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the other methods that specify strings instead of Func")]
        public static DisposableTimer TraceDuration(Type loggerType, Func<string> startMessage, Func<string> completeMessage)
        {
-            var startMsg = startMessage();
-            LogHelper.Info(loggerType, startMsg);
-            if (HttpContext.Current != null)
-                HttpContext.Current.Trace.Write("Start: " + startMsg);
-            var profiler = ActivateProfiler(loggerType, startMsg);
-            return new DisposableTimer(x =>
-                {
-                    profiler.DisposeIfDisposable();
-                    LogHelper.Info(loggerType, () => completeMessage() + " (took " + x + "ms)");
-                    if (HttpContext.Current != null)
-                        HttpContext.Current.Trace.Write("End: " + startMsg);
-                });
+            return new DisposableTimer(
+                LoggerResolver.Current.Logger, 
+                LogType.Info, 
+                ProfilerResolver.HasCurrent ? ProfilerResolver.Current.Profiler : null,
+                loggerType, 
+                startMessage(), 
+                completeMessage());
        }

        /// <summary>
@@ -79,11 +113,19 @@ namespace Umbraco.Core
        /// <param name="startMessage"></param>
        /// <param name="completeMessage"></param>
        /// <returns></returns>
+        [Obsolete("Use the Umbraco.Core.Logging.ProfilingLogger to create instances of DisposableTimer")]
        public static DisposableTimer TraceDuration<T>(string startMessage, string completeMessage)
        {
            return TraceDuration(typeof(T), startMessage, completeMessage);
        }

+        /// <summary>
+        /// Adds a start and end log entry as Info and tracks how long it takes until disposed.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="startMessage"></param>
+        /// <returns></returns>
+        [Obsolete("Use the Umbraco.Core.Logging.ProfilingLogger to create instances of DisposableTimer")]
        public static DisposableTimer TraceDuration<T>(string startMessage)
        {
            return TraceDuration(typeof(T), startMessage, "Complete");
@@ -96,20 +138,18 @@ namespace Umbraco.Core
        /// <param name="startMessage"></param>
        /// <param name="completeMessage"></param>
        /// <returns></returns>
+        [Obsolete("Use the Umbraco.Core.Logging.ProfilingLogger to create instances of DisposableTimer")]
        public static DisposableTimer TraceDuration(Type loggerType, string startMessage, string completeMessage)
        {
-            LogHelper.Info(loggerType, startMessage);
-            if (HttpContext.Current != null)
-                HttpContext.Current.Trace.Write("Start: " + startMessage);
-            var profiler = ActivateProfiler(loggerType, startMessage);
-            return new DisposableTimer(x =>
-                {
-                    profiler.DisposeIfDisposable();
-                    LogHelper.Info(loggerType, () => completeMessage + " (took " + x + "ms)");
-                    if (HttpContext.Current != null)
-                        HttpContext.Current.Trace.Write("End: " + startMessage);
-                });
-        } 
+            return new DisposableTimer(
+                LoggerResolver.Current.Logger,
+                LogType.Info, 
+                ProfilerResolver.HasCurrent ? ProfilerResolver.Current.Profiler : null,
+                loggerType,
+                startMessage,
+                completeMessage);
+        }
+
        #endregion

        #region DebugDuration
@@ -120,23 +160,26 @@ namespace Umbraco.Core
        /// <param name="startMessage"></param>
        /// <param name="completeMessage"></param>
        /// <returns></returns>
+        [Obsolete("Use the Umbraco.Core.Logging.ProfilingLogger to create instances of DisposableTimer")]
        public static DisposableTimer DebugDuration<T>(string startMessage, string completeMessage)
        {
            return DebugDuration(typeof(T), startMessage, completeMessage);
        }

-        public static DisposableTimer DebugDuration<T>(string startMessage)
-        {
-            return DebugDuration(typeof(T), startMessage, "Complete");
-        }
-
        /// <summary>
        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="startMessage"></param>
-        /// <param name="completeMessage"></param>
        /// <returns></returns>
+        [Obsolete("Use the Umbraco.Core.Logging.ProfilingLogger to create instances of DisposableTimer")]
+        public static DisposableTimer DebugDuration<T>(string startMessage)
+        {
+            return DebugDuration(typeof(T), startMessage, "Complete");
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the other methods that specify strings instead of Func")]
        public static DisposableTimer DebugDuration<T>(Func<string> startMessage, Func<string> completeMessage)
        {
            return DebugDuration(typeof(T), startMessage, completeMessage);
@@ -149,42 +192,29 @@ namespace Umbraco.Core
        /// <param name="startMessage"></param>
        /// <param name="completeMessage"></param>
        /// <returns></returns>
+        [Obsolete("Use the Umbraco.Core.Logging.ProfilingLogger to create instances of DisposableTimer")]
        public static DisposableTimer DebugDuration(Type loggerType, string startMessage, string completeMessage)
        {
-            LogHelper.Debug(loggerType, startMessage);
-            if (HttpContext.Current != null)
-                HttpContext.Current.Trace.Write("Start: " + startMessage);
-            var profiler = ActivateProfiler(loggerType, startMessage);
-            return new DisposableTimer(x =>
-                {
-                    profiler.DisposeIfDisposable();
-                    LogHelper.Debug(loggerType, () => completeMessage + " (took " + x + "ms)");
-                    if (HttpContext.Current != null)
-                        HttpContext.Current.Trace.Write("End: " + startMessage);
-                });
+            return new DisposableTimer(
+                LoggerResolver.Current.Logger,
+                LogType.Debug,
+                ProfilerResolver.HasCurrent ? ProfilerResolver.Current.Profiler : null,
+                loggerType,
+                startMessage,
+                completeMessage);
        }

-        /// <summary>
-        /// Adds a start and end log entry as Debug and tracks how long it takes until disposed.
-        /// </summary>
-        /// <param name="loggerType"></param>
-        /// <param name="startMessage"></param>
-        /// <param name="completeMessage"></param>
-        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the other methods that specify strings instead of Func")]
        public static DisposableTimer DebugDuration(Type loggerType, Func<string> startMessage, Func<string> completeMessage)
        {
-            var msg = startMessage();
-            LogHelper.Debug(loggerType, msg);
-            if (HttpContext.Current != null)
-                HttpContext.Current.Trace.Write("Start: " + startMessage);
-            var profiler = ActivateProfiler(loggerType, msg);
-            return new DisposableTimer(x =>
-                {
-                    profiler.DisposeIfDisposable();
-                    LogHelper.Debug(loggerType, () => completeMessage() + " (took " + x + "ms)");
-                    if (HttpContext.Current != null)
-                        HttpContext.Current.Trace.Write("End: " + startMessage);
-                });
+            return new DisposableTimer(
+                LoggerResolver.Current.Logger,
+                LogType.Debug,
+                ProfilerResolver.HasCurrent ? ProfilerResolver.Current.Profiler : null,
+                loggerType,
+                startMessage(),
+                completeMessage());
        } 
        #endregion

@@ -196,18 +226,5 @@ namespace Umbraco.Core
 			_callback.Invoke(Stopwatch.ElapsedMilliseconds);
 		}

-        private static IDisposable ActivateProfiler(Type loggerType, string profileName)
-        {
-            try
-            {
-                return ProfilerResolver.Current.Profiler.Step(loggerType, profileName);
-            }
-            catch (InvalidOperationException)
-            {
-                //swallow this exception, it will occur if the ProfilerResolver is not initialized... generally only in 
-                // unit tests.
-            }
-            return null;
-        }
 	}
 }
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -100,6 +101,7 @@ namespace Umbraco.Core
        /// <param name="f">The select child.</param>
        /// <typeparam name="T">Item type</typeparam>
        /// <returns>list of TItem</returns>
+        [Obsolete("Do not use, use SelectRecursive instead which has far less potential of re-iterating an iterator which may cause significantly more SQL queries")]
        public static IEnumerable<T> FlattenList<T>(this IEnumerable<T> e, Func<T, IEnumerable<T>> f)
        {
            return e.SelectMany(c => f(c).FlattenList(f)).Concat(e);
@@ -114,13 +116,7 @@ namespace Umbraco.Core
        /// <returns></returns>
        public static bool ContainsAll<TSource>(this IEnumerable<TSource> source, IEnumerable<TSource> other)
        {
-            var matches = true;
-            foreach (var i in other)
-            {
-                matches = source.Contains(i);
-                if (!matches) break;
-            }
-            return matches;
+            return other.Except(source).Any() == false;
        }

        /// <summary>
@@ -132,7 +128,7 @@ namespace Umbraco.Core
        /// <returns></returns>
        public static bool ContainsAny<TSource>(this IEnumerable<TSource> source, IEnumerable<TSource> other)
        {
-            return other.Any(i => source.Contains(i));
+            return other.Any(source.Contains);
        }

        /// <summary>
@@ -224,7 +220,7 @@ namespace Umbraco.Core
            return sequence.Select(
                x =>
                {
-                    if (typeof(TActual).IsAssignableFrom(x.GetType()))
+                    if (x is TActual)
                    {
                        var casted = x as TActual;
                        projection.Invoke(casted);
@@ -276,6 +272,34 @@ namespace Umbraco.Core
        ///<param name="items">The enumerable to search.</param>
        ///<param name="item">The item to find.</param>
        ///<returns>The index of the first matching item, or -1 if the item was not found.</returns>
-        public static int IndexOf<T>(this IEnumerable<T> items, T item) { return items.FindIndex(i => EqualityComparer<T>.Default.Equals(item, i)); }
+        public static int IndexOf<T>(this IEnumerable<T> items, T item)
+        {
+            return items.FindIndex(i => EqualityComparer<T>.Default.Equals(item, i));
+        }
+
+        /// <summary>
+        /// Determines if 2 lists have equal elements within them regardless of how they are sorted
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="source"></param>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// The logic for this is taken from:
+        /// http://stackoverflow.com/questions/4576723/test-whether-two-ienumerablet-have-the-same-values-with-the-same-frequencies
+        /// 
+        /// There's a few answers, this one seems the best for it's simplicity and based on the comment of Eamon
+        /// </remarks>
+        public static bool UnsortedSequenceEqual<T>(this IEnumerable<T> source, IEnumerable<T> other)
+        {
+            if (source == null && other == null) return true;
+            if (source == null || other == null) return false;
+
+            var list1Groups = source.ToLookup(i => i);
+            var list2Groups = other.ToLookup(i => i);
+            return list1Groups.Count == list2Groups.Count
+               && list1Groups.All(g => g.Count() == list2Groups[g.Key].Count());
+        }
+
    }
 }
@@ -3,7 +3,7 @@ using System.Security.Permissions;

 namespace Umbraco.Core.Events
 {
-	/// <summary>
+    /// <summary>
 	/// Event args for that can support cancellation
 	/// </summary>
 	[HostProtection(SecurityAction.LinkDemand, SharedState = true)]
@@ -11,15 +11,30 @@ namespace Umbraco.Core.Events
 	{
 		private bool _cancel;

-		public CancellableEventArgs(bool canCancel)
+        public CancellableEventArgs(bool canCancel, EventMessages eventMessages)
+        {
+            if (eventMessages == null) throw new ArgumentNullException("eventMessages");
+            CanCancel = canCancel;
+            Messages = eventMessages;
+        }
+
+        public CancellableEventArgs(bool canCancel)
 		{
 			CanCancel = canCancel;
-		}
+            //create a standalone messages
+            Messages = new EventMessages();
+        }

-		public CancellableEventArgs()
+        public CancellableEventArgs(EventMessages eventMessages)
+            : this(true, eventMessages)
+        {
+        }
+
+        public CancellableEventArgs()
 			: this(true)
 		{
 		}
+
 		/// <summary>
 		/// Flag to determine if this instance will support being cancellable
 		/// </summary>
@@ -32,7 +47,7 @@ namespace Umbraco.Core.Events
 		{
 			get
 			{
-				if (!CanCancel)
+				if (CanCancel == false)
 				{
 					throw new InvalidOperationException("This event argument class does not support cancelling.");
 				}
@@ -40,12 +55,28 @@ namespace Umbraco.Core.Events
 			}
 			set
 			{
-				if (!CanCancel)
+				if (CanCancel == false)
 				{
 					throw new InvalidOperationException("This event argument class does not support cancelling.");
 				}
 				_cancel = value;
 			}
 		}
-	}
+
+        /// <summary>
+        /// if this instance supports cancellation, this will set Cancel to true with an affiliated cancellation message
+        /// </summary>
+        /// <param name="cancelationMessage"></param>
+        public void CancelOperation(EventMessage cancelationMessage)
+        {
+            Cancel = true;
+            cancelationMessage.IsDefaultEventMessage = true;
+            Messages.Add(cancelationMessage);
+        }
+
+        /// <summary>
+        /// Returns the EventMessages object which is used to add messages to the message collection for this event
+        /// </summary>
+        public EventMessages Messages { get; private set; }
+    }
 }
@@ -12,7 +12,18 @@ namespace Umbraco.Core.Events
 	public class CancellableObjectEventArgs<T> : CancellableEventArgs
 	{

-		public CancellableObjectEventArgs(T eventObject, bool canCancel)
+        public CancellableObjectEventArgs(T eventObject, bool canCancel, EventMessages eventMessages)
+            : base(canCancel, eventMessages)
+        {
+            EventObject = eventObject;
+        }
+
+        public CancellableObjectEventArgs(T eventObject, EventMessages eventMessages)
+            : this(eventObject, true, eventMessages)
+        {
+        }
+
+        public CancellableObjectEventArgs(T eventObject, bool canCancel)
 			: base(canCancel)
 		{
 			EventObject = eventObject;
@@ -4,12 +4,56 @@ namespace Umbraco.Core.Events
 {
 	public class DeleteEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
 	{
-		/// <summary>
-		/// Constructor accepting multiple entities that are used in the delete operation
-		/// </summary>
-		/// <param name="eventObject"></param>
-		/// <param name="canCancel"></param>
-		public DeleteEventArgs(IEnumerable<TEntity> eventObject, bool canCancel) : base(eventObject, canCancel)
+	    /// <summary>
+	    /// Constructor accepting multiple entities that are used in the delete operation
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="canCancel"></param>
+	    /// <param name="eventMessages"></param>
+	    public DeleteEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, EventMessages eventMessages) : base(eventObject, canCancel, eventMessages)
+        {
+            MediaFilesToDelete = new List<string>();
+        }
+
+	    /// <summary>
+	    /// Constructor accepting multiple entities that are used in the delete operation
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="eventMessages"></param>
+	    public DeleteEventArgs(IEnumerable<TEntity> eventObject, EventMessages eventMessages) : base(eventObject, eventMessages)
+        {
+            MediaFilesToDelete = new List<string>();
+        }
+
+	    /// <summary>
+	    /// Constructor accepting a single entity instance
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="eventMessages"></param>
+	    public DeleteEventArgs(TEntity eventObject, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, eventMessages)
+        {
+            MediaFilesToDelete = new List<string>();
+        }
+
+	    /// <summary>
+	    /// Constructor accepting a single entity instance
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="canCancel"></param>
+	    /// <param name="eventMessages"></param>
+	    public DeleteEventArgs(TEntity eventObject, bool canCancel, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, canCancel, eventMessages)
+        {
+            MediaFilesToDelete = new List<string>();
+        }
+
+        /// <summary>
+        /// Constructor accepting multiple entities that are used in the delete operation
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="canCancel"></param>
+        public DeleteEventArgs(IEnumerable<TEntity> eventObject, bool canCancel) : base(eventObject, canCancel)
 		{
            MediaFilesToDelete = new List<string>();
 		}
@@ -60,7 +104,13 @@ namespace Umbraco.Core.Events

 	public class DeleteEventArgs : CancellableEventArgs
 	{
-		public DeleteEventArgs(int id, bool canCancel)
+        public DeleteEventArgs(int id, bool canCancel, EventMessages eventMessages)
+            : base(canCancel, eventMessages)
+        {
+            Id = id;
+        }
+
+        public DeleteEventArgs(int id, bool canCancel)
 			: base(canCancel)
 		{
 			Id = id;
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;

 namespace Umbraco.Core.Events
 {
@@ -7,16 +8,16 @@ namespace Umbraco.Core.Events
 	/// </summary>
 	public static class EventExtensions
 	{
-		/// <summary>
-		/// Raises the event and returns a boolean value indicating if the event was cancelled
-		/// </summary>
-		/// <typeparam name="TSender"></typeparam>
-		/// <typeparam name="TArgs"></typeparam>
-		/// <param name="eventHandler"></param>
-		/// <param name="args"></param>
-		/// <param name="sender"></param>
-		/// <returns></returns>
-		public static bool IsRaisedEventCancelled<TSender, TArgs>(
+        /// <summary>
+        /// Raises the event and returns a boolean value indicating if the event was cancelled
+        /// </summary>
+        /// <typeparam name="TSender"></typeparam>
+        /// <typeparam name="TArgs"></typeparam>
+        /// <param name="eventHandler"></param>
+        /// <param name="args"></param>
+        /// <param name="sender"></param>
+        /// <returns></returns>
+        public static bool IsRaisedEventCancelled<TSender, TArgs>(
 			this TypedEventHandler<TSender, TArgs> eventHandler,
 			TArgs args,
 			TSender sender)
@@ -27,16 +28,16 @@ namespace Umbraco.Core.Events

 			return args.Cancel;
 		}
-
-		/// <summary>
-		/// Raises the event
-		/// </summary>
-		/// <typeparam name="TSender"></typeparam>
-		/// <typeparam name="TArgs"></typeparam>
-		/// <param name="eventHandler"></param>
-		/// <param name="args"></param>
-		/// <param name="sender"></param>
-		public static void RaiseEvent<TSender, TArgs>(
+        
+        /// <summary>
+        /// Raises the event
+        /// </summary>
+        /// <typeparam name="TSender"></typeparam>
+        /// <typeparam name="TArgs"></typeparam>
+        /// <param name="eventHandler"></param>
+        /// <param name="args"></param>
+        /// <param name="sender"></param>
+        public static void RaiseEvent<TSender, TArgs>(
 			this TypedEventHandler<TSender, TArgs> eventHandler,
 			TArgs args,
 			TSender sender)
@@ -0,0 +1,27 @@
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// An event message
+    /// </summary>
+    public sealed class EventMessage
+    {        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EventMessage"/> class.
+        /// </summary>
+        public EventMessage(string category, string message, EventMessageType messageType = EventMessageType.Default)
+        {
+            Category = category;
+            Message = message;
+            MessageType = messageType;
+        }
+
+        public string Category { get; private set; }
+        public string Message { get; private set; }
+        public EventMessageType MessageType { get; private set; }
+
+        /// <summary>
+        /// This is used to track if this message should be used as a default message so that Umbraco doesn't also append it's own default messages
+        /// </summary>
+        internal bool IsDefaultEventMessage { get; set; }
+    }
+}
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Event messages collection
+    /// </summary>
+    public sealed class EventMessages : DisposableObject
+    {
+        private readonly List<EventMessage> _msgs = new List<EventMessage>();
+
+        public void Add(EventMessage msg)
+        {
+            _msgs.Add(msg);
+        }
+
+        public int Count
+        {
+            get { return _msgs.Count; }
+        }
+
+        public IEnumerable<EventMessage> GetAll()
+        {
+            return _msgs;
+        }
+
+        protected override void DisposeResources()
+        {
+            _msgs.Clear();
+        }
+    }
+}
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Event messages factory
+    /// </summary>
+    public interface IEventMessagesFactory
+    {
+        EventMessages Get();
+    }
+}
@@ -0,0 +1,14 @@
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// The type of event message
+    /// </summary>
+    public enum EventMessageType
+    {
+        Default = 0,
+        Info = 1,
+        Error = 2,
+        Success = 3,        
+        Warning = 4
+    }
+}
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using Semver;
 using Umbraco.Core.Persistence.Migrations;

 namespace Umbraco.Core.Events
@@ -13,11 +15,20 @@ namespace Umbraco.Core.Events
        /// <param name="targetVersion"></param>
        /// <param name="canCancel"></param>
        /// <param name="configuredVersion"></param>
+        public MigrationEventArgs(IList<IMigration> eventObject, SemVersion configuredVersion, SemVersion targetVersion, bool canCancel)
+            : base(eventObject, canCancel)
+        {
+            ConfiguredSemVersion = configuredVersion;
+            TargetSemVersion = targetVersion;
+        }
+
+        [Obsolete("Use constructor accepting UmbracoVersion instances instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public MigrationEventArgs(IList<IMigration> eventObject, Version configuredVersion, Version targetVersion, bool canCancel)
 			: base(eventObject, canCancel)
         {
-             ConfiguredVersion = configuredVersion;
-             TargetVersion = targetVersion;
+             ConfiguredSemVersion = new SemVersion(configuredVersion);
+             TargetSemVersion = new SemVersion(targetVersion);
         }

        /// <summary>
@@ -28,12 +39,12 @@ namespace Umbraco.Core.Events
        /// <param name="targetVersion"></param>
        /// <param name="canCancel"></param>
        /// <param name="configuredVersion"></param>
-        internal MigrationEventArgs(IList<IMigration> eventObject, MigrationContext migrationContext, Version configuredVersion, Version targetVersion, bool canCancel)
+        internal MigrationEventArgs(IList<IMigration> eventObject, MigrationContext migrationContext, SemVersion configuredVersion, SemVersion targetVersion, bool canCancel)
            : base(eventObject, canCancel)
        {
            MigrationContext = migrationContext;
-            ConfiguredVersion = configuredVersion;
-            TargetVersion = targetVersion;
+            ConfiguredSemVersion = configuredVersion;
+            TargetSemVersion = targetVersion;
        }

        /// <summary>
@@ -42,11 +53,20 @@ namespace Umbraco.Core.Events
        /// <param name="eventObject"></param>
        /// <param name="configuredVersion"></param>
        /// <param name="targetVersion"></param>
+        public MigrationEventArgs(IList<IMigration> eventObject, SemVersion configuredVersion, SemVersion targetVersion)
+            : base(eventObject)
+        {
+            ConfiguredSemVersion = configuredVersion;
+            TargetSemVersion = targetVersion;
+        }
+
+        [Obsolete("Use constructor accepting UmbracoVersion instances instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public MigrationEventArgs(IList<IMigration> eventObject, Version configuredVersion, Version targetVersion)
 			: base(eventObject)
 		{
-            ConfiguredVersion = configuredVersion;
-            TargetVersion = targetVersion;
+            ConfiguredSemVersion = new SemVersion(configuredVersion);
+            TargetSemVersion = new SemVersion(targetVersion);
 		}

 		/// <summary>
@@ -57,9 +77,23 @@ namespace Umbraco.Core.Events
 			get { return EventObject; }
 		}

-        public Version ConfiguredVersion { get; private set; }
+        [Obsolete("Use ConfiguredSemVersion instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Version ConfiguredVersion
+        {
+            get { return ConfiguredSemVersion.GetVersion(); }
+        }

-        public Version TargetVersion { get; private set; }
+        [Obsolete("Use TargetUmbracoVersion instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Version TargetVersion
+        {
+            get { return TargetSemVersion.GetVersion(); }
+        }
+
+        public SemVersion ConfiguredSemVersion { get; private set; }
+
+        public SemVersion TargetSemVersion { get; private set; }

        internal MigrationContext MigrationContext { get; private set; }
    }
@@ -4,22 +4,51 @@ using System.Linq;

 namespace Umbraco.Core.Events
 {
-    public class MoveEventInfo<TEntity>
-    {
-        public MoveEventInfo(TEntity entity, string originalPath, int newParentId)
-        {
-            Entity = entity;
-            OriginalPath = originalPath;
-            NewParentId = newParentId;
-        }
-
-        public TEntity Entity { get; set; }
-        public string OriginalPath { get; set; }
-        public int NewParentId { get; set; }
-    }
-
    public class MoveEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
    {
+        /// <summary>
+        /// Constructor accepting a collection of MoveEventInfo objects
+        /// </summary>
+        /// <param name="canCancel"></param>
+        /// <param name="eventMessages"></param>
+        /// <param name="moveInfo">
+        /// A colleciton of MoveEventInfo objects that exposes all entities that have been moved during a single move operation
+        /// </param>
+        public MoveEventArgs(bool canCancel, EventMessages eventMessages, params MoveEventInfo<TEntity>[] moveInfo)
+            : base(default(TEntity), canCancel, eventMessages)
+        {
+            if (moveInfo.FirstOrDefault() == null)
+            {
+                throw new ArgumentException("moveInfo argument must contain at least one item");
+            }
+
+            MoveInfoCollection = moveInfo;
+            //assign the legacy props
+            EventObject = moveInfo.First().Entity;
+            ParentId = moveInfo.First().NewParentId;
+        }
+
+        /// <summary>
+        /// Constructor accepting a collection of MoveEventInfo objects
+        /// </summary>
+        /// <param name="eventMessages"></param>
+        /// <param name="moveInfo">
+        /// A colleciton of MoveEventInfo objects that exposes all entities that have been moved during a single move operation
+        /// </param>
+        public MoveEventArgs(EventMessages eventMessages, params MoveEventInfo<TEntity>[] moveInfo)
+            : base(default(TEntity), eventMessages)
+        {
+            if (moveInfo.FirstOrDefault() == null)
+            {
+                throw new ArgumentException("moveInfo argument must contain at least one item");
+            }
+
+            MoveInfoCollection = moveInfo;
+            //assign the legacy props
+            EventObject = moveInfo.First().Entity;
+            ParentId = moveInfo.First().NewParentId;
+        }
+
        /// <summary>
        /// Constructor accepting a collection of MoveEventInfo objects
        /// </summary>
@@ -0,0 +1,16 @@
+namespace Umbraco.Core.Events
+{
+    public class MoveEventInfo<TEntity>
+    {
+        public MoveEventInfo(TEntity entity, string originalPath, int newParentId)
+        {
+            Entity = entity;
+            OriginalPath = originalPath;
+            NewParentId = newParentId;
+        }
+
+        public TEntity Entity { get; set; }
+        public string OriginalPath { get; set; }
+        public int NewParentId { get; set; }
+    }
+}
@@ -4,7 +4,39 @@ namespace Umbraco.Core.Events
 {
 	public class NewEventArgs<TEntity> : CancellableObjectEventArgs<TEntity>
 	{
-		public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId) : base(eventObject, canCancel)
+
+
+        public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+            Alias = alias;
+            ParentId = parentId;
+        }
+
+        public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, TEntity parent, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+            Alias = alias;
+            Parent = parent;
+        }
+
+        public NewEventArgs(TEntity eventObject, string @alias, int parentId, EventMessages eventMessages) 
+            : base(eventObject, eventMessages)
+        {
+            Alias = alias;
+            ParentId = parentId;
+        }
+
+        public NewEventArgs(TEntity eventObject, string @alias, TEntity parent, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+            Alias = alias;
+            Parent = parent;
+        }
+
+
+
+        public NewEventArgs(TEntity eventObject, bool canCancel, string @alias, int parentId) : base(eventObject, canCancel)
 		{
 			Alias = alias;
 			ParentId = parentId;
@@ -4,6 +4,52 @@ namespace Umbraco.Core.Events
 {
    public class PublishEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
    {
+        /// <summary>
+        /// Constructor accepting multiple entities that are used in the publish operation
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="canCancel"></param>
+        /// <param name="isAllPublished"></param>
+        /// <param name="eventMessages"></param>
+        public PublishEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, bool isAllPublished, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+            IsAllRepublished = isAllPublished;
+        }
+
+        /// <summary>
+        /// Constructor accepting multiple entities that are used in the publish operation
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="eventMessages"></param>
+        public PublishEventArgs(IEnumerable<TEntity> eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+        }
+
+        /// <summary>
+        /// Constructor accepting a single entity instance
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="eventMessages"></param>
+        public PublishEventArgs(TEntity eventObject, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, eventMessages)
+        {
+        }
+
+        /// <summary>
+        /// Constructor accepting a single entity instance
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="canCancel"></param>
+        /// <param name="isAllPublished"></param>
+        /// <param name="eventMessages"></param>
+        public PublishEventArgs(TEntity eventObject, bool canCancel, bool isAllPublished, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, canCancel, eventMessages)
+        {
+            IsAllRepublished = isAllPublished;
+        }
+
        /// <summary>
        /// Constructor accepting multiple entities that are used in the publish operation
        /// </summary>
@@ -4,12 +4,55 @@ namespace Umbraco.Core.Events
 {
 	public class SaveEventArgs<TEntity> : CancellableObjectEventArgs<IEnumerable<TEntity>>
 	{
-		/// <summary>
-		/// Constructor accepting multiple entities that are used in the saving operation
-		/// </summary>
-		/// <param name="eventObject"></param>
-		/// <param name="canCancel"></param>
-		public SaveEventArgs(IEnumerable<TEntity> eventObject, bool canCancel)
+	    /// <summary>
+	    /// Constructor accepting multiple entities that are used in the saving operation
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="canCancel"></param>
+	    /// <param name="eventMessages"></param>
+	    public SaveEventArgs(IEnumerable<TEntity> eventObject, bool canCancel, EventMessages eventMessages)
+            : base(eventObject, canCancel, eventMessages)
+        {
+        }
+
+	    /// <summary>
+	    /// Constructor accepting multiple entities that are used in the saving operation
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="eventMessages"></param>
+	    public SaveEventArgs(IEnumerable<TEntity> eventObject, EventMessages eventMessages)
+            : base(eventObject, eventMessages)
+        {
+        }
+
+	    /// <summary>
+	    /// Constructor accepting a single entity instance
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="eventMessages"></param>
+	    public SaveEventArgs(TEntity eventObject, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, eventMessages)
+        {
+        }
+
+	    /// <summary>
+	    /// Constructor accepting a single entity instance
+	    /// </summary>
+	    /// <param name="eventObject"></param>
+	    /// <param name="canCancel"></param>
+	    /// <param name="eventMessages"></param>
+	    public SaveEventArgs(TEntity eventObject, bool canCancel, EventMessages eventMessages)
+            : base(new List<TEntity> { eventObject }, canCancel, eventMessages)
+        {
+        }
+
+
+        /// <summary>
+        /// Constructor accepting multiple entities that are used in the saving operation
+        /// </summary>
+        /// <param name="eventObject"></param>
+        /// <param name="canCancel"></param>
+        public SaveEventArgs(IEnumerable<TEntity> eventObject, bool canCancel)
 			: base(eventObject, canCancel)
 		{
 		}
--- a/Show More
+++ b/Show More