Minor tweaks to ExecutionMigrationStep and PackageMigrationsContext.

Adds tests for ExecutionMigrationStep and PackageMigrationsContext.

.gitignore

@@ -56,7 +56,6 @@ build/*.nupkg
 src/Umbraco.Tests/config/applications.config
 src/Umbraco.Tests/config/trees.config
 src/Umbraco.Web.UI/web.config
-src/Umbraco.Web.UI/Config/ClientDependency.config
 *.orig
 src/Umbraco.Tests/config/404handlers.config
 src/Umbraco.Web.UI/[Vv]iews/*.cshtml
@@ -140,6 +139,3 @@ apidocs/api/*
 build/docs.zip
 build/ui-docs.zip
 build/csharp-docs.zip
-build/msbuild.log
-.vs/
-src/packages/

README.md

@@ -1,52 +1,40 @@
 Umbraco CMS
 ===========
-The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 390,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
-
-[![ScreenShot](vimeo.png)](https://vimeo.com/172382998/)
-
-## Umbraco CMS ##
-Umbraco is a free open source Content Management System built on the ASP.NET platform. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
-
+Umbraco is a free open source Content Management System built on the ASP.NET platform.
 
 ## Building Umbraco from source ##
-
-The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt vs` in `src\Umbraco.Web.UI.Client`.
+The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt dev` in `src\Umbraco.Web.UI.Client`.
  
-If you're interested in making changes to Belle without running Visual Studio make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). 
+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.
 
-Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
-
-## Watch an introduction video ##
+## Watch a introduction video ##
 
 [![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
 
-## Umbraco - The Friendly CMS ##
+## Umbraco - the simple, flexible and friendly ASP.NET CMS ##
 
-For the first time on the Microsoft platform, there is 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 has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. 
+**More than 350,000 sites trust Umbraco** 
 
-Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
+For the first time on the Microsoft platform, there is 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 has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developer's dream and your users will love it too. 
 
-Used by more than 350,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 200,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
+Used by more than 350,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)), you can be sure that the technology is proven, stable and scales.  
 
-To view more examples, please visit [https://umbraco.com/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
-
-## Why Open Source? ##
-As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible and community contributions and packages are available for all to use.
+To view more examples, please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
 
 ## Downloading ##
 
-The downloadable Umbraco releases live at [https://our.umbraco.org/download](https://our.umbraco.org/download).
+The downloadable Umbraco releases live at [http://our.umbraco.org/download](http://our.umbraco.org/download).
 
 ## Forums ##
 
-Peer-to-peer support is available 24/7 at the community forum on [https://our.umbraco.org](https://our.umbraco.org). 
+We have a forum running on [http://our.umbraco.org](http://our.umbraco.org). The discussions group on [Google Groups](https://groups.google.com/forum/#!forum/umbraco-dev) is for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [http://our.umbraco.org](http://our.umbraco.org).
 
 ## Contribute to Umbraco ##
 
-Umbraco is contribution focused and community driven. If you want to contribute back to Umbraco please check out our [guide to contributing](https://our.umbraco.org/contribute).
+If you want to contribute back to Umbraco you should check out our [guide to contributing](http://our.umbraco.org/contribute).
 
 ## Found a bug? ##
 
-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 for reporting issues](https://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+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 for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
 
 To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).

appveyor.yml

@@ -2,52 +2,45 @@ version: '{build}'
 shallow_clone: true
 build_script:
 - cmd: >-
-    SET SLN=%CD%
-
-    SET SRC=%SLN%\src
-
-    SET PACKAGES=%SRC%\packages
-
-    CD build
+    cd build
 
     SET "release="
 
     FOR /F "skip=1 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED release SET "release=%%i"
 
-    ECHO "Restoring NuGet into %PACKAGES%"
-    
-    %SRC%\.nuget\NuGet.exe sources Add -Name MyGetUmbracoCore -Source https://www.myget.org/F/umbracocore/api/v2/ >NUL
-    
-    %SRC%\.nuget\NuGet.exe restore %SRC%\umbraco.sln -Verbosity Quiet -NonInteractive -PackagesDirectory %PACKAGES%
+    SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+
+    ECHO %PATH%
+
 
     ECHO Building Release %release% build%APPVEYOR_BUILD_NUMBER%
-    
-    SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-    
+
+
+    SET nuGetFolder=%CD%\..\src\packages\
+
+    ..\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% -Verbosity quiet
+
+
+    IF EXIST ..\src\umbraco.businesslogic\packages.config ..\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
+
+
     SET MSBUILD="C:\Program Files (x86)\MSBuild\14.0\Bin\MsBuild.exe"
 
-    XCOPY "%SRC%\Umbraco.Tests\unit-test-log4net.CI.config" "%SRC%\Umbraco.Tests\unit-test-log4net.config" /Y
-    
-    %MSBUILD% "%SLN%/src/Umbraco.Tests/Umbraco.Tests.csproj" /consoleloggerparameters:Summary;ErrorsOnly;WarningsOnly /p:NugetPackagesDirectory=%PACKAGES%
-    
-    build.bat -integration -release:%release% -comment:build%APPVEYOR_BUILD_NUMBER% -nugetfolder:%PACKAGES%
-    
+    %MSBUILD% "../src/Umbraco.Tests/Umbraco.Tests.csproj" /verbosity:minimal
+
+
+    build.bat %release% build%APPVEYOR_BUILD_NUMBER%
+
+
+    ECHO %PATH%
 test:
   assemblies: src\Umbraco.Tests\bin\Debug\Umbraco.Tests.dll
 artifacts:
 - path: build\UmbracoCms.*
-  name: UmbracoFiles
-- path: build\msbuild.log
-  name: BuildLog
-deploy:
-- provider: AzureBlob
-  storage_account_name: umbraconightlies
-  storage_access_key:
-    secure: bmEMml2SF7QLHULiePa/a01XOeIa2SxJeXuaZ+1R27b+Vb2nNUQVYiPlUyF2cZAFSHI/zO/LekRsVU1rTescGhJjF7SSjKybymI3p+F/OWpwqiu2WfFee1ofXBFx8QHw
-  container: umbraco-750
-  artifact: UmbracoFiles
-  on:
-    branch: dev-v7
 notifications:
 - provider: Slack
   auth_token:

build/Build.bat

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

build/Build.proj

@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <!--
+  <!-- 
  ****************************************************
- INCLUDES
+ INCLUDES 
  *****************************************************
  -->
 
@@ -35,9 +35,9 @@
                         {
                             using (var cryptoProvider = new SHA1CryptoServiceProvider())
                             {
-
+                                
                                 var fileHash = cryptoProvider.ComputeHash(stream);
-
+                                
                                 using (TextWriter w = new StreamWriter(OutputFile, false))
                                 {
                                     w.WriteLine(string.Join("", fileHash.Select(b => b.ToString("x2"))));
@@ -52,9 +52,9 @@
   </UsingTask>
 
 
-  <!--
+  <!-- 
  ****************************************************
- VARIABLES
+ VARIABLES 
  *****************************************************
  -->
 
@@ -102,9 +102,9 @@
     <SystemFolders Include="$(WebAppFolder)Views" />
   </ItemGroup>
 
-  <!--
+  <!-- 
  ****************************************************
- TARGETS
+ TARGETS 
  *****************************************************
  -->
 
@@ -155,7 +155,7 @@
 
     <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
   </Target>
-
+  
   <Target Name="CreateSystemFolders" DependsOnTargets="CopyBelleBuild" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
     <MakeDir Directories="@(SystemFolders)" />
   </Target>
@@ -231,7 +231,7 @@
       DestinationFiles="@(CustomLanguageFiles->'$(ConfigsFolder)Lang\%(RecursiveDir)%(Filename)%(Extension)')"
       OverwriteReadOnlyFiles="true"
       SkipUnchangedFiles="false" />
-
+	  
     <Copy SourceFiles="@(WebConfigTransformFile)"
       DestinationFiles="$(ConfigsFolder)Web.config.transform"
       OverwriteReadOnlyFiles="true"
@@ -264,12 +264,14 @@
     <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
     <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
     <!-- Build the Umbraco.Web.UI project -->
-    <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath);Verbosity=minimal" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False" />
+    <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="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
     <PropertyGroup>
       <NewVersion>$(BUILD_RELEASE)</NewVersion>
@@ -305,34 +307,34 @@
       ReplacementText="AssemblyFileVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
 
     <!--This updates the AssemblyInformationalVersion for the solution to the umbraco version and comment-->
-    <FileUpdate
+    <FileUpdate 
       Condition="'$(BUILD_COMMENT)'!=''"
       Files="..\src\SolutionInfo.cs"
       Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
       ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_COMMENT)&quot;)"/>
-    <FileUpdate
+    <FileUpdate 
       Condition="'$(BUILD_COMMENT)'==''"
       Files="..\src\SolutionInfo.cs"
       Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
       ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)&quot;)"/>
-    <FileUpdate
+    <FileUpdate 
       Condition="'$(BUILD_NIGHTLY)'!=''"
       Files="..\src\SolutionInfo.cs"
       Regex="AssemblyInformationalVersion\(&quot;(.+)?&quot;\)"
       ReplacementText="AssemblyInformationalVersion(&quot;$(BUILD_RELEASE)-$(BUILD_NIGHTLY)&quot;)"/>
-	<FileUpdate
+	<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
+    <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
+    <FileUpdate 
       Files="..\src\SolutionInfo.cs"
       Regex="AssemblyCopyright\(&quot;Copyright © Umbraco (\d{4})&quot;\)"
       ReplacementText="AssemblyCopyright(&quot;Copyright © Umbraco $([System.DateTime]::Now.ToString(`yyyy`))&quot;)"/>

build/BuildBelle.bat

@@ -23,7 +23,6 @@ ECHO Change directory to %CD%\..\src\Umbraco.Web.UI.Client\
 CD %CD%\..\src\Umbraco.Web.UI.Client\
 
 ECHO Do npm install and the grunt build of Belle
-call npm cache clean --quiet
 call npm install --quiet
 call npm install -g grunt-cli --quiet
 call npm install -g bower --quiet

build/InstallGit.cmd

@@ -2,32 +2,22 @@
 SETLOCAL
 REM SETLOCAL is on, so changes to the path not persist to the actual user's path
 
-git.exe --version
-IF %ERRORLEVEL%==9009 GOTO :trydefaultpath
-REM OK, DONE
+git.exe 2> NUL
+if %ERRORLEVEL%==9009 GOTO :trydefaultpath
 GOTO :EOF
 
 :trydefaultpath
-PATH=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
-git.exe --version
-IF %ERRORLEVEL%==9009 GOTO :showerror
-REM OK, DONE
+path=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
+git.exe 2> NUL
+if %ERRORLEVEL%==9009 GOTO :showerror
 GOTO :EOF
 
 :showerror
 ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\cmd nor in C:\Program Files\Git\cmd
-SET /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
-IF %install%==y (
-	:: Create a temporary batch file to execute either after elevating to admin or as-is when the user is already admin
-	ECHO @ECHO OFF > "%temp%\ChocoInstallGit.cmd"
-	ECHO SETLOCAL >> "%temp%\ChocoInstallGit.cmd"
-	ECHO ECHO Installing Chocolatey first >> "%temp%\ChocoInstallGit.cmd"
-	ECHO @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" >> "%temp%\ChocoInstallGit.cmd"
-	ECHO SET PATH=%%PATH%%;%%ALLUSERSPROFILE%%\chocolatey\bin >> "%temp%\ChocoInstallGit.cmd"
-	ECHO choco install git -y >> "%temp%\ChocoInstallGit.cmd"
-	
+set /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
+if %install%==y (
 	GOTO :installgit
-) ELSE (
+) else (
 	GOTO :cantcontinue
 )
 
@@ -36,28 +26,7 @@ ECHO Can't complete the build without Git being in the path. Please add it to be
 GOTO :EOF
 
 :installgit
-pushd %~dp0
-    :: Running prompt elevated
-
-:: --> Check for permissions
->nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
-
-:: --> If error flag set, we do not have admin.
-IF '%errorlevel%' NEQ '0' (
-    GOTO UACPrompt
-) ELSE ( GOTO gotAdmin )
-
-:UACPrompt
-    ECHO You're not currently running this with admin privileges, we'll now try to execute the install of Git through Chocolatey after elevating to admin privileges
-    ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
-    ECHO UAC.ShellExecute "%temp%\ChocoInstallGit.cmd", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
-	
-    "%temp%\getadmin.vbs"
-    EXIT /B
-	
-:gotAdmin
-    IF EXIST "%temp%\getadmin.vbs" ( DEL "%temp%\getadmin.vbs" )
-    pushd "%CD%"
-    CD /D "%~dp0"
-	
-    CALL "%temp%\ChocoInstallGit.cmd"
+ECHO Installing Chocolatey first
+@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
+ECHO Installing Git through Chocolatey
+choco install git

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -27,19 +27,16 @@
       <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
       <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.9.2, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.8.4, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
-	  <!-- AutoMapper can not be updated due to: https://github.com/AutoMapper/AutoMapper/issues/373#issuecomment-127644405 -->
-      <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
-      <dependency id="Examine" version="[0.1.80, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.1, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.0, 5.0.0)" />
+      <dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
+      <dependency id="Examine" version="[0.1.68, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.3.3, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.5.3, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 2.0.0)" />
       <dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />	  
-	  <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
       <dependency id="Markdown" version="[1.14.4, 2.0.0)" />	  
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, 5.0.0)" />
     </dependencies>
   </metadata>
   <files>
@@ -104,4 +101,4 @@
     <file src="..\_BuildOutput\bin\UmbracoExamine.pdb" target="lib" />
     <file src="..\..\src\UmbracoExamine\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\UmbracoExamine" />
   </files>
-</package>
+</package>

build/NuSpecs/UmbracoCms.nuspec

@@ -16,9 +16,8 @@
     <tags>umbraco</tags>
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.5, 4.0.0)" />
-      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.2, 4.0.0)" />
     </dependencies>
   </metadata>
   <files>
@@ -33,7 +32,6 @@
     <file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
     <file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
     <file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
-    <file src="..\_BuildOutput\WebApp\Media\Web.config" target="Content\Media\Web.config" />
     <file src="tools\install.ps1" target="tools\install.ps1" />
     <file src="tools\Readme.txt" target="tools\Readme.txt" />
     <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
@@ -44,7 +42,6 @@
     <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
     <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
     <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
-    <file src="tools\processing.config.install.xdt" target="Content\Config\imageprocessor\processing.config.install.xdt" />
     <file src="build\**" target="build" />
   </files>
-</package>
+</package>

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

@@ -21,12 +21,6 @@
   </section>
 
   <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <areas xdt:Transform="InsertIfMissing">
-      <area xdt:Transform="InsertIfMissing">developer</area>
-    </areas>  
-  </section>
-  
-  <section alias="StartupDeveloperDashboardSection">
     <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
       <control showOnce="true" addPanel="true" panelCaption="">
         views/dashboard/developer/developerdashboardvideos.html
@@ -36,21 +30,16 @@
   </section>
   
   <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-	<tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
+      <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
       <control>
         views/dashboard/developer/examinemanagement.html
       </control>
-    </tab>
-    <tab caption="Health Check" xdt:Transform="InsertIfMissing" xdt:Locator="Match(caption)">
+    </tab>    
+    <tab caption="Xml Data Integrity Report" xdt:Transform="InsertIfMissing">
       <control>
-        views/dashboard/developer/healthcheck.html
+        views/dashboard/developer/xmldataintegrityreport.html
       </control>
-    </tab>
-    <tab caption="Redirect URL Management" xdt:Transform="InsertIfMissing" xdt:Locator="Match(caption)">
-      <control>
-        views/dashboard/developer/redirecturls.html
-      </control>
-    </tab>	
+    </tab>  
   </section>
   
   <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
@@ -63,6 +52,19 @@
     </tab>
   </section>
   
+  <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>
+        <grant>admin</grant>
+      </access>
+      <control showOnce="true" addPanel="true" panelCaption="">
+        views/dashboard/default/startupdashboardintro.html
+      </control>
+    </tab>
+    <tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+  </section>
+  
   <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
     <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
     <tab caption="Get Started" xdt:Transform="Insert">
@@ -78,6 +80,5 @@
     
   <section alias="StartupDashboardSection">
 	<tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-	<tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
   </section>
 </dashBoard>

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

@@ -292,8 +292,6 @@
       <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
       <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
       <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
       <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
       <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
     </staticContent>
@@ -319,7 +317,6 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
       <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" />
@@ -335,14 +332,10 @@
 
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Transform="Insert">
+      <dependentAssembly>
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
       </dependentAssembly>
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
-      </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>

build/NuSpecs/tools/install.core.ps1

@@ -71,7 +71,6 @@ if ($project) {
 		if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll) { Remove-Item $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll -Force -Confirm:$false }

build/NuSpecs/tools/install.ps1

@@ -97,12 +97,7 @@ if ($project) {
 		$umbracoUIXMLSource = Join-Path $installPath "UmbracoFiles\Umbraco\Config\Create\UI.xml"
 		$umbracoUIXMLDestination = Join-Path $projectPath "Umbraco\Config\Create\UI.xml"
 		Copy-Item $umbracoUIXMLSource $umbracoUIXMLDestination -Force
-	} else {
-		$upgradeViewSource = Join-Path $umbracoFolderSource "Views\install\*"
-		$upgradeView = Join-Path $umbracoFolder "Views\install\"
-		Write-Host "Copying2 ${upgradeViewSource} to ${upgradeView}"
-		Copy-Item $upgradeViewSource $upgradeView -Force
-	}
+	} 
 	
 	$installFolder = Join-Path $projectPath "Install"
 	if(Test-Path $installFolder) {

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

@@ -1 +0,0 @@
-<processing xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xdt:Transform="SetAttributes(preserveExifMetaData)" preserveExifMetaData="true" />

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

@@ -55,29 +55,21 @@
        xdt:Transform="SetAttributes()" />
 
   <!--Developer-->
-  <add alias="packager" application="developer"
+  <add alias="datatype" application="developer"
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="Remove" />
-  <add alias="packagerPackages" application="developer"
+  <add initialize="true" sortOrder="0" alias="datatypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" 
        xdt:Locator="Match(application,alias)" 
-       xdt:Transform="Remove" />
-  <add initialize="true" sortOrder="0" alias="packager" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, umbraco" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing"  />
-  
-  <!-- Before 7.4 this tree had the alias 'dataType', without the 's' on the end, this is here to rename it  -->
-  <add sortOrder="1" alias="dataTypes" application="developer" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco"
-       xdt:Locator="Match(application,type)" 
-       xdt:Transform="SetAttributes(alias,sortOrder)" />
-	   
-  <!-- Yes, set the sortOrder again, like above because.. sometimes apparently we already have a dataTypes node and we can't remove more than one.. if they're equal though (same alias,application and sortOrder) it doesn't throw an error -->   
-  <add sortOrder="1" alias="dataTypes" application="developer"
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes(sortOrder)" />
-	   
+       xdt:Transform="InsertIfMissing" />
   <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" 
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
+  <add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />

build/UmbracoVersion.txt

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

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

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

src/SQLCE4Umbraco/SqlCEHelper.cs

@@ -40,10 +40,15 @@ namespace SqlCE4Umbraco
             var localConnection = new SqlCeConnection(ConnectionString);
             if (!System.IO.File.Exists(ReplaceDataDirectory(localConnection.Database)))
             {
-                using (var sqlCeEngine = new SqlCeEngine(ConnectionString))
-                {
-                    sqlCeEngine.CreateDatabase();
-                }
+                var sqlCeEngine = new SqlCeEngine(ConnectionString);
+                sqlCeEngine.CreateDatabase();
+
+                // SD: Pretty sure this should be in a using clause but i don't want to cause unknown side-effects here
+                // since it's been like this for quite some time
+                //using (var sqlCeEngine = new SqlCeEngine(ConnectionString))
+                //{
+                //    sqlCeEngine.CreateDatabase();    
+                //}
             }
         }
 
@@ -180,16 +185,12 @@ namespace SqlCE4Umbraco
         /// <returns>The return value of the command.</returns>
         protected override object ExecuteScalar(string commandText, SqlCeParameter[] parameters)
         {
-#if DEBUG && DebugDataLayer
+            #if DEBUG && DebugDataLayer
                 // Log Query Execution
                 Trace.TraceInformation(GetType().Name + " SQL ExecuteScalar: " + commandText);
-#endif
-            using (var cc = UseCurrentConnection)
-            {
-                return SqlCeApplicationBlock.ExecuteScalar(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters);
-            }
+            #endif
+
+            return SqlCeApplicationBlock.ExecuteScalar(ConnectionString, CommandType.Text, commandText, parameters);
         }
 
         /// <summary>
@@ -202,17 +203,12 @@ namespace SqlCE4Umbraco
         /// </returns>
         protected override int ExecuteNonQuery(string commandText, SqlCeParameter[] parameters)
         {
-#if DEBUG && DebugDataLayer
+            #if DEBUG && DebugDataLayer
                 // Log Query Execution
                 Trace.TraceInformation(GetType().Name + " SQL ExecuteNonQuery: " + commandText);
-#endif
+            #endif
 
-            using (var cc = UseCurrentConnection)
-            {
-                return SqlCeApplicationBlock.ExecuteNonQuery(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters);
-            }
+            return SqlCeApplicationBlock.ExecuteNonQuery(ConnectionString, CommandType.Text, commandText, parameters);
         }
 
         /// <summary>
@@ -225,17 +221,13 @@ namespace SqlCE4Umbraco
         /// </returns>
         protected override IRecordsReader ExecuteReader(string commandText, SqlCeParameter[] parameters)
         {
-#if DEBUG && DebugDataLayer
+            #if DEBUG && DebugDataLayer
                 // Log Query Execution
                 Trace.TraceInformation(GetType().Name + " SQL ExecuteReader: " + commandText);
-#endif
+            #endif
 
-            using (var cc = UseCurrentConnection)
-            {
-                return new SqlCeDataReaderHelper(SqlCeApplicationBlock.ExecuteReader(
-                    (SqlCeConnection) cc.Connection, (SqlCeTransaction) cc.Transaction,
-                    CommandType.Text, commandText, parameters));
-            }
+            return new SqlCeDataReaderHelper(SqlCeApplicationBlock.ExecuteReader(ConnectionString, CommandType.Text,
+                                                            commandText, parameters));
         }
 
 

src/SQLCE4Umbraco/SqlCEInstaller.cs

@@ -21,15 +21,15 @@ namespace SqlCE4Umbraco
     public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
     {
         #region Private Constants
-
+       
         /// <summary>The latest database version this installer supports.</summary>
         private const DatabaseVersion LatestVersionSupported = DatabaseVersion.Version4_8;
 
         /// <summary>The specifications to determine the database version.</summary>
         private static readonly VersionSpecs[] m_VersionSpecs = new VersionSpecs[] {
-                    new VersionSpecs("SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS LEFT OUTER JOIN umbracoApp ON appAlias = appAlias WHERE CONSTRAINT_NAME = 'FK_umbracoUser2app_umbracoApp'", 0, DatabaseVersion.Version4_8),
-                    new VersionSpecs("SELECT id FROM umbracoNode WHERE id = -21", 1, DatabaseVersion.Version4_1),
-                    new VersionSpecs("SELECT action FROM umbracoAppTree",DatabaseVersion.Version4),
+					new VersionSpecs("SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS LEFT OUTER JOIN umbracoApp ON appAlias = appAlias WHERE CONSTRAINT_NAME = 'FK_umbracoUser2app_umbracoApp'", 0, DatabaseVersion.Version4_8), 
+					new VersionSpecs("SELECT id FROM umbracoNode WHERE id = -21", 1, DatabaseVersion.Version4_1),        
+					new VersionSpecs("SELECT action FROM umbracoAppTree",DatabaseVersion.Version4),
                     new VersionSpecs("SELECT description FROM cmsContentType",DatabaseVersion.Version3),
                     new VersionSpecs("SELECT id FROM sysobjects",DatabaseVersion.None) };
 
@@ -43,9 +43,8 @@ namespace SqlCE4Umbraco
         public override bool CanConnect
         {
             get
-            {
-                using (var sqlHelper = SqlHelper)
-                    sqlHelper.CreateEmptyDatabase();
+            {                
+                SqlHelper.CreateEmptyDatabase();
                 return base.CanConnect;
             }
         }
@@ -94,22 +93,22 @@ namespace SqlCE4Umbraco
 
         #region DefaultInstaller Members       
 
-        /// <summary>
-        /// Returns the sql to do a full install
-        /// </summary>
-        protected override string FullInstallSql
-        {
-            get { return string.Empty; }
-        }
+		/// <summary>
+		/// Returns the sql to do a full install
+		/// </summary>
+		protected override string FullInstallSql
+		{
+			get { return string.Empty; }
+		}
 
 
-        /// <summary>
-        /// Returns the sql to do an upgrade
-        /// </summary>
-        protected override string UpgradeSql
-        {
-            get { return string.Empty; }
-        }
+		/// <summary>
+		/// Returns the sql to do an upgrade
+		/// </summary>
+		protected override string UpgradeSql
+		{
+			get { return string.Empty; }
+		}
 
         // We need to override this as the default way of detection a db connection checks for systables that doesn't exist
         // in a CE db
@@ -124,9 +123,8 @@ namespace SqlCE4Umbraco
             // verify connection
             try
             {
-                using (var sqlHelper = SqlHelper)
-                    if (SqlCeApplicationBlock.VerifyConnection(sqlHelper.ConnectionString))
-                        return DatabaseVersion.None;
+                if (SqlCeApplicationBlock.VerifyConnection(base.SqlHelper.ConnectionString))
+                    return DatabaseVersion.None;
             }
             catch (Exception e)
             {

src/SQLCE4Umbraco/SqlCETableUtility.cs

@@ -37,15 +37,13 @@ namespace SqlCE4Umbraco
             ITable table = null;
 
             // get name in correct casing
-            using (var sqlHelper = SqlHelper)
-                name = sqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
-                                                          sqlHelper.CreateParameter("name", name));
+            name = SqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
+                                                          SqlHelper.CreateParameter("name", name));
             if (name != null)
             {
                 table = new DefaultTable(name);
 
-                using (var sqlHelper = SqlHelper)
-                using (IRecordsReader reader = sqlHelper.ExecuteReader(
+                using (IRecordsReader reader = SqlHelper.ExecuteReader(
                         @"SELECT c.name AS Name, st.name AS DataType, c.max_length, c.is_nullable, c.is_identity
                           FROM sys.tables AS t
                             JOIN sys.columns AS c ON t.object_id = c.object_id
@@ -53,7 +51,7 @@ namespace SqlCE4Umbraco
                             JOIN sys.types AS ty ON ty.user_type_id = c.user_type_id
                             JOIN sys.types st ON ty.system_type_id = st.user_type_id
                           WHERE t.name = @name
-                          ORDER BY c.column_id", sqlHelper.CreateParameter("name", name)))
+                          ORDER BY c.column_id", SqlHelper.CreateParameter("name", name)))
                 {
                     while (reader.Read())
                     {
@@ -114,8 +112,7 @@ namespace SqlCE4Umbraco
 
             // create query
             StringBuilder createTableQuery = new StringBuilder();
-            using (var sqlHelper = SqlHelper)
-                createTableQuery.AppendFormat("CREATE TABLE [{0}] (", sqlHelper.EscapeString(table.Name));
+            createTableQuery.AppendFormat("CREATE TABLE [{0}] (", SqlHelper.EscapeString(table.Name));
 
             // add fields
             while (hasNext)
@@ -139,8 +136,7 @@ namespace SqlCE4Umbraco
             // execute query
             try
             {
-                using (var sqlHelper = SqlHelper)
-                    sqlHelper.ExecuteNonQuery(createTableQuery.ToString());
+                SqlHelper.ExecuteNonQuery(createTableQuery.ToString());
             }
             catch (Exception executeException)
             {
@@ -158,15 +154,13 @@ namespace SqlCE4Umbraco
             Debug.Assert(table != null && field != null);
 
             StringBuilder addColumnQuery = new StringBuilder();
-            using (var sqlHelper = SqlHelper)
-                addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
-                                        sqlHelper.EscapeString(table.Name),
-                                        sqlHelper.EscapeString(field.Name),
-                                        sqlHelper.EscapeString(GetDatabaseType(field)));
+            addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
+                                        SqlHelper.EscapeString(table.Name),
+                                        SqlHelper.EscapeString(field.Name),
+                                        SqlHelper.EscapeString(GetDatabaseType(field)));
             try
             {
-                using (var sqlHelper = SqlHelper)
-                    sqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
+                SqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
             }
             catch (Exception executeException)
             {

src/SQLCE4Umbraco/SqlCeApplicationBlock.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Data.SqlServerCe;
 using System.Data;
 using System.Diagnostics;
@@ -23,60 +25,29 @@ namespace SqlCE4Umbraco
             string commandText,
             params SqlCeParameter[] commandParameters
             )
-        {
-            try
-            {
-                using (var conn = SqlCeContextGuardian.Open(connectionString))
-                {
-                    return ExecuteScalarTry(conn, null, commandText, commandParameters);
-                }
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running Scalar: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee);
-            }
-        }
-
-        public static object ExecuteScalar(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            try
-            {
-                return ExecuteScalarTry(conn, trx, commandText, commandParameters);
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running Scalar: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee);
-            }
-        }
-
-        public static object ExecuteScalar(
-            SqlCeConnection conn,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            return ExecuteScalar(conn, null, commandType, commandText, commandParameters);
-        }
-
-        private static object ExecuteScalarTry(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
         {
             object retVal;
-            using (var cmd = trx == null ? new SqlCeCommand(commandText, conn) : new SqlCeCommand(commandText, conn, trx))
+
+            try
             {
-                AttachParameters(cmd, commandParameters);
-                Debug.WriteLine("---------------------------------SCALAR-------------------------------------");
-                Debug.WriteLine(commandText);
-                Debug.WriteLine("----------------------------------------------------------------------------");
-                retVal = cmd.ExecuteScalar();
+                using (SqlCeConnection conn = SqlCeContextGuardian.Open(connectionString))
+                {
+                    using (SqlCeCommand cmd = new SqlCeCommand(commandText, conn))
+                    {
+                        AttachParameters(cmd, commandParameters);
+                        Debug.WriteLine("---------------------------------SCALAR-------------------------------------");
+                        Debug.WriteLine(commandText);
+                        Debug.WriteLine("----------------------------------------------------------------------------");
+                        retVal = cmd.ExecuteScalar();
+                    }
+                }
+
+                return retVal;
+            }
+            catch (Exception ee)
+            {
+                throw new SqlCeProviderException("Error running Scalar: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
             }
-            return retVal;
         }
 
         /// <summary>
@@ -95,10 +66,49 @@ namespace SqlCE4Umbraco
         {
             try
             {
-                using (var conn = SqlCeContextGuardian.Open(connectionString))
+                int rowsAffected;
+                using (SqlCeConnection conn = SqlCeContextGuardian.Open(connectionString))
                 {
-                    return ExecuteNonQueryTry(conn, null, commandText, commandParameters);
+                    // this is for multiple queries in the installer
+                    if (commandText.Trim().StartsWith("!!!"))
+                    {
+                        commandText = commandText.Trim().Trim('!');
+                        string[] commands = commandText.Split('|');
+                        string currentCmd = String.Empty;
+
+                        foreach (string cmd in commands)
+                        {
+                            try
+                            {
+                                currentCmd = cmd;
+                                if (!String.IsNullOrWhiteSpace(cmd))
+                                {
+                                    SqlCeCommand c = new SqlCeCommand(cmd, conn);
+                                    c.ExecuteNonQuery();
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                Debug.WriteLine("*******************************************************************");
+                                Debug.WriteLine(currentCmd);
+                                Debug.WriteLine(e);
+                                Debug.WriteLine("*******************************************************************");
+                            }
+                        }
+                        return 1;
+                    }
+                    else
+                    {
+                        Debug.WriteLine("----------------------------------------------------------------------------");
+                        Debug.WriteLine(commandText);
+                        Debug.WriteLine("----------------------------------------------------------------------------");
+                        SqlCeCommand cmd = new SqlCeCommand(commandText, conn);
+                        AttachParameters(cmd, commandParameters);
+                        rowsAffected = cmd.ExecuteNonQuery();
+                    }
                 }
+
+                return rowsAffected;
             }
             catch (Exception ee)
             {
@@ -106,74 +116,6 @@ namespace SqlCE4Umbraco
             }
         }
 
-        public static int ExecuteNonQuery(
-            SqlCeConnection conn,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-        )
-        {
-            return ExecuteNonQuery(conn, null, commandType, commandText, commandParameters);
-        }
-
-        public static int ExecuteNonQuery(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-            )
-        {
-            try
-            {
-                return ExecuteNonQueryTry(conn, trx, commandText, commandParameters);
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running NonQuery: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
-            }
-        }
-
-        private static int ExecuteNonQueryTry(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            // this is for multiple queries in the installer
-            if (commandText.Trim().StartsWith("!!!"))
-            {
-                commandText = commandText.Trim().Trim('!');
-                var commands = commandText.Split('|');
-                var currentCmd = string.Empty;
-
-                foreach (var command in commands)
-                {
-                    try
-                    {
-                        currentCmd = command;
-                        if (string.IsNullOrWhiteSpace(command)) continue;
-                        var c = trx == null ? new SqlCeCommand(command, conn) : new SqlCeCommand(command, conn, trx);
-                        c.ExecuteNonQuery();
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.WriteLine("*******************************************************************");
-                        Debug.WriteLine(currentCmd);
-                        Debug.WriteLine(e);
-                        Debug.WriteLine("*******************************************************************");
-                    }
-                }
-                return 1;
-            }
-
-            Debug.WriteLine("----------------------------------------------------------------------------");
-            Debug.WriteLine(commandText);
-            Debug.WriteLine("----------------------------------------------------------------------------");
-            var cmd = new SqlCeCommand(commandText, conn);
-            AttachParameters(cmd, commandParameters);
-            var rowsAffected = cmd.ExecuteNonQuery();
-            return rowsAffected;
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -191,8 +133,25 @@ namespace SqlCE4Umbraco
         {
             try
             {
-                var conn = SqlCeContextGuardian.Open(connectionString);
-                return ExecuteReaderTry(conn, null, commandText, commandParameters);
+                Debug.WriteLine("---------------------------------READER-------------------------------------");
+                Debug.WriteLine(commandText);
+                Debug.WriteLine("----------------------------------------------------------------------------");
+                SqlCeDataReader reader;
+                SqlCeConnection conn = SqlCeContextGuardian.Open(connectionString);
+
+                try
+                {
+                    SqlCeCommand cmd = new SqlCeCommand(commandText, conn);
+                    AttachParameters(cmd, commandParameters);
+                    reader = cmd.ExecuteReader(CommandBehavior.CloseConnection);
+                }
+                catch
+                {
+                    conn.Close();
+                    throw;
+                }
+
+                return reader;
             }
             catch (Exception ee)
             {
@@ -200,71 +159,30 @@ namespace SqlCE4Umbraco
             }
         }
 
-        public static SqlCeDataReader ExecuteReader(
-            SqlCeConnection conn,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-        )
-        {
-            return ExecuteReader(conn, commandType, commandText, commandParameters);
-        }
-
-        public static SqlCeDataReader ExecuteReader(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            CommandType commandType,
-            string commandText,
-            params SqlCeParameter[] commandParameters
-            )
-        {
-            try
-            {
-                return ExecuteReaderTry(conn, trx, commandText, commandParameters);
-            }
-            catch (Exception ee)
-            {
-                throw new SqlCeProviderException("Error running Reader: \nSQL Statement:\n" + commandText + "\n\nException:\n" + ee.ToString());
-            }
-        }
-
-        private static SqlCeDataReader ExecuteReaderTry(
-            SqlCeConnection conn, SqlCeTransaction trx,
-            string commandText,
-            params SqlCeParameter[] commandParameters)
-        {
-            Debug.WriteLine("---------------------------------READER-------------------------------------");
-            Debug.WriteLine(commandText);
-            Debug.WriteLine("----------------------------------------------------------------------------");
-
-            try
-            {
-                var cmd = trx == null ? new SqlCeCommand(commandText, conn) : new SqlCeCommand(commandText, conn, trx);
-                AttachParameters(cmd, commandParameters);
-                return cmd.ExecuteReader(CommandBehavior.CloseConnection);
-            }
-            catch
-            {
-                conn.Close();
-                throw;
-            }
-        }
-
         public static bool VerifyConnection(string connectionString)
         {
-            using (var conn = SqlCeContextGuardian.Open(connectionString))
+            bool isConnected = false;
+            using (SqlCeConnection conn = SqlCeContextGuardian.Open(connectionString))
             {
-                return conn.State == ConnectionState.Open;
+                isConnected = conn.State == ConnectionState.Open;
             }
+
+            return isConnected;
         }
 
-        private static void AttachParameters(SqlCeCommand command, IEnumerable<SqlCeParameter> commandParameters)
+        private static void AttachParameters(SqlCeCommand command, SqlCeParameter[] commandParameters)
         {
-            foreach (var parameter in commandParameters)
+            foreach (SqlCeParameter parameter in commandParameters)
             {
                 if ((parameter.Direction == ParameterDirection.InputOutput) && (parameter.Value == null))
+                {
                     parameter.Value = DBNull.Value;
+                }
                 command.Parameters.Add(parameter);
             }
         }
+
+
+
     }
 }

src/SolutionInfo.cs

@@ -2,7 +2,7 @@
 using System.Resources;
 
 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2017")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.6.0")]
-[assembly: AssemblyInformationalVersion("7.6.0-alpha054")]
+[assembly: AssemblyFileVersion("7.5.0")]
+[assembly: AssemblyInformationalVersion("7.5.0")]

src/Umbraco.Core/ApplicationContext.cs

@@ -1,18 +1,22 @@
 using System;
+using System.Collections.Generic;
 using System.Configuration;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
+using Umbraco.Core.Packaging;
+using Umbraco.Core.Persistence.Migrations;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 
 namespace Umbraco.Core
 {
-	/// <summary>
+    /// <summary>
     /// the Umbraco Application context
     /// </summary>
     /// <remarks>
@@ -183,6 +187,7 @@ namespace Umbraco.Core
 		readonly ManualResetEventSlim _isReadyEvent = new ManualResetEventSlim(false);
 		private DatabaseContext _databaseContext;
 		private ServiceContext _services;
+        private PackageMigrationsContext _packageMigrationsContext;
 
 		public bool IsReady
         {
@@ -212,17 +217,19 @@ namespace Umbraco.Core
         
         public bool IsConfigured
         {
-            get { return _configured.Value; }
+            get { return _umbracoVersionConfigured.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
+        /// If the db is configured, there is a database context and there is an umbraco schema, 
+        /// but we are: (not 'configured' OR there's pending migrations), then it means we are upgrading
         /// </summary>
 	    public bool IsUpgrading
 	    {
             get
             {
-                if (IsConfigured == false 
+                if ((IsConfigured == false || PackageMigrationsContext.HasPendingPackageMigrations)
                     && DatabaseContext != null 
                     && DatabaseContext.IsDatabaseConfigured)
                 {
@@ -268,7 +275,8 @@ namespace Umbraco.Core
 	    // ReSharper disable once InconsistentNaming
 	    internal string _umbracoApplicationUrl;
 
-        private Lazy<bool> _configured;
+        private Lazy<bool> _umbracoVersionConfigured;
+        
         internal MainDom MainDom { get; private set; }
        
 	    private void Init()
@@ -277,7 +285,7 @@ namespace Umbraco.Core
             MainDom.Acquire();
             
             //Create the lazy value to resolve whether or not the application is 'configured'
-            _configured = new Lazy<bool>(() =>
+            _umbracoVersionConfigured = new Lazy<bool>(() =>
             {
                 try
                 {
@@ -296,7 +304,7 @@ namespace Umbraco.Core
                         // if we have a db context available, if we don't then we are not installed anyways
                         if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.CanConnect)
                         {
-                            var found = Services.MigrationEntryService.FindEntry(Constants.System.UmbracoMigrationName, UmbracoVersion.GetSemanticVersion());
+                            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, 
@@ -318,9 +326,10 @@ namespace Umbraco.Core
                     LogHelper.Error<ApplicationContext>("Error determining if application is configured, returning false", ex);
                     return false;
                 }
+            });
 
-            }); 
-		}
+            _packageMigrationsContext = new PackageMigrationsContext(DatabaseContext, Services.MigrationEntryService, ProfilingLogger.Logger);
+        }
 
 		private string ConfigurationStatus
 		{
@@ -343,6 +352,11 @@ namespace Umbraco.Core
                 throw new Exception("ApplicationContext has already been initialized.");
         }
 
+        internal PackageMigrationsContext PackageMigrationsContext
+        {
+            get { return _packageMigrationsContext; }
+        }
+
 		/// <summary>
 		/// Gets the current DatabaseContext
 		/// </summary>

src/Umbraco.Core/ByteArrayExtensions.cs

@@ -1,39 +0,0 @@
-namespace Umbraco.Core
-{
-    public static class ByteArrayExtensions
-    {
-        private static readonly char[] BytesToHexStringLookup = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
-        public static string ToHexString(this byte[] bytes)
-        {
-            int i = 0, p = 0, bytesLength = bytes.Length;
-            var chars = new char[bytesLength * 2];
-            while (i < bytesLength)
-            {
-                var b = bytes[i++];
-                chars[p++] = BytesToHexStringLookup[b / 0x10];
-                chars[p++] = BytesToHexStringLookup[b % 0x10];
-            }
-            return new string(chars, 0, chars.Length);
-        }
-
-        public static string ToHexString(this byte[] bytes, char separator, int blockSize, int blockCount)
-        {
-            int p = 0, bytesLength = bytes.Length, count = 0, size = 0;
-            var chars = new char[bytesLength * 2 + blockCount];
-            for (var i = 0; i < bytesLength; i++)
-            {
-                var b = bytes[i++];
-                chars[p++] = BytesToHexStringLookup[b / 0x10];
-                chars[p++] = BytesToHexStringLookup[b % 0x10];
-                if (count == blockCount) continue;
-                if (++size < blockSize) continue;
-
-                chars[p++] = '/';
-                size = 0;
-                count++;
-            }
-            return new string(chars, 0, chars.Length);
-        }
-    }
-}

src/Umbraco.Core/Cache/CacheKeys.cs

@@ -64,8 +64,7 @@ namespace Umbraco.Core.Cache
         [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
         public const string ContentTypePropertiesCacheKey = "ContentType_PropertyTypes_Content:";
         
-        [Obsolete("No longer used and will be removed in v8")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
         public const string PropertyTypeCacheKey = "UmbracoPropertyTypeCache";
 
         [Obsolete("This is no longer used and will be removed from the codebase in the future")]

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -9,9 +9,6 @@ namespace Umbraco.Core.Cache
     /// <summary>
     /// A cache provider that caches items in the HttpContext.Items
     /// </summary>
-    /// <remarks>
-    /// If the Items collection is null, then this provider has no effect
-    /// </remarks>
     internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
     {
         // context provider
@@ -37,11 +34,6 @@ namespace Umbraco.Core.Cache
             get { return _context != null ? _context.Items : HttpContext.Current.Items; }
         }
 
-        private bool HasContextItems
-        {
-            get { return (_context != null && _context.Items != null) || HttpContext.Current != null; }
-        }
-
         // for unit tests
         public HttpRequestCacheProvider(HttpContextBase context)
         {
@@ -58,23 +50,18 @@ namespace Umbraco.Core.Cache
         protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
         {
             const string prefix = CacheItemPrefix + "-";
-
-            if (HasContextItems == false) return Enumerable.Empty<DictionaryEntry>();
-
             return ContextItems.Cast<DictionaryEntry>()
                 .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
         }
 
         protected override void RemoveEntry(string key)
         {
-            if (HasContextItems == false) return;
-
             ContextItems.Remove(key);
         }
 
         protected override object GetEntry(string key)
         {
-            return HasContextItems ? ContextItems[key] : null;
+            return ContextItems[key];
         }
 
         #region Lock
@@ -94,9 +81,7 @@ namespace Umbraco.Core.Cache
 
             get
             {
-                return HasContextItems 
-                    ? (IDisposable) new MonitorLock(ContextItems.SyncRoot) 
-                    : new NoopLocker();
+                return new MonitorLock(ContextItems.SyncRoot);
             }
         }
 
@@ -106,9 +91,6 @@ namespace Umbraco.Core.Cache
 
         public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
         {
-            //no place to cache so just return the callback result
-            if (HasContextItems == false) return getCacheItem();
-
             cacheKey = GetCacheKey(cacheKey);
 
             Lazy<object> result;
@@ -146,10 +128,5 @@ namespace Umbraco.Core.Cache
         #region Insert
         #endregion
 
-        private class NoopLocker : DisposableObject
-        {
-            protected override void DisposeResources()
-            { }
-        }
     }
 }

src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs

@@ -154,7 +154,7 @@ namespace Umbraco.Core.Cache
 
             value = result.Value; // will not throw (safe lazy)
             var eh = value as ExceptionHolder;
-            if (eh != null) throw new Exception("Exception while creating a value.", eh.Exception); // throw once!
+            if (eh != null) throw eh.Exception; // throw once!
             return value;
         }
 

src/Umbraco.Core/Cache/NullCacheProvider.cs

@@ -5,31 +5,38 @@ using System.Web.Caching;
 
 namespace Umbraco.Core.Cache
 {
-    /// <summary>
-    /// Represents a cache provider that does not cache anything.
-    /// </summary>
-    public class NullCacheProvider : IRuntimeCacheProvider
+    internal class NullCacheProvider : IRuntimeCacheProvider
     {
         public virtual void ClearAllCache()
-        { }
+        {
+        }
 
         public virtual void ClearCacheItem(string key)
-        { }
+        {
+        }
 
         public virtual void ClearCacheObjectTypes(string typeName)
-        { }
+        {
+        }
 
         public virtual void ClearCacheObjectTypes<T>()
-        { }
+        {
+        }
 
         public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        { }
+        {
+        }
+
+
+
 
         public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        { }
+        {
+        }
 
         public virtual void ClearCacheByKeyExpression(string regexString)
-        { }
+        {
+        }
 
         public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
         {
@@ -57,6 +64,8 @@ namespace Umbraco.Core.Cache
         }
 
         public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        { }
+        {
+            
+        }
     }
 }

src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs

@@ -1,23 +1,23 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.Caching;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Web.Caching;
+using Umbraco.Core.Logging;
 using CacheItemPriority = System.Web.Caching.CacheItemPriority;
 
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// Represents a cache provider that caches item in a <see cref="MemoryCache"/>.
     /// A cache provider that wraps the logic of a System.Runtime.Caching.ObjectCache
     /// </summary>
-    /// <remarks>The <see cref="MemoryCache"/> is created with name "in-memory". That name is
-    /// used to retrieve configuration options. It does not identify the memory cache, i.e.
-    /// each instance of this class has its own, independent, memory cache.</remarks>
-    public class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
+    internal class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
     {
+
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
         internal ObjectCache MemoryCache;
 

src/Umbraco.Core/Cache/StaticCacheProvider.cs

@@ -3,13 +3,14 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Web.Caching;
 
 namespace Umbraco.Core.Cache
 {
     /// <summary>
-    /// Represents a cache provider that statically caches item in a concurrent dictionary.
+    /// A cache provider that statically caches everything in an in memory dictionary
     /// </summary>
-    public class StaticCacheProvider : ICacheProvider
+    internal class StaticCacheProvider : ICacheProvider
     {
         internal readonly ConcurrentDictionary<string, object> StaticCache = new ConcurrentDictionary<string, object>();
 
@@ -74,6 +75,7 @@ namespace Umbraco.Core.Cache
         public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
         {
             return StaticCache.GetOrAdd(cacheKey, key => getCacheItem());
-        }        
+        }
+        
     }
 }

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -212,7 +212,7 @@ namespace Umbraco.Core.Configuration
         {
             get
             {
-                var settings = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName];
+                var settings = ConfigurationManager.ConnectionStrings[UmbracoConnectionName];
                 var connectionString = string.Empty;
 
                 if (settings != null)
@@ -241,7 +241,10 @@ namespace Umbraco.Core.Configuration
                 }
             }
         }
-        
+
+        //TODO: Move these to constants!
+        public const string UmbracoConnectionName = "umbracoDbDSN";
+        public const string UmbracoMigrationName = "Umbraco";
 
         /// <summary>
         /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.

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

@@ -4,7 +4,8 @@ using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class ContentElement : UmbracoConfigurationElement, IContentSection
+
+    internal class ContentElement : ConfigurationElement, IContentSection
     {
         [ConfigurationProperty("imaging")]
         internal ContentImagingElement Imaging
@@ -21,13 +22,25 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("ResolveUrlsFromTextString")]
         internal InnerTextConfigurationElement<bool> ResolveUrlsFromTextString
         {
-            get { return GetOptionalTextElement<bool>("ResolveUrlsFromTextString", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                       (InnerTextConfigurationElement<bool>)this["ResolveUrlsFromTextString"],
+                        //set the default
+                       false);
+            }
         }
 
         [ConfigurationProperty("UploadAllowDirectories")]
         internal InnerTextConfigurationElement<bool> UploadAllowDirectories
         {
-            get { return GetOptionalTextElement("UploadAllowDirectories", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                       (InnerTextConfigurationElement<bool>)this["UploadAllowDirectories"],
+                    //set the default
+                       true);
+            }
         }
 
         public IEnumerable<IContentErrorPage> Error404Collection
@@ -50,61 +63,121 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("ensureUniqueNaming")]
         internal InnerTextConfigurationElement<bool> EnsureUniqueNaming
         {
-            get { return GetOptionalTextElement("ensureUniqueNaming", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                      (InnerTextConfigurationElement<bool>)this["ensureUniqueNaming"],
+                    //set the default
+                      true);
+            }
         }
 
         [ConfigurationProperty("TidyEditorContent")]
         internal InnerTextConfigurationElement<bool> TidyEditorContent
         {
-            get { return GetOptionalTextElement("TidyEditorContent", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                      (InnerTextConfigurationElement<bool>)this["TidyEditorContent"],
+                    //set the default
+                      false);
+            }
         }
 
         [ConfigurationProperty("TidyCharEncoding")]
         internal InnerTextConfigurationElement<string> TidyCharEncoding
         {
-            get { return GetOptionalTextElement("TidyCharEncoding", "UTF8"); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                          (InnerTextConfigurationElement<string>)this["TidyCharEncoding"],
+                            //set the default
+                          "UTF8");
+            }
         }
 
         [ConfigurationProperty("XmlCacheEnabled")]
         internal InnerTextConfigurationElement<bool> XmlCacheEnabled
         {
-            get { return GetOptionalTextElement("XmlCacheEnabled", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["XmlCacheEnabled"],
+                    //set the default
+                          true);
+            }
         }
 
         [ConfigurationProperty("ContinouslyUpdateXmlDiskCache")]
         internal InnerTextConfigurationElement<bool> ContinouslyUpdateXmlDiskCache
         {
-            get { return GetOptionalTextElement("ContinouslyUpdateXmlDiskCache", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["ContinouslyUpdateXmlDiskCache"],
+                    //set the default
+                          true);                
+            }
         }
 
         [ConfigurationProperty("XmlContentCheckForDiskChanges")]
         internal InnerTextConfigurationElement<bool> XmlContentCheckForDiskChanges
         {
-            get { return GetOptionalTextElement("XmlContentCheckForDiskChanges", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["XmlContentCheckForDiskChanges"],
+                    //set the default
+                          false); 
+            }
         }
 
         [ConfigurationProperty("EnableSplashWhileLoading")]
         internal InnerTextConfigurationElement<bool> EnableSplashWhileLoading
         {
-            get { return GetOptionalTextElement("EnableSplashWhileLoading", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["EnableSplashWhileLoading"],
+                    //set the default
+                          false); 
+            }
         }
 
         [ConfigurationProperty("PropertyContextHelpOption")]
         internal InnerTextConfigurationElement<string> PropertyContextHelpOption
         {
-            get { return GetOptionalTextElement("PropertyContextHelpOption", "text"); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                          (InnerTextConfigurationElement<string>)this["PropertyContextHelpOption"],
+                    //set the default
+                          "text"); 
+            }
         }
 
         [ConfigurationProperty("UseLegacyXmlSchema")]
         internal InnerTextConfigurationElement<bool> UseLegacyXmlSchema
         {
-            get { return GetOptionalTextElement("UseLegacyXmlSchema", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["UseLegacyXmlSchema"],
+                    //set the default
+                          false); 
+            }
         }
         
         [ConfigurationProperty("ForceSafeAliases")]
         internal InnerTextConfigurationElement<bool> ForceSafeAliases
         {
-            get { return GetOptionalTextElement("ForceSafeAliases", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                          (InnerTextConfigurationElement<bool>)this["ForceSafeAliases"],
+                    //set the default
+                          true); 
+            }
         }
 
         [ConfigurationProperty("PreviewBadge")]
@@ -112,65 +185,113 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get
             {
-                return GetOptionalTextElement("PreviewBadge", @"<a id=""umbracoPreviewBadge"" style=""position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>");                
+                return new OptionalInnerTextConfigurationElement<string>(
+                          (InnerTextConfigurationElement<string>)this["PreviewBadge"],
+                    //set the default
+                          @"<a id=""umbracoPreviewBadge"" style=""position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>"); 
             }
         }
 
         [ConfigurationProperty("UmbracoLibraryCacheDuration")]
         internal InnerTextConfigurationElement<int> UmbracoLibraryCacheDuration
         {
-            get { return GetOptionalTextElement("UmbracoLibraryCacheDuration", 1800); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<int>(
+                          (InnerTextConfigurationElement<int>)this["UmbracoLibraryCacheDuration"],
+                    //set the default
+                          1800); 
+                
+            }
         }
 
         [ConfigurationProperty("MacroErrors")]
         internal InnerTextConfigurationElement<MacroErrorBehaviour> MacroErrors
         {
-            get { return GetOptionalTextElement("MacroErrors", MacroErrorBehaviour.Inline); }
+            get
+            {
+
+                return new OptionalInnerTextConfigurationElement<MacroErrorBehaviour>(
+                          (InnerTextConfigurationElement<MacroErrorBehaviour>)this["MacroErrors"],
+                    //set the default
+                          MacroErrorBehaviour.Inline); 
+            }
         }
 
         [Obsolete("This is here so that if this config element exists we won't get a YSOD, it is not used whatsoever and will be removed in future versions")]
         [ConfigurationProperty("DocumentTypeIconList")]
         internal InnerTextConfigurationElement<IconPickerBehaviour> DocumentTypeIconList
         {
-            get { return GetOptionalTextElement("DocumentTypeIconList", IconPickerBehaviour.HideFileDuplicates); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<IconPickerBehaviour>(
+                          (InnerTextConfigurationElement<IconPickerBehaviour>)this["DocumentTypeIconList"],
+                    //set the default
+                          IconPickerBehaviour.HideFileDuplicates);
+            }
         }
 
         [ConfigurationProperty("disallowedUploadFiles")]
         internal CommaDelimitedConfigurationElement DisallowedUploadFiles
         {
-            get { return GetOptionalDelimitedElement("disallowedUploadFiles", new[] {"ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd"}); }
+            get
+            {
+                return new OptionalCommaDelimitedConfigurationElement(
+                       (CommaDelimitedConfigurationElement)this["disallowedUploadFiles"],
+                    //set the default
+                       new[] { "ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd" });
+
+            }
         }
 
         [ConfigurationProperty("cloneXmlContent")]
         internal InnerTextConfigurationElement<bool> CloneXmlContent
         {
-            get { return GetOptionalTextElement("cloneXmlContent", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["cloneXmlContent"],
+                    //set the default
+                    true);
+            }
         }
 
         [ConfigurationProperty("GlobalPreviewStorageEnabled")]
         internal InnerTextConfigurationElement<bool> GlobalPreviewStorageEnabled
         {
-            get { return GetOptionalTextElement("GlobalPreviewStorageEnabled", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["GlobalPreviewStorageEnabled"],
+                    //set the default
+                    false);
+            }
         }
 
         [ConfigurationProperty("defaultDocumentTypeProperty")]
         internal InnerTextConfigurationElement<string> DefaultDocumentTypeProperty
         {
-            get { return GetOptionalTextElement("defaultDocumentTypeProperty", "Textstring"); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                    (InnerTextConfigurationElement<string>)this["defaultDocumentTypeProperty"],
+                    //set the default
+                    "Textstring");
+            }
         }
 
         [ConfigurationProperty("EnableInheritedDocumentTypes")]
         internal InnerTextConfigurationElement<bool> EnableInheritedDocumentTypes
         {
-            get { return GetOptionalTextElement("EnableInheritedDocumentTypes", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>) this["EnableInheritedDocumentTypes"],
+                    //set the default
+                    true);
+            }
         }
-
-        [ConfigurationProperty("EnableInheritedMediaTypes")]
-        internal InnerTextConfigurationElement<bool> EnableInheritedMediaTypes
-        {
-            get { return GetOptionalTextElement("EnableInheritedMediaTypes", true); }
-        }
-
+        
         string IContentSection.NotificationEmailAddress
         {
             get { return Notifications.NotificationEmailAddress; }
@@ -310,10 +431,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get { return EnableInheritedDocumentTypes; }
         }
-
-        bool IContentSection.EnableInheritedMediaTypes
-        {
-            get { return EnableInheritedMediaTypes; }
-        }
     }
 }

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

@@ -3,24 +3,42 @@ using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class ContentScriptEditorElement : UmbracoConfigurationElement
+    internal class ContentScriptEditorElement : ConfigurationElement
     {
         [ConfigurationProperty("scriptFolderPath")]
         internal InnerTextConfigurationElement<string> ScriptFolderPath
         {
-            get { return GetOptionalTextElement("scriptFolderPath", "/scripts"); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["scriptFolderPath"],
+                    //set the default
+                       "/scripts");
+            }
         }
 
         [ConfigurationProperty("scriptFileTypes")]
         internal OptionalCommaDelimitedConfigurationElement ScriptFileTypes
         {
-            get { return GetOptionalDelimitedElement("scriptFileTypes", new[] {"js", "xml"}); }
+            get
+            {
+                return new OptionalCommaDelimitedConfigurationElement(
+                       (OptionalCommaDelimitedConfigurationElement)this["scriptFileTypes"],
+                    //set the default
+                       new[] { "js", "xml" });                
+            }
         }
 
         [ConfigurationProperty("scriptDisableEditor")]
         internal InnerTextConfigurationElement<bool> ScriptEditorDisable
         {
-            get { return GetOptionalTextElement("scriptDisableEditor", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>) this["scriptDisableEditor"],
+                    //set the default
+                    false);
+            }
         }
 
     }

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

@@ -61,7 +61,5 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         string DefaultDocumentTypeProperty { get; }
 
         bool EnableInheritedDocumentTypes { get; }
-
-        bool EnableInheritedMediaTypes { get; }
     }
 }

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

@@ -9,8 +9,6 @@
         bool DisableAlternativeTemplates { get; }
 
         bool DisableFindContentByIdPath { get; }
-		
-        bool DisableRedirectUrlTracking { get; }
 
         string UrlProviderMode { get; }
 

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

@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class ImagingAutoFillUploadFieldElement : UmbracoConfigurationElement, IImagingAutoFillUploadField
+    internal class ImagingAutoFillUploadFieldElement : ConfigurationElement, IImagingAutoFillUploadField
     {
         /// <summary>
         /// Allow setting internally so we can create a default
@@ -17,25 +17,49 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("widthFieldAlias")]
         internal InnerTextConfigurationElement<string> WidthFieldAlias
         {
-            get { return GetOptionalTextElement("widthFieldAlias", "umbracoWidth"); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["widthFieldAlias"],
+                    //set the default
+                       "umbracoWidth");
+            }
         }
 
         [ConfigurationProperty("heightFieldAlias")]
         internal InnerTextConfigurationElement<string> HeightFieldAlias
         {
-            get { return GetOptionalTextElement("heightFieldAlias", "umbracoHeight"); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["heightFieldAlias"],
+                    //set the default
+                       "umbracoHeight");
+            }
         }
 
         [ConfigurationProperty("lengthFieldAlias")]
         internal InnerTextConfigurationElement<string> LengthFieldAlias
         {
-            get { return GetOptionalTextElement("lengthFieldAlias", "umbracoBytes"); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["lengthFieldAlias"],
+                    //set the default
+                       "umbracoBytes");
+            }
         }
 
         [ConfigurationProperty("extensionFieldAlias")]
         internal InnerTextConfigurationElement<string> ExtensionFieldAlias
         {
-            get { return GetOptionalTextElement("extensionFieldAlias", "umbracoExtension"); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["extensionFieldAlias"],
+                    //set the default
+                       "umbracoExtension");
+            }
         }
 
         string IImagingAutoFillUploadField.Alias

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

@@ -3,37 +3,67 @@ using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class LoggingElement : UmbracoConfigurationElement, ILoggingSection
+    internal class LoggingElement : ConfigurationElement, ILoggingSection
     {
         
         [ConfigurationProperty("autoCleanLogs")]
         internal InnerTextConfigurationElement<bool> AutoCleanLogs
         {
-            get { return GetOptionalTextElement("autoCleanLogs", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["autoCleanLogs"],
+                    //set the default
+                    false);            
+            }
         }
 
         [ConfigurationProperty("enableLogging")]
         internal InnerTextConfigurationElement<bool> EnableLogging
         {
-            get { return GetOptionalTextElement("enableLogging", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["enableLogging"],
+                    //set the default
+                    true);            
+            }
         }
 
         [ConfigurationProperty("enableAsyncLogging")]
         internal InnerTextConfigurationElement<bool> EnableAsyncLogging
         {
-            get { return GetOptionalTextElement("enableAsyncLogging", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["enableAsyncLogging"],
+                    //set the default
+                    true);           
+            }
         }
 
         [ConfigurationProperty("cleaningMiliseconds")]
         internal InnerTextConfigurationElement<int> CleaningMiliseconds
         {
-            get { return GetOptionalTextElement("cleaningMiliseconds", -1); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<int>(
+                    (InnerTextConfigurationElement<int>)this["cleaningMiliseconds"],
+                    //set the default
+                    -1);                      
+            }
         }
 
         [ConfigurationProperty("maxLogAge")]
         internal InnerTextConfigurationElement<int> MaxLogAge
         {
-            get { return GetOptionalTextElement("maxLogAge", -1); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<int>(
+                    (InnerTextConfigurationElement<int>)this["maxLogAge"],
+                    //set the default
+                    -1);
+            }
         }
 
         [ConfigurationCollection(typeof(DisabledLogTypesCollection), AddItemName = "logTypeAlias")]

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

@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class NotificationsElement : UmbracoConfigurationElement
+    internal class NotificationsElement : ConfigurationElement
     {
         [ConfigurationProperty("email")]
         internal InnerTextConfigurationElement<string> NotificationEmailAddress
@@ -13,7 +13,13 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("disableHtmlEmail")]
         internal InnerTextConfigurationElement<bool> DisableHtmlEmail
         {
-            get { return GetOptionalTextElement("disableHtmlEmail", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>) this["disableHtmlEmail"], 
+                    //set the default
+                    false);
+            }
         }
 
     }

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

@@ -5,18 +5,30 @@ using System.Collections.Generic;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class RequestHandlerElement : UmbracoConfigurationElement, IRequestHandlerSection
+    internal class RequestHandlerElement : ConfigurationElement, IRequestHandlerSection
     {
         [ConfigurationProperty("useDomainPrefixes")]
         public InnerTextConfigurationElement<bool> UseDomainPrefixes
         {
-            get { return GetOptionalTextElement("useDomainPrefixes", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["useDomainPrefixes"],
+                    //set the default
+                    false);  
+            }
         }
 
         [ConfigurationProperty("addTrailingSlash")]
         public InnerTextConfigurationElement<bool> AddTrailingSlash
         {
-            get { return GetOptionalTextElement("addTrailingSlash", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["addTrailingSlash"],
+                    //set the default
+                    true);  
+            }
         }
 
         private UrlReplacingElement _defaultUrlReplacing;

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

@@ -2,36 +2,66 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class SecurityElement : UmbracoConfigurationElement, ISecuritySection
+    internal class SecurityElement : ConfigurationElement, ISecuritySection
     {
         [ConfigurationProperty("keepUserLoggedIn")]
         internal InnerTextConfigurationElement<bool> KeepUserLoggedIn
         {
-            get { return GetOptionalTextElement("keepUserLoggedIn", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["keepUserLoggedIn"],
+                    //set the default
+                    true);   
+            }
         }
 
         [ConfigurationProperty("hideDisabledUsersInBackoffice")]
         internal InnerTextConfigurationElement<bool> HideDisabledUsersInBackoffice
         {
-            get { return GetOptionalTextElement("hideDisabledUsersInBackoffice", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["hideDisabledUsersInBackoffice"],
+                    //set the default
+                    false);                          
+            }
         }
 
         [ConfigurationProperty("allowPasswordReset")]
         internal InnerTextConfigurationElement<bool> AllowPasswordReset
         {
-            get { return GetOptionalTextElement("allowPasswordReset", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["allowPasswordReset"],
+                    //set the default
+                    true);
+            }
         }
 
         [ConfigurationProperty("authCookieName")]
         internal InnerTextConfigurationElement<string> AuthCookieName
         {
-            get { return GetOptionalTextElement("authCookieName", Constants.Web.AuthCookieName); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                    (InnerTextConfigurationElement<string>)this["authCookieName"],
+                    //set the default
+                    Constants.Web.AuthCookieName);                
+            }
         }
 
         [ConfigurationProperty("authCookieDomain")]
         internal InnerTextConfigurationElement<string> AuthCookieDomain
         {
-            get { return GetOptionalTextElement<string>("authCookieDomain", null); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                    (InnerTextConfigurationElement<string>)this["authCookieDomain"],
+                    //set the default
+                    null);                    
+            }
         }
 
         bool ISecuritySection.KeepUserLoggedIn

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

@@ -3,31 +3,55 @@ using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class TemplatesElement : UmbracoConfigurationElement, ITemplatesSection
+    internal class TemplatesElement : ConfigurationElement, ITemplatesSection
     {
         [ConfigurationProperty("useAspNetMasterPages")]
         internal InnerTextConfigurationElement<bool> UseAspNetMasterPages
         {
-            get { return GetOptionalTextElement("useAspNetMasterPages", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["useAspNetMasterPages"],
+                    //set the default
+                    true);
+            }
         }
 
         [ConfigurationProperty("enableSkinSupport")]
         internal InnerTextConfigurationElement<bool> EnableSkinSupport
         {
-            get { return GetOptionalTextElement("enableSkinSupport", true); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["enableSkinSupport"],
+                    //set the default
+                    true);
+            }
         }
 
         [ConfigurationProperty("defaultRenderingEngine", IsRequired = true)]
         internal InnerTextConfigurationElement<RenderingEngine> DefaultRenderingEngine
         {
-            get { return GetOptionalTextElement("defaultRenderingEngine", RenderingEngine.Mvc); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<RenderingEngine>(
+                    (InnerTextConfigurationElement<RenderingEngine>)this["defaultRenderingEngine"],
+                    //set the default
+                    RenderingEngine.Mvc);
+            }
         }
 
         [Obsolete("This has no affect and will be removed in future versions")]
         [ConfigurationProperty("enableTemplateFolders")]
         internal InnerTextConfigurationElement<bool> EnableTemplateFolders
         {
-            get { return GetOptionalTextElement("enableTemplateFolders", false); }
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["enableTemplateFolders"],
+                    //set the default
+                    false);
+            }
         }
 
         bool ITemplatesSection.UseAspNetMasterPages

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

@@ -1,36 +0,0 @@
-using System.Collections.Concurrent;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    /// <summary>
-    /// Base class with shared helper methods
-    /// </summary>
-    internal class UmbracoConfigurationElement : ConfigurationElement
-    {
-        /// <summary>
-        /// Used so the RawElement types are not re-created every time they are accessed
-        /// </summary>
-        private readonly ConcurrentDictionary<string, RawXmlConfigurationElement> _rawElements = new ConcurrentDictionary<string, RawXmlConfigurationElement>();
-
-        protected OptionalInnerTextConfigurationElement<T> GetOptionalTextElement<T>(string name, T defaultVal)
-        {
-            return (OptionalInnerTextConfigurationElement<T>) _rawElements.GetOrAdd(
-                name,
-                s => new OptionalInnerTextConfigurationElement<T>(
-                    (InnerTextConfigurationElement<T>) this[s],
-                    //set the default
-                    defaultVal));
-        }
-
-        protected OptionalCommaDelimitedConfigurationElement GetOptionalDelimitedElement(string name, string[] defaultVal)
-        {
-            return (OptionalCommaDelimitedConfigurationElement) _rawElements.GetOrAdd(
-                name,
-                s => new OptionalCommaDelimitedConfigurationElement(
-                    (CommaDelimitedConfigurationElement) this[name],
-                    //set the default
-                    defaultVal));
-        }
-    }
-}

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

@@ -27,12 +27,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return (bool) base["disableFindContentByIdPath"]; }
         }
 
-        [ConfigurationProperty("disableRedirectUrlTracking", DefaultValue = "false")]
-        public bool DisableRedirectUrlTracking
-        {
-            get { return (bool) base["disableRedirectUrlTracking"]; }
-        }
-
         [ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
         public string UrlProviderMode
         {

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.6.0");
+        private static readonly Version Version = new Version("7.5.0");
 
         /// <summary>
         /// Gets the current version of Umbraco.
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "alpha054"; } }
+        public static string CurrentComment { get { return ""; } }
 
         // 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
@@ -32,12 +32,7 @@ namespace Umbraco.Core.Configuration
 
         public static SemVersion GetSemanticVersion()
         {
-            return new SemVersion(
-                Current.Major, 
-                Current.Minor,
-                Current.Build, 
-                CurrentComment.IsNullOrWhiteSpace() ? null : CurrentComment,
-                Current.Revision > 0 ? Current.Revision.ToInvariantString() : null);
+            return Current.GetSemanticVersion();
         }
     }
 }

src/Umbraco.Core/Constants-Applications.cs

@@ -73,11 +73,6 @@
             /// </summary>
 			public const string DataTypes = "dataTypes";
 
-            /// <summary>
-            /// alias for the packages tree
-            /// </summary>
-            public const string Packages = "packager";
-
 			/// <summary>
 			/// alias for the dictionary tree.
 			/// </summary>

src/Umbraco.Core/Constants-Conventions.cs

@@ -4,8 +4,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core
 {
-   
-    public static partial class Constants
+	public static partial class Constants
 	{
 		/// <summary>
 		/// Defines the identifiers for property-type alias conventions that are used within the Umbraco core.
@@ -123,11 +122,6 @@ namespace Umbraco.Core
 				/// MediaType alias for an image.
 				/// </summary>
 				public const string Image = "Image";
-
-                /// <summary>
-                /// MediaType alias indicating allowing auto-selection.
-                /// </summary>
-			    public const string AutoSelect = "umbracoAutoSelect";
 			}
             
 		    /// <summary>

src/Umbraco.Core/Constants-DatabaseProviders.cs

@@ -1,12 +0,0 @@
-namespace Umbraco.Core
-{
-    public static partial class Constants
-    {
-        public static class DatabaseProviders
-        {
-            public const string SqlCe = "System.Data.SqlServerCe.4.0";
-            public const string SqlServer = "System.Data.SqlClient";
-            public const string MySql = "MySql.Data.MySqlClient";
-        }
-    }
-}

src/Umbraco.Core/Constants-DeployEntityType.cs

@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core
-{
-    
-    public static partial class Constants
-    {
-
-        /// <summary>
-        /// Defines well-known entity types.
-        /// </summary>
-        /// <remarks>Well-known entity types are those that Deploy already knows about,
-        /// but entity types are strings and so can be extended beyond what is defined here.</remarks>
-        public static class DeployEntityType
-        {
-            // guid entity types
-
-            public const string AnyGuid = "any-guid"; // that one is for tests
-
-            public const string Document = "document";
-            public const string Media = "media";
-            public const string Member = "member";
-
-            public const string DictionaryItem = "dictionary-item";
-            public const string Macro = "macro";
-            public const string Template = "template";
-
-            public const string DocumentType = "document-type";
-            public const string DocumentTypeContainer = "document-type-container";
-            public const string MediaType = "media-type";
-            public const string MediaTypeContainer = "media-type-container";
-            public const string DataType = "data-type";
-            public const string DataTypeContainer = "data-type-container";
-            public const string MemberType = "member-type";
-            public const string MemberGroup = "member-group";
-
-            public const string RelationType = "relation-type";
-
-            // string entity types
-
-            public const string AnyString = "any-string"; // that one is for tests
-
-            public const string MediaFile = "media-file";
-            public const string TemplateFile = "template-file";
-            public const string Script = "script";
-            public const string Stylesheet = "stylesheet";
-            public const string PartialView = "partial-view";
-            public const string PartialViewMacro = "partial-view-macro";
-            public const string Xslt = "xslt";
-
-            public static string FromUmbracoObjectType(UmbracoObjectTypes umbracoObjectType)
-            {
-                switch (umbracoObjectType)
-                {
-                    case UmbracoObjectTypes.Document:
-                        return Document;
-                    case UmbracoObjectTypes.Media:
-                        return Media;
-                    case UmbracoObjectTypes.Member:
-                        return Member;
-                    case UmbracoObjectTypes.Template:
-                        return Template;
-                    case UmbracoObjectTypes.DocumentType:
-                        return DocumentType;
-                    case UmbracoObjectTypes.DocumentTypeContainer:
-                        return DocumentTypeContainer;
-                    case UmbracoObjectTypes.MediaType:
-                        return MediaType;
-                    case UmbracoObjectTypes.MediaTypeContainer:
-                        return MediaTypeContainer;
-                    case UmbracoObjectTypes.DataType:
-                        return DataType;
-                    case UmbracoObjectTypes.DataTypeContainer:
-                        return DataTypeContainer;
-                    case UmbracoObjectTypes.MemberType:
-                        return MemberType;
-                    case UmbracoObjectTypes.MemberGroup:
-                        return MemberGroup;
-                    case UmbracoObjectTypes.Stylesheet:
-                        return Stylesheet;
-                    case UmbracoObjectTypes.RelationType:
-                        return RelationType;
-                }
-                throw new NotSupportedException(string.Format("UmbracoObjectType \"{0}\" does not have a matching EntityType.", umbracoObjectType));
-            }
-
-            public static UmbracoObjectTypes ToUmbracoObjectType(string entityType)
-            {
-                switch (entityType)
-                {
-                    case Document:
-                        return UmbracoObjectTypes.Document;
-                    case Media:
-                        return UmbracoObjectTypes.Media;
-                    case Member:
-                        return UmbracoObjectTypes.Member;
-                    case Template:
-                        return UmbracoObjectTypes.Template;
-                    case DocumentType:
-                        return UmbracoObjectTypes.DocumentType;
-                    case DocumentTypeContainer:
-                        return UmbracoObjectTypes.DocumentTypeContainer;
-                    case MediaType:
-                        return UmbracoObjectTypes.MediaType;
-                    case MediaTypeContainer:
-                        return UmbracoObjectTypes.MediaTypeContainer;
-                    case DataType:
-                        return UmbracoObjectTypes.DataType;
-                    case DataTypeContainer:
-                        return UmbracoObjectTypes.DataTypeContainer;
-                    case MemberType:
-                        return UmbracoObjectTypes.MemberType;
-                    case MemberGroup:
-                        return UmbracoObjectTypes.MemberGroup;
-                    case Stylesheet:
-                        return UmbracoObjectTypes.Stylesheet;
-                    case RelationType:
-                        return UmbracoObjectTypes.RelationType;
-                }
-                throw new NotSupportedException(
-                    string.Format("EntityType \"{0}\" does not have a matching UmbracoObjectType.", entityType));
-            }
-        }
-
-
-    }
-}

src/Umbraco.Core/Constants-DeploySelector.cs

@@ -1,17 +0,0 @@
-namespace Umbraco.Core
-{    
-    public static partial class Constants
-    {
-        /// <summary>
-        /// Contains the valid selector values.
-        /// </summary>
-        public static class DeploySelector
-        {
-            public const string This = "this";
-            public const string ThisAndChildren = "this-and-children";
-            public const string ThisAndDescendants = "this-and-descendants";
-            public const string ChildrenOfThis = "children";
-            public const string DescendantsOfThis = "descendants";
-        }
-    }
-}

src/Umbraco.Core/Constants-Examine.cs

@@ -1,23 +1,15 @@
-namespace Umbraco.Core
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core
 {
     public static partial class Constants
     {
         public static class Examine
         {
-            /// <summary>
-            /// The alias of the internal member indexer
-            /// </summary>
-            public const string InternalMemberIndexer = "InternalMemberIndexer";
-
-            /// <summary>
-            /// The alias of the internal content indexer
-            /// </summary>
-            public const string InternalIndexer = "InternalIndexer";
-
-            /// <summary>
-            /// The alias of the external content indexer
-            /// </summary>
-            public const string ExternalIndexer = "ExternalIndexer";
             /// <summary>
             /// The alias of the internal member searcher
             /// </summary>
@@ -27,11 +19,6 @@
             /// The alias of the internal content searcher
             /// </summary>
             public const string InternalSearcher = "InternalSearcher";
-
-            /// <summary>
-            /// The alias of the external content searcher
-            /// </summary>
-            public const string ExternalSearcher = "ExternalSearcher";
         }
     }
 }

src/Umbraco.Core/Constants-ObjectTypes.cs

@@ -69,11 +69,6 @@ namespace Umbraco.Core
             /// </summary>
             public const string Document = "C66BA18E-EAF3-4CFF-8A22-41B16D66A972";
 
-            /// <summary>
-            /// Guid for a Document object.
-            /// </summary>
-            public static readonly Guid DocumentGuid = new Guid(Document);
-
             /// <summary>
             /// Guid for a Document Type object.
             /// </summary>
@@ -152,16 +147,6 @@ namespace Umbraco.Core
             /// Guid for a Lock object.
             /// </summary>
             public static readonly Guid LockObjectGuid = new Guid(LockObject);
-
-            /// <summary>
-            /// Guid for a relation type.
-            /// </summary>
-            public const string RelationType = "B1988FAD-8675-4F47-915A-B3A602BC5D8D";
-
-            /// <summary>
-            /// Guid for a relation type.
-            /// </summary>
-            public static readonly Guid RelationTypeGuid = new Guid(RelationType);
         }
     }
 }

src/Umbraco.Core/Constants-Security.cs

@@ -1,33 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core
-{
-    public static partial class Constants
-    {
-        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";
-
-        }
-    }
-}

src/Umbraco.Core/Constants-System.cs

@@ -1,34 +1,33 @@
 namespace Umbraco.Core
 {
-    public static partial class Constants
-    {
-        /// <summary>
-        /// Defines the identifiers for Umbraco system nodes.
-        /// </summary>
-        public static class System
-        {
-            /// <summary>
-            /// The integer identifier for global system root node.
-            /// </summary>
-            public const int Root = -1;
+	public static partial class Constants
+	{
+		/// <summary>
+		/// Defines the identifiers for Umbraco system nodes.
+		/// </summary>
+		public static class System
+		{
+			/// <summary>
+			/// The integer identifier for global system root node.
+			/// </summary>
+			public const int Root = -1;
 
-            /// <summary>
-            /// The integer identifier for content's recycle bin.
-            /// </summary>
-            public const int RecycleBinContent = -20;
+			/// <summary>
+			/// The integer identifier for content's recycle bin.
+			/// </summary>
+			public const int RecycleBinContent = -20;
 
-            /// <summary>
-            /// The integer identifier for media's recycle bin.
-            /// </summary>
-            public const int RecycleBinMedia = -21;
+			/// <summary>
+			/// The integer identifier for media's recycle bin.
+			/// </summary>
+			public const int RecycleBinMedia = -21;
 
-            public const int DefaultContentListViewDataTypeId = -95;
+		    public const int DefaultContentListViewDataTypeId = -95;
             public const int DefaultMediaListViewDataTypeId = -96;
             public const int DefaultMembersListViewDataTypeId = -97;
 
-            public const string UmbracoConnectionName = "umbracoDbDSN";
-            public const string UmbracoMigrationName = "Umbraco";
-        }
-        
-    }
+            // identifiers for lock objects
+		    public const int ServersLock = -331;
+		}
+	}
 }

src/Umbraco.Core/Constants-Web.cs

@@ -29,6 +29,30 @@ namespace Umbraco.Core
             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";
+
+	    }
 	}
 }

src/Umbraco.Core/CoreBootManager.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -31,13 +30,12 @@ using Umbraco.Core.Manifest;
 using Umbraco.Core.Services;
 using Umbraco.Core.Sync;
 using Umbraco.Core.Strings;
-using IntegerValidator = Umbraco.Core.PropertyEditors.IntegerValidator;
 using MigrationsVersionFourNineZero = Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionFourNineZero;
 
 namespace Umbraco.Core
 {
     /// <summary>
-    /// A bootstrapper for the Umbraco application which initializes all objects for the Core of the application
+    /// 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
@@ -105,7 +103,7 @@ namespace Umbraco.Core
             LegacyParameterEditorAliasConverter.CreateMappingsForCoreEditors();
 
             //create database and service contexts for the app context
-            var dbFactory = new DefaultDatabaseFactory(Constants.System.UmbracoConnectionName, ProfilingLogger.Logger);
+            var dbFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, ProfilingLogger.Logger);
             Database.Mapper = new PetaPocoMapper();
 
             var dbContext = new DatabaseContext(
@@ -193,14 +191,14 @@ namespace Umbraco.Core
         protected virtual CacheHelper CreateApplicationCache()
         {
             var cacheHelper = new CacheHelper(
-                //we need to have the dep clone runtime cache provider to ensure
+                //we need to have the dep clone runtime cache provider to ensure 
                 //all entities are cached properly (cloned in and cloned out)
                 new DeepCloneRuntimeCacheProvider(new ObjectCacheRuntimeCacheProvider()),
                 new StaticCacheProvider(),
                 //we have no request based cache when not running in web-based context
                 new NullCacheProvider(),
                 new IsolatedRuntimeCache(type =>
-                    //we need to have the dep clone runtime cache provider to ensure
+                    //we need to have the dep clone runtime cache provider to ensure 
                     //all entities are cached properly (cloned in and cloned out)
                     new DeepCloneRuntimeCacheProvider(new ObjectCacheRuntimeCacheProvider())));
 
@@ -253,18 +251,18 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// Special method to initialize the ApplicationEventsResolver and any modifications required for it such
+        /// Special method to initialize the ApplicationEventsResolver and any modifications required for it such 
         /// as adding custom types to the resolver.
         /// </summary>
         protected virtual void InitializeApplicationEventsResolver()
         {
             //find and initialize the application startup handlers, we need to initialize this resolver here because
-            //it is a special resolver where they need to be instantiated first before any other resolvers in order to bind to
+            //it is a special resolver where they need to be instantiated first before any other resolvers in order to bind to 
             //events and to call their events during bootup.
             //ApplicationStartupHandler.RegisterHandlers();
             //... and set the special flag to let us resolve before frozen resolution
             ApplicationEventsResolver.Current = new ApplicationEventsResolver(
-                ServiceProvider,
+                ServiceProvider, 
                 ProfilingLogger.Logger,
                 PluginManager.ResolveApplicationStartupHandlers())
             {
@@ -284,7 +282,7 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// Fires after initialization and calls the callback to allow for customizations to occur &
+        /// 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>
@@ -336,7 +334,7 @@ namespace Umbraco.Core
         {
             if (_isComplete)
                 throw new InvalidOperationException("The boot manager has already been completed");
-
+            
             FreezeResolution();
 
             //Here we need to make sure the db can be connected to
@@ -368,7 +366,7 @@ namespace Umbraco.Core
                             ProfilingLogger.Logger.Error<CoreBootManager>("An error occurred running OnApplicationStarted for handler " + x.GetType(), ex);
                             throw;
                         }
-                    });
+                    }); 
             }
 
             //Now, startup all of our legacy startup handler
@@ -415,7 +413,7 @@ namespace Umbraco.Core
 
             if (currentTry == 5)
             {
-                throw new UmbracoStartupFailedException("Umbraco cannot start. A connection string is configured but Umbraco cannot connect to the database.");
+                throw new UmbracoStartupFailedException("Umbraco cannot start. A connection string is configured but the Umbraco cannot connect to the database.");
             }
         }
 
@@ -457,10 +455,6 @@ namespace Umbraco.Core
             {
                 ServerRegistrarResolver.Current = new ServerRegistrarResolver(new ConfigServerRegistrar());
             }
-            else if ("true".InvariantEquals(ConfigurationManager.AppSettings["umbracoDisableElectionForSingleServer"]))
-            {
-                ServerRegistrarResolver.Current = new ServerRegistrarResolver(new SingleServerRegistrar());
-            }
             else
             {
                 ServerRegistrarResolver.Current = new ServerRegistrarResolver(
@@ -468,6 +462,7 @@ namespace Umbraco.Core
                         new Lazy<IServerRegistrationService>(() => ApplicationContext.Services.ServerRegistrationService),
                         new DatabaseServerRegistrarOptions()));
             }
+            
 
             //by default we'll use the database server messenger with default options (no callbacks),
             // this will be overridden in the web startup
@@ -478,7 +473,7 @@ namespace Umbraco.Core
                 ServiceProvider, ProfilingLogger.Logger,
                 () => PluginManager.ResolveAssignedMapperTypes());
 
-
+           
             //RepositoryResolver.Current = new RepositoryResolver(
             //    new RepositoryFactory(ApplicationCache));
 
@@ -505,7 +500,12 @@ namespace Umbraco.Core
             //the database migration objects
             MigrationResolver.Current = new MigrationResolver(
                 ProfilingLogger.Logger,
-                () => PluginManager.ResolveTypes<IMigration>());
+                () => PluginManager.ResolveTypes<IMigration>())
+            {
+                //This needs to be resolved before it's frozen because we need to find migrations to determine
+                // if Umbraco IsConfigured
+                CanResolveBeforeFrozen = true
+            };
 
             // todo: remove once we drop IPropertyEditorValueConverter support.
             PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(

src/Umbraco.Core/DatabaseContext.cs

@@ -1,10 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.Data.SqlServerCe;
 using System.IO;
 using System.Linq;
 using System.Web;
+using System.Web.Configuration;
 using System.Xml.Linq;
 using Semver;
 using Umbraco.Core.Configuration;
@@ -30,22 +30,17 @@ namespace Umbraco.Core
         private readonly ILogger _logger;
         private readonly SqlSyntaxProviders _syntaxProviders;
         private bool _configured;
+        private readonly object _locker = new object();
         private string _connectionString;
         private string _providerName;
         private DatabaseSchemaResult _result;
-        private DateTime? _connectionLastChecked = null;
-
-        /// <summary>
-        /// The number of minutes to throttle the checks to CanConnect
-        /// </summary>
-        private const int ConnectionCheckMinutes = 1;
 
         [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 SqlCeSyntaxProvider(), 
                 new SqlServerSyntaxProvider()
             }))
         {
@@ -85,60 +80,21 @@ namespace Umbraco.Core
             _configured = true;
         }
 
-#if DEBUG_DATABASES
-        public List<UmbracoDatabase> Databases
-        {
-            get
-            {
-                var factory = _factory as DefaultDatabaseFactory;
-                if (factory == null) throw new NotSupportedException();
-                return factory.Databases;
-            }
-        }
-#endif
-
         public ISqlSyntaxProvider SqlSyntax { get; private set; }
 
         /// <summary>
-        /// Gets an "ambient" database for doing CRUD operations against custom tables that resides in the Umbraco database.
+        /// Gets the <see cref="Database"/> object for doing CRUD operations
+        /// against custom tables that resides in the Umbraco database.
         /// </summary>
         /// <remarks>
-        /// <para>Should not be used for operation against standard Umbraco tables; as services should be used instead.</para>
-        /// <para>Gets or creates an "ambient" database that is either stored in http context + available for the whole
-        /// request + auto-disposed at the end of the request, or stored in call context if there is no http context - in which
-        /// case it *must* be explicitely disposed (which will remove it from call context).</para>
+        /// This should not be used for CRUD operations or queries against the
+        /// standard Umbraco tables! Use the Public services for that.
         /// </remarks>
         public virtual UmbracoDatabase Database
         {
             get { return _factory.CreateDatabase(); }
         }
 
-        /// <summary>
-        /// Replaces the "ambient" database (if any) and by a new temp database.
-        /// </summary>
-        /// <remarks>
-        /// <para>The returned IDisposable *must* be diposed in order to properly dispose the temp database and
-        /// restore the original "ambient" database (if any).</para>
-        /// <para>This is to be used in background tasks to ensure that they have an "ambient" database which
-        /// will be properly removed from call context and does not interfere with anything else. In most case
-        /// it is not replacing anything, just temporarily installing a database in context.</para>
-        /// </remarks>
-        public virtual IDisposable UseSafeDatabase(bool force = false)
-        {
-            var factory = _factory as DefaultDatabaseFactory;
-            if (factory == null) throw new NotSupportedException();
-
-            if (DefaultDatabaseFactory.HasAmbientDatabase)
-            {
-                return force
-                    ? new UsingDatabase(DefaultDatabaseFactory.DetachAmbientDatabase(), factory.CreateDatabase())
-                    : new UsingDatabase(null, null);
-            }
-
-            // create a new, temp, database (will be disposed with UsingDatabase)
-            return new UsingDatabase(null, factory.CreateDatabase());
-        }
-
         /// <summary>
         /// Boolean indicating whether the database has been configured
         /// </summary>
@@ -154,28 +110,13 @@ namespace Umbraco.Core
         {
             get
             {
-                if (IsDatabaseConfigured == false)
-                    return false;
-
-                //Don't check again if the timeout period hasn't elapsed
-                //this ensures we don't keep checking the connection too many times in a row like during startup.
-                //Do check if the _connectionLastChecked is null which means we're just initializing or it could 
-                //not connect last time it was checked.
-                if ((_connectionLastChecked.HasValue && (DateTime.Now - _connectionLastChecked.Value).TotalMinutes > ConnectionCheckMinutes)
-                    || _connectionLastChecked.HasValue == false)
-                {
-                    var canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
-                    LogHelper.Info<DatabaseContext>("CanConnect = " + canConnect);
-
-                    _connectionLastChecked = canConnect == false ? null : (DateTime?) DateTime.Now;
-                    return canConnect;
-                }
-
-                return _connectionLastChecked.HasValue;
+                if (IsDatabaseConfigured == false) return false;
+                var canConnect = DbConnectionExtensions.IsConnectionAvailable(ConnectionString, DatabaseProvider);
+                LogHelper.Info<DatabaseContext>("CanConnect = " + canConnect);
+                return canConnect;
             }
         }
 
-
         /// <summary>
         /// Gets the configured umbraco db connection string.
         /// </summary>
@@ -194,15 +135,15 @@ namespace Umbraco.Core
                 if (string.IsNullOrEmpty(_providerName) == false)
                     return _providerName;
 
-                _providerName = Constants.DatabaseProviders.SqlServer;
-                if (ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName] != null)
+                _providerName = "System.Data.SqlClient";
+                if (ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName] != null)
                 {
-                    if (string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName].ProviderName) == false)
-                        _providerName = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName].ProviderName;
+                    if (string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName) == false)
+                        _providerName = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName;
                 }
                 else
                 {
-                    throw new InvalidOperationException("Can't find a connection string with the name '" + Constants.System.UmbracoConnectionName + "'");
+                    throw new InvalidOperationException("Can't find a connection string with the name '" + GlobalSettings.UmbracoConnectionName + "'");
                 }
                 return _providerName;
             }
@@ -233,7 +174,7 @@ namespace Umbraco.Core
         /// </summary>
         public void ConfigureEmbeddedDatabaseConnection()
         {
-            const string providerName = Constants.DatabaseProviders.SqlCe;
+            const string providerName = "System.Data.SqlServerCe.4.0";
 
             var connectionString = GetEmbeddedDatabaseConnectionString();
             SaveConnectionString(connectionString, providerName);
@@ -241,10 +182,15 @@ namespace Umbraco.Core
             var path = Path.Combine(GlobalSettings.FullpathToRoot, "App_Data", "Umbraco.sdf");
             if (File.Exists(path) == false)
             {
-                using (var engine = new SqlCeEngine(connectionString))
-                {
-                    engine.CreateDatabase();
-                }
+                var engine = new SqlCeEngine(connectionString);
+                engine.CreateDatabase();
+
+                // SD: Pretty sure this should be in a using clause but i don't want to cause unknown side-effects here
+                // since it's been like this for quite some time
+                //using (var engine = new SqlCeEngine(connectionString))
+                //{
+                //    engine.CreateDatabase();    
+                //}
             }
 
             Initialize(providerName);
@@ -266,10 +212,10 @@ namespace Umbraco.Core
         {
             var provider = DbConnectionExtensions.DetectProviderFromConnectionString(connectionString);
             var databaseProvider = provider.ToString();
-            var providerName = Constants.DatabaseProviders.SqlServer;
+            var providerName = "System.Data.SqlClient";
             if (databaseProvider.ToLower().Contains("mysql"))
             {
-                providerName = Constants.DatabaseProviders.MySql;
+                providerName = "MySql.Data.MySqlClient";
             }
             SaveConnectionString(connectionString, providerName);
             Initialize(string.Empty);
@@ -284,20 +230,20 @@ namespace Umbraco.Core
         /// <param name="password">Database Password</param>
         /// <param name="databaseProvider">Type of the provider to be used (Sql, Sql Azure, Sql Ce, MySql)</param>
         public void ConfigureDatabaseConnection(string server, string databaseName, string user, string password, string databaseProvider)
-        {
+        {            
             string providerName;
             var connectionString = GetDatabaseConnectionString(server, databaseName, user, password, databaseProvider, out providerName);
 
             SaveConnectionString(connectionString, providerName);
             Initialize(providerName);
         }
-
+        
         public string GetDatabaseConnectionString(string server, string databaseName, string user, string password, string databaseProvider, out string providerName)
         {
-            providerName = Constants.DatabaseProviders.SqlServer;
+            providerName = "System.Data.SqlClient";
             if (databaseProvider.ToLower().Contains("mysql"))
             {
-                providerName = Constants.DatabaseProviders.MySql;
+                providerName = "MySql.Data.MySqlClient";
                 return string.Format("Server={0}; Database={1};Uid={2};Pwd={3}", server, databaseName, user, password);
             }
             if (databaseProvider.ToLower().Contains("azure"))
@@ -314,7 +260,7 @@ namespace Umbraco.Core
         /// <param name="databaseName">Name of the database</param>
         public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
         {
-            const string providerName = Constants.DatabaseProviders.SqlServer;
+            const string providerName = "System.Data.SqlClient";
             var connectionString = GetIntegratedSecurityDatabaseConnectionString(server, databaseName);
             SaveConnectionString(connectionString, providerName);
             Initialize(providerName);
@@ -322,18 +268,18 @@ namespace Umbraco.Core
 
         public string GetIntegratedSecurityDatabaseConnectionString(string server, string databaseName)
         {
-            return String.Format("Server={0};Database={1};Integrated Security=true", server, databaseName);
+            return String.Format("Server={0};Database={1};Integrated Security=true", server, databaseName);            
         }
 
         internal string BuildAzureConnectionString(string server, string databaseName, string user, string password)
         {
             if (server.Contains(".") && ServerStartsWithTcp(server) == false)
                 server = string.Format("tcp:{0}", server);
-
+            
             if (server.Contains(".") == false && ServerStartsWithTcp(server))
             {
-                string serverName = server.Contains(",")
-                                        ? server.Substring(0, server.IndexOf(",", StringComparison.Ordinal))
+                string serverName = server.Contains(",") 
+                                        ? server.Substring(0, server.IndexOf(",", StringComparison.Ordinal)) 
                                         : server;
 
                 var portAddition = string.Empty;
@@ -343,10 +289,10 @@ namespace Umbraco.Core
 
                 server = string.Format("{0}.database.windows.net{1}", serverName, portAddition);
             }
-
+            
             if (ServerStartsWithTcp(server) == false)
                 server = string.Format("tcp:{0}.database.windows.net", server);
-
+            
             if (server.Contains(",") == false)
                 server = string.Format("{0},1433", server);
 
@@ -383,23 +329,23 @@ namespace Umbraco.Core
         {
             //Set the connection string for the new datalayer
             var connectionStringSettings = string.IsNullOrEmpty(providerName)
-                                      ? new ConnectionStringSettings(Constants.System.UmbracoConnectionName,
+                                      ? new ConnectionStringSettings(GlobalSettings.UmbracoConnectionName,
                                                                      connectionString)
-                                      : new ConnectionStringSettings(Constants.System.UmbracoConnectionName,
+                                      : new ConnectionStringSettings(GlobalSettings.UmbracoConnectionName,
                                                                      connectionString, providerName);
 
             _connectionString = connectionString;
             _providerName = providerName;
-
+            
             var fileName = IOHelper.MapPath(string.Format("{0}/web.config", SystemDirectories.Root));
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
             var connectionstrings = xml.Root.DescendantsAndSelf("connectionStrings").Single();
 
             // Update connectionString if it exists, or else create a new appSetting for the given key and value
-            var setting = connectionstrings.Descendants("add").FirstOrDefault(s => s.Attribute("name").Value == Constants.System.UmbracoConnectionName);
+            var setting = connectionstrings.Descendants("add").FirstOrDefault(s => s.Attribute("name").Value == GlobalSettings.UmbracoConnectionName);
             if (setting == null)
                 connectionstrings.Add(new XElement("add",
-                    new XAttribute("name", Constants.System.UmbracoConnectionName),
+                    new XAttribute("name", GlobalSettings.UmbracoConnectionName),
                     new XAttribute("connectionString", connectionStringSettings),
                     new XAttribute("providerName", providerName)));
             else
@@ -424,23 +370,24 @@ namespace Umbraco.Core
         /// </remarks>
         internal void Initialize()
         {
-            var databaseSettings = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName];
+            var databaseSettings = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName];
             if (databaseSettings != null && string.IsNullOrWhiteSpace(databaseSettings.ConnectionString) == false && string.IsNullOrWhiteSpace(databaseSettings.ProviderName) == false)
             {
-                var providerName = Constants.DatabaseProviders.SqlServer;
+                var providerName = "System.Data.SqlClient";
                 string connString = null;
-                if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName].ProviderName))
+                if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
                 {
-                    providerName = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName].ProviderName;
-                    connString = ConfigurationManager.ConnectionStrings[Constants.System.UmbracoConnectionName].ConnectionString;
+                    providerName = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName;
+                    connString = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
                 }
                 Initialize(providerName, connString);
 
+                DetermineSqlServerVersion();
             }
-            else if (ConfigurationManager.AppSettings.ContainsKey(Constants.System.UmbracoConnectionName) && string.IsNullOrEmpty(ConfigurationManager.AppSettings[Constants.System.UmbracoConnectionName]) == false)
+            else if (ConfigurationManager.AppSettings.ContainsKey(GlobalSettings.UmbracoConnectionName) && string.IsNullOrEmpty(ConfigurationManager.AppSettings[GlobalSettings.UmbracoConnectionName]) == false)
             {
                 //A valid connectionstring does not exist, but the legacy appSettings key was found, so we'll reconfigure the conn.string.
-                var legacyConnString = ConfigurationManager.AppSettings[Constants.System.UmbracoConnectionName];
+                var legacyConnString = ConfigurationManager.AppSettings[GlobalSettings.UmbracoConnectionName];
                 if (legacyConnString.ToLowerInvariant().Contains("sqlce4umbraco"))
                 {
                     ConfigureEmbeddedDatabaseConnection();
@@ -448,8 +395,8 @@ namespace Umbraco.Core
                 else if (legacyConnString.ToLowerInvariant().Contains("tcp:"))
                 {
                     //Must be sql azure
-                    SaveConnectionString(legacyConnString, Constants.DatabaseProviders.SqlServer);
-                    Initialize(Constants.DatabaseProviders.SqlServer);
+                    SaveConnectionString(legacyConnString, "System.Data.SqlClient");
+                    Initialize("System.Data.SqlClient");
                 }
                 else if (legacyConnString.ToLowerInvariant().Contains("datalayer=mysql"))
                 {
@@ -460,19 +407,20 @@ namespace Umbraco.Core
                     foreach (var variable in legacyConnString.Split(';').Where(x => x.ToLowerInvariant().StartsWith("datalayer") == false))
                         connectionStringWithoutDatalayer = string.Format("{0}{1};", connectionStringWithoutDatalayer, variable);
 
-                    SaveConnectionString(connectionStringWithoutDatalayer, Constants.DatabaseProviders.MySql);
-                    Initialize(Constants.DatabaseProviders.MySql);
+                    SaveConnectionString(connectionStringWithoutDatalayer, "MySql.Data.MySqlClient");
+                    Initialize("MySql.Data.MySqlClient");
                 }
                 else
                 {
                     //Must be sql
-                    SaveConnectionString(legacyConnString, Constants.DatabaseProviders.SqlServer);
-                    Initialize(Constants.DatabaseProviders.SqlServer);
+                    SaveConnectionString(legacyConnString, "System.Data.SqlClient");
+                    Initialize("System.Data.SqlClient");
                 }
 
                 //Remove the legacy connection string, so we don't end up in a loop if something goes wrong.
-                GlobalSettings.RemoveSetting(Constants.System.UmbracoConnectionName);
+                GlobalSettings.RemoveSetting(GlobalSettings.UmbracoConnectionName);
 
+                DetermineSqlServerVersion();
             }
             else
             {
@@ -491,15 +439,15 @@ namespace Umbraco.Core
             {
                 if (_syntaxProviders != null)
                 {
-                    SqlSyntax = _syntaxProviders.GetByProviderNameOrDefault(providerName);
+                    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;
             }
             catch (Exception e)
@@ -517,6 +465,49 @@ namespace Umbraco.Core
             Initialize(providerName);
         }
 
+        /// <summary>
+        /// Set the lazy resolution of determining the SQL server version if that is the db type we're using
+        /// </summary>
+        private void DetermineSqlServerVersion()
+        {
+
+            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
+                // the sql server version.
+                sqlServerSyntax.VersionName = new Lazy<SqlServerVersionName>(() =>
+                {
+                    try
+                    {
+                        var database = this._factory.CreateDatabase();
+
+                        var version = database.ExecuteScalar<string>("SELECT SERVERPROPERTY('productversion')");
+                        var firstPart = version.Split('.')[0];
+                        switch (firstPart)
+                        {
+                            case "11":
+                                return SqlServerVersionName.V2012;
+                            case "10":
+                                return SqlServerVersionName.V2008;
+                            case "9":
+                                return SqlServerVersionName.V2005;
+                            case "8":
+                                return SqlServerVersionName.V2000;
+                            case "7":
+                                return SqlServerVersionName.V7;
+                            default:
+                                return SqlServerVersionName.Other;
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        return SqlServerVersionName.Invalid;
+                    }
+                });
+            }
+        }
+
         internal DatabaseSchemaResult ValidateDatabaseSchema()
         {
             if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
@@ -526,7 +517,7 @@ namespace Umbraco.Core
             {
 
                 if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted
-                    && ProviderName == Constants.DatabaseProviders.MySql)
+                    && ProviderName == "MySql.Data.MySqlClient")
                 {
                     throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
                 }
@@ -539,7 +530,7 @@ namespace Umbraco.Core
         }
 
         internal Result CreateDatabaseSchemaAndData(ApplicationContext applicationContext)
-        {
+        {   
             try
             {
                 var readyForInstall = CheckReadyForInstall();
@@ -557,7 +548,7 @@ namespace Umbraco.Core
                 // 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 = SqlSyntax.SupportsCaseInsensitiveQueries(database);
                 if (supportsCaseInsensitiveQueries  == false)
                 {
@@ -575,9 +566,9 @@ namespace Umbraco.Core
                 message = GetResultMessageForMySql();
 
                 var schemaResult = ValidateDatabaseSchema();
-
+                
                 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) && installedSchemaVersion.Equals(new Version(0, 0, 0)))
                 {
@@ -596,9 +587,9 @@ namespace Umbraco.Core
                 message = "<p>Upgrading database, this may take some time...</p>";
                 return new Result
                     {
-                        RequiresUpgrade = true,
-                        Message = message,
-                        Success = true,
+                        RequiresUpgrade = true, 
+                        Message = message, 
+                        Success = true, 
                         Percentage = "30"
                     };
             }
@@ -626,7 +617,7 @@ namespace Umbraco.Core
                 _logger.Info<DatabaseContext>("Database upgrade started");
 
                 var database = new UmbracoDatabase(_connectionString, ProviderName, _logger);
-                //var supportsCaseInsensitiveQueries = SqlSyntax.SupportsCaseInsensitiveQueries(database);
+                //var supportsCaseInsensitiveQueries = SqlSyntax.SupportsCaseInsensitiveQueries(database);                
 
                 var message = GetResultMessageForMySql();
 
@@ -634,32 +625,37 @@ namespace Umbraco.Core
 
                 var installedSchemaVersion = new SemVersion(schemaResult.DetermineInstalledVersion());
 
-                var installedMigrationVersion = schemaResult.DetermineInstalledVersionByMigrations(migrationEntryService);
+                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
+                // 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.
+                // 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.
+                //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());
@@ -667,7 +663,7 @@ namespace Umbraco.Core
 
                 //DO the upgrade!
 
-                var runner = new MigrationRunner(migrationEntryService, _logger, currentInstalledVersion, UmbracoVersion.GetSemanticVersion(), Constants.System.UmbracoMigrationName);
+                var runner = new MigrationRunner(migrationEntryService, _logger, currentInstalledVersion, UmbracoVersion.GetSemanticVersion(), GlobalSettings.UmbracoMigrationName);
 
                 var upgraded = runner.Execute(database, true);
 
@@ -735,7 +731,7 @@ namespace Umbraco.Core
         private Attempt<Result> CheckReadyForInstall()
         {
             if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted
-                    && ProviderName == Constants.DatabaseProviders.MySql)
+                    && ProviderName == "MySql.Data.MySqlClient")
             {
                 throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
             }
@@ -784,7 +780,7 @@ namespace Umbraco.Core
         {
             var dbIsSqlCe = false;
             if (databaseSettings != null && databaseSettings.ProviderName != null)
-                dbIsSqlCe = databaseSettings.ProviderName == Constants.DatabaseProviders.SqlCe;
+                dbIsSqlCe = databaseSettings.ProviderName == "System.Data.SqlServerCe.4.0";
             var sqlCeDatabaseExists = false;
             if (dbIsSqlCe)
             {
@@ -794,7 +790,7 @@ namespace Umbraco.Core
                 {
                     var datasource = dataSourcePart.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString());
                     var filePath = datasource.Replace("Data Source=", string.Empty);
-                    sqlCeDatabaseExists = File.Exists(filePath);
+                    sqlCeDatabaseExists = File.Exists(filePath);                    
                 }
             }
 
@@ -808,28 +804,5 @@ namespace Umbraco.Core
 
             return true;
         }
-
-        private class UsingDatabase : IDisposable
-        {
-            private readonly UmbracoDatabase _orig;
-            private readonly UmbracoDatabase _temp;
-
-            public UsingDatabase(UmbracoDatabase orig, UmbracoDatabase temp)
-            {
-                _orig = orig;
-                _temp = temp;
-            }
-
-            public void Dispose()
-            {
-                if (_temp != null)
-                {
-                    _temp.Dispose();
-                    if (_orig != null)
-                        DefaultDatabaseFactory.AttachAmbientDatabase(_orig);
-                }
-                GC.SuppressFinalize(this);
-            }
-        }
     }
 }

src/Umbraco.Core/DecimalExtensions.cs

@@ -1,23 +0,0 @@
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides extension methods for System.Decimal.
-    /// </summary>
-    /// <remarks>See System.Decimal on MSDN and also 
-    /// http://stackoverflow.com/questions/4298719/parse-decimal-and-filter-extra-0-on-the-right/4298787#4298787.
-    /// </remarks>
-    public static class DecimalExtensions
-    {
-        /// <summary>
-        /// Gets the normalized value.
-        /// </summary>
-        /// <param name="value">The value to normalize.</param>
-        /// <returns>The normalized value.</returns>
-        /// <remarks>Normalizing changes the scaling factor and removes trailing zeroes,
-        /// so 1.2500m comes out as 1.25m.</remarks>
-        public static decimal Normalize(this decimal value)
-        {
-            return value / 1.000000000000000000000000000000000m;
-        }
-    }
-}

src/Umbraco.Core/Deploy/ArtifactBase.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Provides a base class to all artifacts.
-    /// </summary>
-    public abstract class ArtifactBase<TUdi> : IArtifact
-        where TUdi : Udi
-    {
-        protected ArtifactBase(TUdi udi, IEnumerable<ArtifactDependency> dependencies = null)
-        {
-            if (udi == null)
-                throw new ArgumentNullException("udi");
-            Udi = udi;
-
-            Dependencies = dependencies ?? Enumerable.Empty<ArtifactDependency>();
-            _checksum = new Lazy<string>(GetChecksum);
-        }
-
-        private readonly Lazy<string> _checksum;
-        private IEnumerable<ArtifactDependency> _dependencies;
-
-        protected abstract string GetChecksum();
-
-        #region Abstract implementation of IArtifactSignature
-
-        Udi IArtifactSignature.Udi
-        {
-            get { return Udi; }
-        }
-
-        public TUdi Udi { get; set; }
-
-        [JsonIgnore]
-        public string Checksum
-        {
-            get { return _checksum.Value; }
-        }
-
-        public IEnumerable<ArtifactDependency> Dependencies
-        {
-            get { return _dependencies; }
-            set { _dependencies = value.OrderBy(x => x.Udi); }
-        }
-
-        #endregion
-    }
-}

src/Umbraco.Core/Deploy/ArtifactDependency.cs

@@ -1,40 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Represents an artifact dependency.
-    /// </summary>
-    /// <remarks>
-    /// <para>Dependencies have an order property which indicates whether it must be respected when ordering artifacts.</para>
-    /// <para>Dependencies have a mode which can be <c>Match</c> or <c>Exist</c> depending on whether the checksum should match.</para>
-    /// </remarks>
-    public class ArtifactDependency
-    {
-        /// <summary>
-        /// Initializes a new instance of the ArtifactDependency class with an entity identifier and a mode.
-        /// </summary>
-        /// <param name="udi">The entity identifier of the artifact that is a dependency.</param>
-        /// <param name="ordering">A value indicating whether the dependency is ordering.</param>
-        /// <param name="mode">The dependency mode.</param>
-        public ArtifactDependency(Udi udi, bool ordering, ArtifactDependencyMode mode)
-        {
-            Udi = udi;
-            Ordering = ordering;
-            Mode = mode;
-        }
-
-        /// <summary>
-        /// Gets the entity id of the artifact that is a dependency.
-        /// </summary>
-        public Udi Udi { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the dependency is ordering.
-        /// </summary>
-        public bool Ordering { get; private set; }
-
-        /// <summary>
-        /// Gets the dependency mode.
-        /// </summary>
-        public ArtifactDependencyMode Mode { get; private set; }
-    }
-}

src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Represents a collection of distinct <see cref="ArtifactDependency"/>.
-    /// </summary>
-    /// <remarks>The collection cannot contain duplicates and modes are properly managed.</remarks>
-    public class ArtifactDependencyCollection : ICollection<ArtifactDependency>
-    {
-        private readonly Dictionary<Udi, ArtifactDependency> _dependencies
-            = new Dictionary<Udi, ArtifactDependency>();
-
-        public IEnumerator<ArtifactDependency> GetEnumerator()
-        {
-            return _dependencies.Values.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        public void Add(ArtifactDependency item)
-        {
-            if (_dependencies.ContainsKey(item.Udi))
-            {
-                var exist = _dependencies[item.Udi];
-                if (item.Mode == ArtifactDependencyMode.Exist || item.Mode == exist.Mode)
-                    return;
-            }
-
-            _dependencies[item.Udi] = item;
-        }
-
-        public void Clear()
-        {
-            _dependencies.Clear();
-        }
-
-        public bool Contains(ArtifactDependency item)
-        {
-            return _dependencies.ContainsKey(item.Udi) &&
-                   (_dependencies[item.Udi].Mode == item.Mode || _dependencies[item.Udi].Mode == ArtifactDependencyMode.Match);
-        }
-
-        public void CopyTo(ArtifactDependency[] array, int arrayIndex)
-        {
-            _dependencies.Values.CopyTo(array, arrayIndex);
-        }
-
-        public bool Remove(ArtifactDependency item)
-        {
-            throw new NotSupportedException();
-        }
-
-        public int Count
-        {
-            get { return _dependencies.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return false; }
-        }
-    }
-}

src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs

@@ -1,18 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Indicates the mode of the dependency.
-    /// </summary>
-    public enum ArtifactDependencyMode
-    {
-        /// <summary>
-        /// The dependency must match exactly.
-        /// </summary>
-        Match,
-
-        /// <summary>
-        /// The dependency must exist.
-        /// </summary>
-        Exist
-    }
-}

src/Umbraco.Core/Deploy/ArtifactDeployState.cs

@@ -1,50 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Represent the state of an artifact being deployed.
-    /// </summary>
-    public abstract class ArtifactDeployState
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="ArtifactDeployState"/> class from an artifact and an entity.
-        /// </summary>
-        /// <typeparam name="TArtifact">The type of the artifact.</typeparam>
-        /// <typeparam name="TEntity">The type of the entity.</typeparam>
-        /// <param name="art">The artifact.</param>
-        /// <param name="entity">The entity.</param>
-        /// <param name="connector">The service connector deploying the artifact.</param>
-        /// <param name="nextPass">The next pass number.</param>
-        /// <returns>A deploying artifact.</returns>
-        public static ArtifactDeployState<TArtifact, TEntity> Create<TArtifact, TEntity>(TArtifact art, TEntity entity, IServiceConnector connector, int nextPass)
-            where TArtifact : IArtifact
-        {
-            return new ArtifactDeployState<TArtifact, TEntity>(art, entity, connector, nextPass);
-        }
-
-        /// <summary>
-        /// Gets the artifact.
-        /// </summary>
-        public IArtifact Artifact
-        {
-            get { return GetArtifactAsIArtifact(); }
-        }
-
-        /// <summary>
-        /// Gets the artifact as an <see cref="IArtifact"/>.
-        /// </summary>
-        /// <returns>The artifact, as an <see cref="IArtifact"/>.</returns>
-        /// <remarks>This is because classes that inherit from this class cannot override the Artifact property
-        /// with a property that specializes the return type, and so they need to 'new' the property.</remarks>
-        protected abstract IArtifact GetArtifactAsIArtifact();
-
-        /// <summary>
-        /// Gets or sets the service connector in charge of deploying the artifact.
-        /// </summary>
-        public IServiceConnector Connector { get; set; }
-
-        /// <summary>
-        /// Gets or sets the next pass number.
-        /// </summary>
-        public int NextPass { get; set; }
-    }
-}

src/Umbraco.Core/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs

@@ -1,48 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Represent the state of an artifact being deployed.
-    /// </summary>
-    /// <typeparam name="TArtifact">The type of the artifact.</typeparam>
-    /// <typeparam name="TEntity">The type of the entity.</typeparam>
-    public class ArtifactDeployState<TArtifact, TEntity> : ArtifactDeployState
-        where TArtifact : IArtifact
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArtifactDeployState{TArtifact,TEntity}"/> class.
-        /// </summary>
-        public ArtifactDeployState()
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArtifactDeployState{TArtifact,TEntity}"/> class.
-        /// </summary>
-        /// <param name="art">The artifact.</param>
-        /// <param name="entity">The entity.</param>
-        /// <param name="connector">The service connector deploying the artifact.</param>
-        /// <param name="nextPass">The next pass number.</param>
-        public ArtifactDeployState(TArtifact art, TEntity entity, IServiceConnector connector, int nextPass)
-        {
-            Artifact = art;
-            Entity = entity;
-            Connector = connector;
-            NextPass = nextPass;
-        }
-
-        /// <summary>
-        /// Gets or sets the artifact.
-        /// </summary>
-        public new TArtifact Artifact { get; set; }
-
-        /// <summary>
-        /// Gets or sets the entity.
-        /// </summary>
-        public TEntity Entity { get; set; }
-
-        /// <inheritdoc/>
-        protected sealed override IArtifact GetArtifactAsIArtifact()
-        {
-            return Artifact;
-        }
-    }
-}

src/Umbraco.Core/Deploy/ArtifactSignature.cs

@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Umbraco.Core.Deploy
-{
-    public sealed class ArtifactSignature : IArtifactSignature
-    {
-        public ArtifactSignature(Udi udi, string checksum, IEnumerable<ArtifactDependency> dependencies = null)
-        {
-            Udi = udi;
-            Checksum = checksum;
-            Dependencies = dependencies ?? Enumerable.Empty<ArtifactDependency>();
-        }
-
-        public Udi Udi { get; private set; }
-
-        public string Checksum { get; private set; }
-
-        public IEnumerable<ArtifactDependency> Dependencies { get; private set; }
-    }
-}

src/Umbraco.Core/Deploy/Difference.cs

@@ -1,28 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    public class Difference
-    {
-        public Difference(string title, string text = null, string category = null)
-        {
-            Title = title;
-            Text = text;
-            Category = category;
-        }
-
-        public string Title { get; set; }
-        public string Text { get; set; }
-        public string Category { get; set; }
-
-        public override string ToString()
-        {
-            var s = Title;
-            if (!string.IsNullOrWhiteSpace(Category)) s += string.Format("[{0}]", Category);
-            if (!string.IsNullOrWhiteSpace(Text))
-            {
-                if (s.Length > 0) s += ":";
-                s += Text;
-            }
-            return s;
-        }
-    }
-}

src/Umbraco.Core/Deploy/Direction.cs

@@ -1,8 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    public enum Direction
-    {
-        ToArtifact,
-        FromArtifact
-    }
-}

src/Umbraco.Core/Deploy/IArtifact.cs

@@ -1,8 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Represents an artifact ie an object that can be transfered between environments.
-    /// </summary>
-    public interface IArtifact : IArtifactSignature
-    { }
-}

src/Umbraco.Core/Deploy/IArtifactSignature.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Represents the signature of an artifact.
-    /// </summary>
-    public interface IArtifactSignature
-    {
-        /// <summary>
-        /// Gets the entity unique identifier of this artifact.
-        /// </summary>
-        /// <remarks>
-        /// <para>The project identifier is independent from the state of the artifact, its data
-        /// values, dependencies, anything. It never changes and fully identifies the artifact.</para>
-        /// <para>What an entity uses as a unique identifier will influence what we can transfer
-        /// between environments. Eg content type "Foo" on one environment is not necessarily the
-        /// same as "Foo" on another environment, if guids are used as unique identifiers. What is
-        /// used should be documented for each entity, along with the consequences of the choice.</para>
-        /// </remarks>
-        Udi Udi { get; }
-
-        /// <summary>
-        /// Gets the checksum of this artifact.
-        /// </summary>
-        /// <remarks>
-        /// <para>The checksum depends on the artifact's properties, and on the identifiers of all its dependencies,
-        /// but not on their checksums. So the checksum changes when any of the artifact's properties changes,
-        /// or when the list of dependencies changes. But not if one of these dependencies change.</para>
-        /// <para>It is assumed that checksum collisions cannot happen ie that no two different artifact's
-        /// states will ever produce the same checksum, so that if two artifacts have the same checksum then
-        /// they are identical.</para>
-        /// </remarks>
-        string Checksum { get; }
-
-        /// <summary>
-        /// Gets the dependencies of this artifact.
-        /// </summary>
-        IEnumerable<ArtifactDependency> Dependencies { get; }
-    }
-}

src/Umbraco.Core/Deploy/IDeployContext.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Represents a deployment context.
-    /// </summary>
-    public interface IDeployContext
-    {
-        /// <summary>
-        /// Gets the unique identifier of the deployment.
-        /// </summary>
-        Guid SessionId { get; }
-
-        /// <summary>
-        /// Gets the file source.
-        /// </summary>
-        /// <remarks>The file source is used to obtain files from the source environment.</remarks>
-        IFileSource FileSource { get; }
-
-        /// <summary>
-        /// Gets the next number in a numerical sequence.
-        /// </summary>
-        /// <returns>The next sequence number.</returns>
-        /// <remarks>Can be used to uniquely number things during a deployment.</remarks>
-        int NextSeq();
-
-        /// <summary>
-        /// Gets items.
-        /// </summary>
-        IDictionary<string, object> Items { get; }
-
-        /// <summary>
-        /// Gets item.
-        /// </summary>
-        /// <typeparam name="T">The type of the item.</typeparam>
-        /// <param name="key">The key of the item.</param>
-        /// <returns>The item with the specified key and type, if any, else null.</returns>
-        T Item<T>(string key) where T : class;
-    }
-}

src/Umbraco.Core/Deploy/IFileSource.cs

@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Represents a file source, ie a mean for a target environment involved in a
-    /// deployment to obtain the content of files being deployed.
-    /// </summary>
-    public interface IFileSource
-    {
-        /// <summary>
-        /// Gets the content of a file as a stream.
-        /// </summary>
-        /// <param name="udi">A file entity identifier.</param>
-        /// <returns>A stream with read access to the file content.</returns>
-        /// <remarks>
-        /// <para>Returns null if no content could be read.</para>
-        /// <para>The caller should ensure that the stream is properly closed/disposed.</para>
-        /// </remarks>
-        Stream GetFileStream(StringUdi udi);
-
-        /// <summary>
-        /// Gets the content of a file as a stream.
-        /// </summary>
-        /// <param name="udi">A file entity identifier.</param>
-        /// <param name="token">A cancellation token.</param>
-        /// <returns>A stream with read access to the file content.</returns>
-        /// <remarks>
-        /// <para>Returns null if no content could be read.</para>
-        /// <para>The caller should ensure that the stream is properly closed/disposed.</para>
-        /// </remarks>
-        Task<Stream> GetFileStreamAsync(StringUdi udi, CancellationToken token);
-
-        /// <summary>
-        /// Gets the content of a file as a string.
-        /// </summary>
-        /// <param name="udi">A file entity identifier.</param>
-        /// <returns>A string containing the file content.</returns>
-        /// <remarks>Returns null if no content could be read.</remarks>
-        string GetFileContent(StringUdi udi);
-
-        /// <summary>
-        /// Gets the content of a file as a string.
-        /// </summary>
-        /// <param name="udi">A file entity identifier.</param>
-        /// <param name="token">A cancellation token.</param>
-        /// <returns>A string containing the file content.</returns>
-        /// <remarks>Returns null if no content could be read.</remarks>
-        Task<string> GetFileContentAsync(StringUdi udi, CancellationToken token);
-
-        /// <summary>
-        /// Gets the length of a file.
-        /// </summary>
-        /// <param name="udi">A file entity identifier.</param>
-        /// <returns>The length of the file, or -1 if the file does not exist.</returns>
-        long GetFileLength(StringUdi udi);
-
-        /// <summary>
-        /// Gets the length of a file.
-        /// </summary>
-        /// <param name="udi">A file entity identifier.</param>
-        /// <param name="token">A cancellation token.</param>
-        /// <returns>The length of the file, or -1 if the file does not exist.</returns>
-        Task<long> GetFileLengthAsync(StringUdi udi, CancellationToken token);
-
-        // fixme - doc
-        void GetFiles(IEnumerable<StringUdi> udis, IFileStore fileStore);
-
-        Task GetFilesAsync(IEnumerable<StringUdi> udis, IFileStore fileStore, CancellationToken token);
-
-        ///// <summary>
-        ///// Gets the content of a file as a bytes array.
-        ///// </summary>
-        ///// <param name="Udi">A file entity identifier.</param>
-        ///// <returns>A byte array containing the file content.</returns>
-        //byte[] GetFileBytes(StringUdi Udi);
-    }
-}

src/Umbraco.Core/Deploy/IFileStore.cs

@@ -1,9 +0,0 @@
-using System.IO;
-
-namespace Umbraco.Core.Deploy
-{
-    public interface IFileStore
-    {
-        void SaveStream(StringUdi udi, Stream stream);
-    }
-}

src/Umbraco.Core/Deploy/IGridCellValueConnector.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Defines methods that can convert a grid cell value to / from an environment-agnostic string.
-    /// </summary>
-    /// <remarks>Grid cell values may contain values such as content identifiers, that would be local
-    /// to one environment, and need to be converted in order to be deployed.</remarks>
-    public interface IGridCellValueConnector
-    {
-        /// <summary>
-        /// Gets a value indicating whether the connector supports a specified grid editor alias.
-        /// </summary>
-        /// <param name="alias">The grid editor alias.</param>
-        /// <remarks>A value indicating whether the connector supports the grid editor alias.</remarks>
-        /// <remarks>Note that <paramref name="alias" /> can be string.Empty to indicate the "default" connector.</remarks>
-        bool IsConnector(string alias);
-
-        /// <summary>
-        /// Gets the value to be deployed from the control value as a string.
-        /// </summary>
-        /// <param name="gridControl">The control containing the value.</param>
-        /// <param name="property">The property where the control is located. Do not modify - only used for context</param>
-        /// <param name="dependencies">The dependencies of the property.</param>
-        /// <returns>The grid cell value to be deployed.</returns>
-        /// <remarks>Note that </remarks>
-        string GetValue(GridValue.GridControl gridControl, Property property, ICollection<ArtifactDependency> dependencies);
-
-        /// <summary>
-        /// Allows you to modify the value of a control being deployed.
-        /// </summary>
-        /// <param name="gridControl">The control being deployed.</param>
-        /// <param name="property">The property where the <paramref name="gridControl"/> is located. Do not modify - only used for context.</param>
-        /// <remarks>Follows the pattern of the property value connectors (<see cref="IValueConnector"/>). The SetValue method is used to modify the value of the <paramref name="gridControl"/>.</remarks>
-        /// <remarks>Note that only the <paramref name="gridControl"/> value should be modified - not the <paramref name="property"/>.</remarks>
-        /// <remarks>The <paramref name="property"/> should only be used to assist with context data relevant when setting the <paramref name="gridControl"/> value.</remarks>
-        void SetValue(GridValue.GridControl gridControl, Property property);
-    }
-}

src/Umbraco.Core/Deploy/IImageSourceParser.cs

@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Provides methods to parse image tag sources in property values.
-    /// </summary>
-    public interface IImageSourceParser
-    {
-        /// <summary>
-        /// Parses an Umbraco property value and produces an artifact property value.
-        /// </summary>
-        /// <param name="value">The property value.</param>
-        /// <param name="dependencies">A list of dependencies.</param>
-        /// <returns>The parsed value.</returns>
-        /// <remarks>Turns src="/media/..." into src="umb://media/..." and adds the corresponding udi to the dependencies.</remarks>
-        string ToArtifact(string value, ICollection<Udi> dependencies);
-
-        /// <summary>
-        /// Parses an artifact property value and produces an Umbraco property value.
-        /// </summary>
-        /// <param name="value">The artifact property value.</param>
-        /// <returns>The parsed value.</returns>
-        /// <remarks>Turns umb://media/... into /media/....</remarks>
-        string FromArtifact(string value);
-    }
-}

src/Umbraco.Core/Deploy/ILocalLinkParser.cs

@@ -1,27 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Provides methods to parse local link tags in property values.
-    /// </summary>
-    public interface ILocalLinkParser
-    {
-        /// <summary>
-        /// Parses an Umbraco property value and produces an artifact property value.
-        /// </summary>
-        /// <param name="value">The property value.</param>
-        /// <param name="dependencies">A list of dependencies.</param>
-        /// <returns>The parsed value.</returns>
-        /// <remarks>Turns {{localLink:1234}} into {{localLink:umb://{type}/{id}}} and adds the corresponding udi to the dependencies.</remarks>
-        string ToArtifact(string value, ICollection<Udi> dependencies);
-
-        /// <summary>
-        /// Parses an artifact property value and produces an Umbraco property value.
-        /// </summary>
-        /// <param name="value">The artifact property value.</param>
-        /// <returns>The parsed value.</returns>
-        /// <remarks>Turns {{localLink:umb://{type}/{id}}} into {{localLink:1234}}.</remarks>
-        string FromArtifact(string value);
-    }
-}

src/Umbraco.Core/Deploy/IMacroParser.cs

@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Deploy
-{
-    public interface IMacroParser
-    {
-        /// <summary>
-        /// Parses an Umbraco property value and produces an artifact property value.
-        /// </summary>
-        /// <param name="value">Property value.</param>
-        /// <param name="dependencies">A list of dependencies.</param>
-        /// <returns>Parsed value.</returns>
-        string ToArtifact(string value, ICollection<Udi> dependencies);
-
-        /// <summary>
-        /// Parses an artifact property value and produces an Umbraco property value.
-        /// </summary>
-        /// <param name="value">Artifact property value.</param>
-        /// <returns>Parsed value.</returns>
-        string FromArtifact(string value);
-
-        /// <summary>
-        /// Tries to replace the value of the attribute/parameter with a value containing a converted identifier.
-        /// </summary>
-        /// <param name="value">Value to attempt to convert</param>
-        /// <param name="editorAlias">Alias of the editor used for the parameter</param>
-        /// <param name="dependencies">Collection to add dependencies to when performing ToArtifact</param>
-        /// <param name="direction">Indicates which action is being performed (to or from artifact)</param>
-        /// <returns>Value with converted identifiers</returns>
-        string ReplaceAttributeValue(string value, string editorAlias, ICollection<Udi> dependencies, Direction direction);
-    }
-}

src/Umbraco.Core/Deploy/IPreValueConnector.cs

@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Defines methods that can convert a preValue to / from an environment-agnostic string.
-    /// </summary>
-    /// <remarks>PreValues may contain values such as content identifiers, that would be local
-    /// to one environment, and need to be converted in order to be deployed.</remarks>
-    public interface IPreValueConnector
-    {
-        /// <summary>
-        /// Gets the property editor aliases that the value converter supports by default.
-        /// </summary>
-        IEnumerable<string> PropertyEditorAliases { get; }
-
-        /// <summary>
-        /// Gets the environment-agnostic preValues corresponding to environment-specific preValues.
-        /// </summary>
-        /// <param name="preValues">The environment-specific preValues.</param>
-        /// <param name="dependencies">The dependencies.</param>
-        /// <returns></returns>
-        IDictionary<string, string> ConvertToDeploy(IDictionary<string, string> preValues, ICollection<ArtifactDependency> dependencies);
-
-        /// <summary>
-        /// Gets the environment-specific preValues corresponding to environment-agnostic preValues.
-        /// </summary>
-        /// <param name="preValues">The environment-agnostic preValues.</param>
-        /// <returns></returns>
-        IDictionary<string, string> ConvertToLocalEnvironment(IDictionary<string, string> preValues);
-    }
-}

src/Umbraco.Core/Deploy/IPrettyArtifact.cs

@@ -1,8 +0,0 @@
-namespace Umbraco.Core.Deploy
-{
-    public interface IPrettyArtifact
-    {
-        string Name { get; }
-        string Alias { get; }
-    }
-}

src/Umbraco.Core/Deploy/IServiceConnector.cs

@@ -1,86 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Umbraco.Core;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Connects to an Umbraco service.
-    /// </summary>
-    public interface IServiceConnector
-    {
-        /// <summary>
-        /// Gets an artifact.
-        /// </summary>
-        /// <param name="udi">The entity identifier of the artifact.</param>
-        /// <returns>The corresponding artifact, or null.</returns>
-        IArtifact GetArtifact(Udi udi);
-
-        /// <summary>
-        /// Gets an artifact.
-        /// </summary>
-        /// <param name="entity">The entity.</param>
-        /// <returns>The corresponding artifact.</returns>
-        IArtifact GetArtifact(object entity);
-
-        /// <summary>
-        /// Initializes processing for an artifact.
-        /// </summary>
-        /// <param name="art">The artifact.</param>
-        /// <param name="context">The deploy context.</param>
-        /// <returns>The mapped artifact.</returns>
-        ArtifactDeployState ProcessInit(IArtifact art, IDeployContext context);
-
-        /// <summary>
-        /// Processes an artifact.
-        /// </summary>
-        /// <param name="dart">The mapped artifact.</param>
-        /// <param name="context">The deploy context.</param>
-        /// <param name="pass">The processing pass number.</param>
-        void Process(ArtifactDeployState dart, IDeployContext context, int pass);
-
-        /// <summary>
-        /// Explodes a range into udis.
-        /// </summary>
-        /// <param name="range">The range.</param>
-        /// <param name="udis">The list of udis where to add the new udis.</param>
-        /// <remarks>Also, it's cool to have a method named Explode. Kaboom!</remarks>
-        void Explode(UdiRange range, List<Udi> udis);
-
-        /// <summary>
-        /// Gets a named range for a specified udi and selector.
-        /// </summary>
-        /// <param name="udi">The udi.</param>
-        /// <param name="selector">The selector.</param>
-        /// <returns>The named range for the specified udi and selector.</returns>
-        NamedUdiRange GetRange(Udi udi, string selector);
-
-        /// <summary>
-        /// Gets a named range for specified entity type, identifier and selector.
-        /// </summary>
-        /// <param name="entityType">The entity type.</param>
-        /// <param name="sid">The identifier.</param>
-        /// <param name="selector">The selector.</param>
-        /// <returns>The named range for the specified entity type, identifier and selector.</returns>
-        /// <remarks>
-        /// <para>This is temporary. At least we thought it would be, in sept. 2016. What day is it now?</para>
-        /// <para>At the moment our UI has a hard time returning proper udis, mainly because Core's tree do
-        /// not manage guids but only ints... so we have to provide a way to support it. The string id here
-        /// can be either a real string (for string udis) or an "integer as a string", using the value "-1" to
-        /// indicate the "root" i.e. an open udi.</para>
-        /// </remarks>
-        NamedUdiRange GetRange(string entityType, string sid, string selector);
-
-        /// <summary>
-        /// Compares two artifacts.
-        /// </summary>
-        /// <param name="art1">The first artifact.</param>
-        /// <param name="art2">The second artifact.</param>
-        /// <param name="differences">A collection of differences to append to, if not null.</param>
-        /// <returns>A boolean value indicating whether the artifacts are identical.</returns>
-        /// <remarks>ServiceConnectorBase{TArtifact} provides a very basic default implementation.</remarks>
-        bool Compare(IArtifact art1, IArtifact art2, ICollection<Difference> differences = null);
-    }
-
-}

src/Umbraco.Core/Deploy/IValueConnector.cs

@@ -1,35 +0,0 @@
-using System.Collections.Generic;
-using Umbraco.Core.Models;
-
-namespace Umbraco.Core.Deploy
-{
-    /// <summary>
-    /// Defines methods that can convert a property value to / from an environment-agnostic string.
-    /// </summary>
-    /// <remarks>Property values may contain values such as content identifiers, that would be local
-    /// to one environment, and need to be converted in order to be deployed. Connectors also deal
-    /// with serializing to / from string.</remarks>
-    public interface IValueConnector
-    {
-        /// <summary>
-        /// Gets the property editor aliases that the value converter supports by default.
-        /// </summary>
-        IEnumerable<string> PropertyEditorAliases { get; }
-
-        /// <summary>
-        /// Gets the deploy property corresponding to a content property.
-        /// </summary>
-        /// <param name="property">The content property.</param>
-        /// <param name="dependencies">The content dependencies.</param>
-        /// <returns>The deploy property value.</returns>
-        string GetValue(Property property, ICollection<ArtifactDependency> dependencies);
-
-        /// <summary>
-        /// Sets a content property value using a deploy property.
-        /// </summary>
-        /// <param name="content">The content item.</param>
-        /// <param name="alias">The property alias.</param>
-        /// <param name="value">The deploy property value.</param>
-        void SetValue(IContentBase content, string alias, string value);
-    }
-}

src/Umbraco.Core/Events/EventExtensions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 
 namespace Umbraco.Core.Events
 {
@@ -48,35 +47,5 @@ namespace Umbraco.Core.Events
 			if (eventHandler != null)
 				eventHandler(sender, args);
 		}
-
-        // moves the last handler that was added to an instance event, to first position
-	    public static void PromoteLastHandler(object sender, string eventName)
-	    {
-            var fieldInfo = sender.GetType().GetField(eventName, BindingFlags.Instance | BindingFlags.NonPublic);
-            if (fieldInfo == null) throw new InvalidOperationException("No event named " + eventName + ".");
-            PromoteLastHandler(sender, fieldInfo);
-        }
-
-        // moves the last handler that was added to a static event, to first position
-        public static void PromoteLastHandler<TSender>(string eventName)
-        {
-            var fieldInfo = typeof(TSender).GetField(eventName, BindingFlags.Static | BindingFlags.NonPublic);
-            if (fieldInfo == null) throw new InvalidOperationException("No event named " + eventName + ".");
-            PromoteLastHandler(null, fieldInfo);
-        }
-
-	    private static void PromoteLastHandler(object sender, FieldInfo fieldInfo)
-	    {
-            var d = fieldInfo.GetValue(sender) as Delegate;
-	        if (d == null) return;
-
-            var l = d.GetInvocationList();
-            var x = l[l.Length - 1];
-            for (var i = l.Length - 1; i > 0; i--)
-                l[i] = l[i - 1];
-            l[0] = x;
-
-            fieldInfo.SetValue(sender, Delegate.Combine(l));
-        }
-    }
+	}
 }

src/Umbraco.Core/Events/MigrationEventArgs.cs

@@ -31,13 +31,13 @@ namespace Umbraco.Core.Events
         [Obsolete("Use constructor accepting a product name instead.")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public MigrationEventArgs(IList<IMigration> eventObject, SemVersion configuredVersion, SemVersion targetVersion, bool canCancel)
-            : this(eventObject, null, configuredVersion, targetVersion, Constants.System.UmbracoMigrationName, canCancel)
+            : this(eventObject, null, configuredVersion, targetVersion, GlobalSettings.UmbracoMigrationName, canCancel)
         { }
 
         [Obsolete("Use constructor accepting SemVersion instances and a product name instead.")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public MigrationEventArgs(IList<IMigration> eventObject, Version configuredVersion, Version targetVersion, bool canCancel)
-			: this(eventObject, null, new SemVersion(configuredVersion), new SemVersion(targetVersion), Constants.System.UmbracoMigrationName, canCancel)
+			: this(eventObject, null, new SemVersion(configuredVersion), new SemVersion(targetVersion), GlobalSettings.UmbracoMigrationName, canCancel)
          { }
 
         /// <summary>
@@ -74,7 +74,7 @@ namespace Umbraco.Core.Events
             MigrationContext = migrationContext;
             ConfiguredSemVersion = configuredVersion;
             TargetSemVersion = targetVersion;
-            ProductName = Constants.System.UmbracoMigrationName;
+            ProductName = GlobalSettings.UmbracoMigrationName;
         }
 
         /// <summary>
@@ -97,13 +97,13 @@ namespace Umbraco.Core.Events
         [Obsolete("Use constructor accepting a product name instead.")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public MigrationEventArgs(IList<IMigration> eventObject, SemVersion configuredVersion, SemVersion targetVersion)
-            : this(eventObject, null, configuredVersion, targetVersion, Constants.System.UmbracoMigrationName, false)
+            : this(eventObject, null, configuredVersion, targetVersion, GlobalSettings.UmbracoMigrationName, false)
         { }
 
         [Obsolete("Use constructor accepting SemVersion instances and a product name instead.")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         public MigrationEventArgs(IList<IMigration> eventObject, Version configuredVersion, Version targetVersion)
-			: this(eventObject, null, new SemVersion(configuredVersion), new SemVersion(targetVersion), Constants.System.UmbracoMigrationName, false)
+			: this(eventObject, null, new SemVersion(configuredVersion), new SemVersion(targetVersion), GlobalSettings.UmbracoMigrationName, false)
 		{ }
 
 		/// <summary>
@@ -128,14 +128,8 @@ namespace Umbraco.Core.Events
             get { return TargetSemVersion.GetVersion(); }
         }
 
-        /// <summary>
-        /// Gets the origin version of the migration, i.e. the one that is currently installed.
-        /// </summary>
         public SemVersion ConfiguredSemVersion { get; private set; }
 
-        /// <summary>
-        /// Gets the target version of the migration.
-        /// </summary>
         public SemVersion TargetSemVersion { get; private set; }
 
         public string ProductName { get; private set; }

src/Umbraco.Core/GuidUdi.cs

@@ -1,83 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Represents a guid-based entity identifier.
-    /// </summary>
-    public class GuidUdi : Udi
-    {
-        /// <summary>
-        /// The guid part of the identifier.
-        /// </summary>
-        public Guid Guid { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the GuidUdi class with an entity type and a guid.
-        /// </summary>
-        /// <param name="entityType">The entity type part of the udi.</param>
-        /// <param name="guid">The guid part of the udi.</param>
-        public GuidUdi(string entityType, Guid guid)
-            : base(entityType, "umb://" + entityType + "/" + guid.ToString("N"))
-        {
-            Guid = guid;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the GuidUdi class with an uri value.
-        /// </summary>
-        /// <param name="uriValue">The uri value of the udi.</param>
-        public GuidUdi(Uri uriValue)
-            : base(uriValue)
-        {
-            Guid = Guid.Parse(uriValue.AbsolutePath.TrimStart('/'));
-        }
-
-        /// <summary>
-        /// Converts the string representation of an entity identifier into the equivalent GuidUdi instance.
-        /// </summary>
-        /// <param name="s">The string to convert.</param>
-        /// <returns>A GuidUdi instance that contains the value that was parsed.</returns>
-        public new static GuidUdi Parse(string s)
-        {
-            var udi = Udi.Parse(s);
-            if (!(udi is GuidUdi))
-                throw new FormatException("String \"" + s + "\" is not a guid entity id.");
-            return (GuidUdi)udi;
-        }
-
-        public static bool TryParse(string s, out GuidUdi udi)
-        {
-            Udi tmp;
-            udi = null;
-            if (!TryParse(s, out tmp)) return false;
-            udi = tmp as GuidUdi;
-            return udi != null;
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as GuidUdi;
-            if (other == null) return false;
-            return EntityType == other.EntityType && Guid == other.Guid;
-        }
-
-        public override int GetHashCode()
-        {
-            return base.GetHashCode();
-        }
-
-        /// <inheritdoc/>
-        public override bool IsRoot
-        {
-            get { return Guid == Guid.Empty; }
-        }
-
-        /// <inheritdoc/>
-        public GuidUdi EnsureClosed()
-        {
-            base.EnsureNotRoot();
-            return this;
-        }
-    }
-}

src/Umbraco.Core/ICompletable.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    public interface ICompletable : IDisposable
-    {
-        void Complete();
-    }
-}

src/Umbraco.Core/IO/FileSystemExtensions.cs

@@ -37,16 +37,15 @@ namespace Umbraco.Core.IO
             throw new ArgumentException("Retries must be greater than zero");
         }
 
-        // GetSize has been added to IFileSystem2 but not IFileSystem
         public static long GetSize(this IFileSystem fs, string path)
         {
-            var fs2 = fs as IFileSystem2;
-            if (fs2 != null) return fs2.GetSize(path);
-
-            // this is implementing GetSize for IFileSystem, the old way
             using (var file = fs.OpenFile(path))
             {
-                return file.Length;
+                using (var sr = new StreamReader(file))
+                {
+                    var str = sr.ReadToEnd();
+                    return str.Length;
+                }
             }
         }
 

src/Umbraco.Core/IO/FileSystemProviderManager.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
 using System.Reflection;
+using System.Text;
+using Umbraco.Core.CodeAnnotations;
 using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.IO
@@ -11,27 +13,8 @@ namespace Umbraco.Core.IO
     public class FileSystemProviderManager
     {
         private readonly FileSystemProvidersSection _config;
-        private readonly WeakSet<ShadowWrapper> _wrappers = new WeakSet<ShadowWrapper>();
 
-        // actual well-known filesystems returned by properties
-        private readonly IFileSystem2 _macroPartialFileSystem;
-        private readonly IFileSystem2 _partialViewsFileSystem;
-        private readonly IFileSystem2 _stylesheetsFileSystem;
-        private readonly IFileSystem2 _scriptsFileSystem;
-        private readonly IFileSystem2 _xsltFileSystem;
-        private readonly IFileSystem2 _masterPagesFileSystem;
-        private readonly IFileSystem2 _mvcViewsFileSystem;
-
-        // when shadowing is enabled, above filesystems, as wrappers
-        private readonly ShadowWrapper _macroPartialFileSystemWrapper;
-        private readonly ShadowWrapper _partialViewsFileSystemWrapper;
-        private readonly ShadowWrapper _stylesheetsFileSystemWrapper;
-        private readonly ShadowWrapper _scriptsFileSystemWrapper;
-        private readonly ShadowWrapper _xsltFileSystemWrapper;
-        private readonly ShadowWrapper _masterPagesFileSystemWrapper;
-        private readonly ShadowWrapper _mvcViewsFileSystemWrapper;
-
-        #region Singleton & Constructor
+        #region Singleton
 
         private static readonly FileSystemProviderManager Instance = new FileSystemProviderManager();
 
@@ -40,224 +23,109 @@ namespace Umbraco.Core.IO
             get { return Instance; }
         }
 
+        #endregion
+
+        #region Constructors
+
         internal FileSystemProviderManager()
         {
-            _config = (FileSystemProvidersSection) ConfigurationManager.GetSection("umbracoConfiguration/FileSystemProviders");
-
-            _macroPartialFileSystem = new PhysicalFileSystem(SystemDirectories.MacroPartials);
-            _partialViewsFileSystem = new PhysicalFileSystem(SystemDirectories.PartialViews);
-            _stylesheetsFileSystem = new PhysicalFileSystem(SystemDirectories.Css);
-            _scriptsFileSystem = new PhysicalFileSystem(SystemDirectories.Scripts);
-            _xsltFileSystem = new PhysicalFileSystem(SystemDirectories.Xslt);
-            _masterPagesFileSystem = new PhysicalFileSystem(SystemDirectories.Masterpages);
-            _mvcViewsFileSystem = new PhysicalFileSystem(SystemDirectories.MvcViews);
-
-            _macroPartialFileSystem = _macroPartialFileSystemWrapper = new ShadowWrapper(_macroPartialFileSystem, "Views/MacroPartials");
-            _partialViewsFileSystem = _partialViewsFileSystemWrapper = new ShadowWrapper(_partialViewsFileSystem, "Views/Partials");
-            _stylesheetsFileSystem = _stylesheetsFileSystemWrapper = new ShadowWrapper(_stylesheetsFileSystem, "css");
-            _scriptsFileSystem = _scriptsFileSystemWrapper = new ShadowWrapper(_scriptsFileSystem, "scripts");
-            _xsltFileSystem = _xsltFileSystemWrapper = new ShadowWrapper(_xsltFileSystem, "xslt");
-            _masterPagesFileSystem = _masterPagesFileSystemWrapper = new ShadowWrapper(_masterPagesFileSystem, "masterpages");
-            _mvcViewsFileSystem = _mvcViewsFileSystemWrapper = new ShadowWrapper(_mvcViewsFileSystem, "Views");
-
-            // filesystems obtained from GetFileSystemProvider are already wrapped and do not need to be wrapped again
-            MediaFileSystem = GetFileSystemProvider<MediaFileSystem>();
+            _config = (FileSystemProvidersSection)ConfigurationManager.GetSection("umbracoConfiguration/FileSystemProviders");
         }
 
         #endregion
 
-        #region Well-Known FileSystems
-
-        public IFileSystem2 MacroPartialsFileSystem { get { return _macroPartialFileSystem; } }
-        public IFileSystem2 PartialViewsFileSystem { get { return _partialViewsFileSystem; } }
-        public IFileSystem2 StylesheetsFileSystem { get { return _stylesheetsFileSystem; } }
-        public IFileSystem2 ScriptsFileSystem { get { return _scriptsFileSystem; } }
-        public IFileSystem2 XsltFileSystem { get { return _xsltFileSystem; } }
-        public IFileSystem2 MasterPagesFileSystem { get { return _masterPagesFileSystem; } }
-        public IFileSystem2 MvcViewsFileSystem { get { return _mvcViewsFileSystem; } }
-        public MediaFileSystem MediaFileSystem { get; private set; }
-
-        #endregion
-
-        #region Providers
-
-        /// <summary>
-        /// used to cache the lookup of how to construct this object so we don't have to reflect each time.
-        /// </summary>
-        private class ProviderConstructionInfo
+		/// <summary>
+		/// used to cache the lookup of how to construct this object so we don't have to reflect each time.
+		/// </summary>
+		private class ProviderConstructionInfo
 		{
 			public object[] Parameters { get; set; }
 			public ConstructorInfo Constructor { get; set; }
-			//public string ProviderAlias { get; set; }
+			public string ProviderAlias { get; set; }
 		}
 
 		private readonly ConcurrentDictionary<string, ProviderConstructionInfo> _providerLookup = new ConcurrentDictionary<string, ProviderConstructionInfo>();
-		private readonly ConcurrentDictionary<Type, string> _aliases = new ConcurrentDictionary<Type, string>(); 
+		private readonly ConcurrentDictionary<Type, string> _wrappedProviderLookup = new ConcurrentDictionary<Type, string>(); 
 
         /// <summary>
-        /// Gets an underlying (non-typed) filesystem supporting a strongly-typed filesystem.
+        /// Returns the underlying (non-typed) file system provider for the alias specified
         /// </summary>
-        /// <param name="alias">The alias of the strongly-typed filesystem.</param>
-        /// <returns>The non-typed filesystem supporting the strongly-typed filesystem with the specified alias.</returns>
-        /// <remarks>This method should not be used directly, used <see cref="GetFileSystemProvider{TFileSystem}"/> instead.</remarks>
+        /// <param name="alias"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// It is recommended to use the typed GetFileSystemProvider method instead to get a strongly typed provider instance.
+        /// </remarks>
         public IFileSystem GetUnderlyingFileSystemProvider(string alias)
         {
-			// either get the constructor info from cache or create it and add to cache
+			//either get the constructor info from cache or create it and add to cache
 	        var ctorInfo = _providerLookup.GetOrAdd(alias, s =>
 		        {
-                    // get config
 			        var providerConfig = _config.Providers[s];
 			        if (providerConfig == null)
-				        throw new ArgumentException(string.Format("No provider found with alias {0}.", s));
+				        throw new ArgumentException(string.Format("No provider found with the alias '{0}'", s));
 
-                    // get the filesystem type
 			        var providerType = Type.GetType(providerConfig.Type);
 			        if (providerType == null)
-				        throw new InvalidOperationException(string.Format("Could not find type {0}.", providerConfig.Type));
+				        throw new InvalidOperationException(string.Format("Could not find type '{0}'", providerConfig.Type));
 
-                    // ensure it implements IFileSystem
 			        if (providerType.IsAssignableFrom(typeof (IFileSystem)))
-				        throw new InvalidOperationException(string.Format("Type {0} does not implement IFileSystem.", providerType.FullName));
+				        throw new InvalidOperationException(string.Format("The type '{0}' does not implement IFileSystem", providerConfig.Type));
 
-                    // find a ctor matching the config parameters
 			        var paramCount = providerConfig.Parameters != null ? providerConfig.Parameters.Count : 0;
-			        var constructor = providerType.GetConstructors().SingleOrDefault(x 
-                        => x.GetParameters().Length == paramCount && x.GetParameters().All(y => providerConfig.Parameters.AllKeys.Contains(y.Name)));
+			        var constructor = providerType.GetConstructors()
+				        .SingleOrDefault(x => x.GetParameters().Count() == paramCount
+				                              && x.GetParameters().All(y => providerConfig.Parameters.AllKeys.Contains(y.Name)));
 			        if (constructor == null)
-				        throw new InvalidOperationException(string.Format("Type {0} has no ctor matching the {1} configuration parameter(s).", providerType.FullName, paramCount));
+				        throw new InvalidOperationException(string.Format("Could not find constructor for type '{0}' which accepts {1} parameters", providerConfig.Type, paramCount));
 
 			        var parameters = new object[paramCount];
-                    if (providerConfig.Parameters != null) // keeps ReSharper happy
-			            for (var i = 0; i < paramCount; i++)
-				            parameters[i] = providerConfig.Parameters[providerConfig.Parameters.AllKeys[i]].Value;			
+			        for (var i = 0; i < paramCount; i++)
+				        parameters[i] = providerConfig.Parameters[providerConfig.Parameters.AllKeys[i]].Value;			
 
-			        return new ProviderConstructionInfo
+			        //return the new constructor info class to cache so we don't have to do this again.
+			        return new ProviderConstructionInfo()
 				        {
 					        Constructor = constructor,
 					        Parameters = parameters,
-					        //ProviderAlias = s
+					        ProviderAlias = s
 				        };
 		        });
 
-            // create the fs and return
-			return (IFileSystem) ctorInfo.Constructor.Invoke(ctorInfo.Parameters);
-        }
-
-        /// <summary>
-        /// Gets a strongly-typed filesystem.
-        /// </summary>
-        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
-        /// <returns>A strongly-typed filesystem of the specified type.</returns>
-        public TFileSystem GetFileSystemProvider<TFileSystem>()
-			where TFileSystem : FileSystemWrapper
-        {
-            // deal with known types - avoid infinite loops!
-            if (typeof(TFileSystem) == typeof(MediaFileSystem) && MediaFileSystem != null)
-                return MediaFileSystem as TFileSystem; // else create and return
-
-			// get/cache the alias for the filesystem type
-	        var alias = _aliases.GetOrAdd(typeof (TFileSystem), fsType =>
-		        {
-					// validate the ctor
-					var constructor = fsType.GetConstructors().SingleOrDefault(x 
-                        => x.GetParameters().Length == 1 && TypeHelper.IsTypeAssignableFrom<IFileSystem>(x.GetParameters().Single().ParameterType));
-					if (constructor == null)
-						throw new InvalidOperationException("Type " + fsType.FullName + " must inherit from FileSystemWrapper and have a constructor that accepts one parameter of type " + typeof(IFileSystem).FullName + ".");
-
-                    // find the attribute and get the alias
-					var attr = (FileSystemProviderAttribute) fsType.GetCustomAttributes(typeof(FileSystemProviderAttribute), false).SingleOrDefault();
-					if (attr == null)
-						throw new InvalidOperationException("Type " + fsType.FullName + "is missing the required FileSystemProviderAttribute.");
-
-			        return attr.Alias;
-		        });
-
-            // gets the inner fs, create the strongly-typed fs wrapping the inner fs, register & return
-            // so we are double-wrapping here
-            // could be optimized by having FileSystemWrapper inherit from ShadowWrapper, maybe
-            var innerFs = GetUnderlyingFileSystemProvider(alias);
-            var shadowWrapper = new ShadowWrapper(innerFs, "typed/" + alias);
-	        var fs = (TFileSystem) Activator.CreateInstance(typeof (TFileSystem), innerFs);
-            _wrappers.Add(shadowWrapper); // keeping a weak reference to the wrapper
+			var fs = (IFileSystem)ctorInfo.Constructor.Invoke(ctorInfo.Parameters);
 	        return fs;
         }
 
-        #endregion
-
-        #region Shadow
-
-        // note
-        // shadowing is thread-safe, but entering and exiting shadow mode is not, and there is only one
-        // global shadow for the entire application, so great care should be taken to ensure that the
-        // application is *not* doing anything else when using a shadow.
-        // shadow applies to well-known filesystems *only* - at the moment, any other filesystem that would
-        // be created directly (via ctor) or via GetFileSystemProvider<T> is *not* shadowed.
-
-        // shadow must be enabled in an app event handler before anything else ie before any filesystem
-        // is actually created and used - after, it is too late - enabling shadow has a neglictible perfs
-        // impact.
-        // NO! by the time an app event handler is instanciated it is already too late, see note in ctor.
-        //internal void EnableShadow()
-        //{
-        //    if (_mvcViewsFileSystem != null) // test one of the fs...
-        //        throw new InvalidOperationException("Cannot enable shadow once filesystems have been created.");
-        //    _shadowEnabled = true;
-        //}
-
-        public ICompletable Shadow(Guid id)
+        /// <summary>
+        /// Returns the strongly typed file system provider
+        /// </summary>
+        /// <typeparam name="TProviderTypeFilter"></typeparam>
+        /// <returns></returns>
+        public TProviderTypeFilter GetFileSystemProvider<TProviderTypeFilter>()
+			where TProviderTypeFilter : FileSystemWrapper
         {
-            var typed = _wrappers.ToArray();
-            var wrappers = new ShadowWrapper[typed.Length + 7];
-            var i = 0;
-            while (i < typed.Length) wrappers[i] = typed[i++];
-            wrappers[i++] = _macroPartialFileSystemWrapper;
-            wrappers[i++] = _partialViewsFileSystemWrapper;
-            wrappers[i++] = _stylesheetsFileSystemWrapper;
-            wrappers[i++] = _scriptsFileSystemWrapper;
-            wrappers[i++] = _xsltFileSystemWrapper;
-            wrappers[i++] = _masterPagesFileSystemWrapper;
-            wrappers[i] = _mvcViewsFileSystemWrapper;
+			//get the alias for the type from cache or look it up and add it to the cache, then we don't have to reflect each time
+	        var alias = _wrappedProviderLookup.GetOrAdd(typeof (TProviderTypeFilter), fsType =>
+		        {
+					//validate the ctor
+					var constructor = fsType.GetConstructors()
+						.SingleOrDefault(x =>
+										 x.GetParameters().Count() == 1 && TypeHelper.IsTypeAssignableFrom<IFileSystem>(x.GetParameters().Single().ParameterType));
+					if (constructor == null)
+						throw new InvalidOperationException("The type of " + fsType + " must inherit from FileSystemWrapper and must have a constructor that accepts one parameter of type " + typeof(IFileSystem));
 
-            return ShadowFileSystemsScope.CreateScope(id, wrappers);
-        }
+					var attr =
+						(FileSystemProviderAttribute)fsType.GetCustomAttributes(typeof(FileSystemProviderAttribute), false).
+							SingleOrDefault();
 
-        #endregion
+					if (attr == null)
+						throw new InvalidOperationException(string.Format("The provider type filter '{0}' is missing the required FileSystemProviderAttribute", typeof(FileSystemProviderAttribute).FullName));
 
-        private class WeakSet<T>
-            where T : class
-        {
-            private readonly HashSet<WeakReference<T>> _set = new HashSet<WeakReference<T>>();
-
-            public void Add(T item)
-            {
-                lock (_set)
-                {
-                    _set.Add(new WeakReference<T>(item));
-                    CollectLocked();
-                }
-            }
-
-            public T[] ToArray()
-            {
-                lock (_set)
-                {
-                    CollectLocked();
-                    return _set.Select(x =>
-                    {
-                        T target;
-                        return x.TryGetTarget(out target) ? target : null;
-                    }).WhereNotNull().ToArray();
-                }
-            }
-
-            private void CollectLocked()
-            {
-                _set.RemoveWhere(x =>
-                {
-                    T target;
-                    return x.TryGetTarget(out target) == false;
-                });
-            }
+			        return attr.Alias;
+		        });
+			
+            var innerFs = GetUnderlyingFileSystemProvider(alias);
+	        var outputFs = Activator.CreateInstance(typeof (TProviderTypeFilter), innerFs);
+	        return (TProviderTypeFilter)outputFs;
         }
     }
 }

src/Umbraco.Core/IO/FileSystemWrapper.cs

@@ -14,100 +14,93 @@ namespace Umbraco.Core.IO
 	/// 
 	/// This abstract class just wraps the 'real' IFileSystem object passed in to its constructor.
 	/// </remarks>
-	public abstract class FileSystemWrapper : IFileSystem2
+	public abstract class FileSystemWrapper : IFileSystem
 	{
-	    protected FileSystemWrapper(IFileSystem wrapped)
+		private readonly IFileSystem _wrapped;
+
+		protected FileSystemWrapper(IFileSystem wrapped)
 		{
-			Wrapped = wrapped;
+			_wrapped = wrapped;
 		}
 
-        internal IFileSystem Wrapped { get; set; }
-
-	    public IEnumerable<string> GetDirectories(string path)
+		public IEnumerable<string> GetDirectories(string path)
 		{
-			return Wrapped.GetDirectories(path);
+			return _wrapped.GetDirectories(path);
 		}
 
 		public void DeleteDirectory(string path)
 		{
-			Wrapped.DeleteDirectory(path);
+			_wrapped.DeleteDirectory(path);
 		}
 
 		public void DeleteDirectory(string path, bool recursive)
 		{
-			Wrapped.DeleteDirectory(path, recursive);
+			_wrapped.DeleteDirectory(path, recursive);
 		}
 
 		public bool DirectoryExists(string path)
 		{
-			return Wrapped.DirectoryExists(path);
+			return _wrapped.DirectoryExists(path);
 		}
 
 		public void AddFile(string path, Stream stream)
 		{
-			Wrapped.AddFile(path, stream);
+			_wrapped.AddFile(path, stream);
 		}
 
-		public void AddFile(string path, Stream stream, bool overrideExisting)
+		public void AddFile(string path, Stream stream, bool overrideIfExists)
 		{
-			Wrapped.AddFile(path, stream, overrideExisting);
+			_wrapped.AddFile(path, stream, overrideIfExists);
 		}
 
 		public IEnumerable<string> GetFiles(string path)
 		{
-			return Wrapped.GetFiles(path);
+			return _wrapped.GetFiles(path);
 		}
 
 		public IEnumerable<string> GetFiles(string path, string filter)
 		{
-			return Wrapped.GetFiles(path, filter);
+			return _wrapped.GetFiles(path, filter);
 		}
 
 		public Stream OpenFile(string path)
 		{
-			return Wrapped.OpenFile(path);
+			return _wrapped.OpenFile(path);
 		}
 
 		public void DeleteFile(string path)
 		{
-			Wrapped.DeleteFile(path);
+			_wrapped.DeleteFile(path);
 		}
 
 		public bool FileExists(string path)
 		{
-			return Wrapped.FileExists(path);
+			return _wrapped.FileExists(path);
 		}
 
 		public string GetRelativePath(string fullPathOrUrl)
 		{
-			return Wrapped.GetRelativePath(fullPathOrUrl);
+			return _wrapped.GetRelativePath(fullPathOrUrl);
 		}
 
 		public string GetFullPath(string path)
 		{
-			return Wrapped.GetFullPath(path);
+			return _wrapped.GetFullPath(path);
 		}
 
 		public string GetUrl(string path)
 		{
-			return Wrapped.GetUrl(path);
+			return _wrapped.GetUrl(path);
 		}
 
 		public DateTimeOffset GetLastModified(string path)
 		{
-			return Wrapped.GetLastModified(path);
+			return _wrapped.GetLastModified(path);
 		}
 
 		public DateTimeOffset GetCreated(string path)
 		{
-			return Wrapped.GetCreated(path);
+			return _wrapped.GetCreated(path);
 		}
-
-        // explicitely implementing - not breaking
-	    long IFileSystem2.GetSize(string path)
-	    {
-	        var wrapped2 = Wrapped as IFileSystem2;
-	        return wrapped2 == null ? Wrapped.GetSize(path) : wrapped2.GetSize(path);
-	    }
-    }
+	}
 }

src/Umbraco.Core/IO/IFileSystem.cs

@@ -4,6 +4,9 @@ using System.IO;
 
 namespace Umbraco.Core.IO
 {
+    //TODO: There is no way to create a directory here without creating a file in a directory and then deleting it
+    //TODO: Should probably implement a rename?
+
 	public interface IFileSystem
     {
         IEnumerable<string> GetDirectories(string path);
@@ -13,7 +16,7 @@ namespace Umbraco.Core.IO
         void DeleteDirectory(string path, bool recursive);
 
         bool DirectoryExists(string path);
-
+        
         void AddFile(string path, Stream stream);
 
         void AddFile(string path, Stream stream, bool overrideIfExists);
@@ -28,6 +31,7 @@ namespace Umbraco.Core.IO
 
         bool FileExists(string path);
 
+
         string GetRelativePath(string fullPathOrUrl);
 
         string GetFullPath(string path);
@@ -38,17 +42,4 @@ namespace Umbraco.Core.IO
 
         DateTimeOffset GetCreated(string path);
     }
-
-    // this should be part of IFileSystem but we don't want to change the interface
-    public interface IFileSystem2 : IFileSystem
-    {
-        long GetSize(string path);
-
-        // TODO: implement these
-        //
-        //void CreateDirectory(string path);
-        //
-        //// move or rename, directory or file
-        //void Move(string source, string target);
-    }
 }

src/Umbraco.Core/IO/MediaFileSystem.cs

@@ -1,18 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Media;
-using Umbraco.Core.Media.Exif;
-using Umbraco.Core.Models;
 
 namespace Umbraco.Core.IO
 {
@@ -23,662 +14,59 @@ namespace Umbraco.Core.IO
 	public class MediaFileSystem : FileSystemWrapper
 	{
 	    private readonly IContentSection _contentConfig;
-        private readonly UploadAutoFillProperties _uploadAutoFillProperties;
 
-        private readonly object _folderCounterLock = new object();
-        private long _folderCounter;
-        private bool _folderCounterInitialized;
+	    public MediaFileSystem(IFileSystem wrapped)
+			: this(wrapped, UmbracoConfig.For.UmbracoSettings().Content)
+		{
+		}
 
-        private static readonly Dictionary<int, string> DefaultSizes = new Dictionary<int, string>
-        {
-            { 100, "thumb" },
-            { 500, "big-thumb" }
-        };
-
-        public MediaFileSystem(IFileSystem wrapped)
-			: this(wrapped, UmbracoConfig.For.UmbracoSettings().Content, ApplicationContext.Current.ProfilingLogger.Logger)
-		{ }
-
-        public MediaFileSystem(IFileSystem wrapped, IContentSection contentConfig, ILogger logger)
-            : base(wrapped)
+        public MediaFileSystem(IFileSystem wrapped, IContentSection contentConfig) : base(wrapped)
         {
             _contentConfig = contentConfig;
-            _uploadAutoFillProperties = new UploadAutoFillProperties(this, logger, contentConfig);
         }
 
-        internal UploadAutoFillProperties UploadAutoFillProperties { get { return _uploadAutoFillProperties; } }
-
-        // note - this is currently experimental / being developed
-        //public static bool UseTheNewMediaPathScheme { get; set; }
-        public const bool UseTheNewMediaPathScheme = false;
-
-        // none of the methods below are used in Core anymore
-
-        [Obsolete("This low-level method should NOT exist.")]
-        public string GetRelativePath(int propertyId, string fileName)
+	    public string GetRelativePath(int propertyId, string fileName)
 		{
-            var sep = _contentConfig.UploadAllowDirectories
+            var seperator = _contentConfig.UploadAllowDirectories
 				? Path.DirectorySeparatorChar
 				: '-';
 
-			return propertyId.ToString(CultureInfo.InvariantCulture) + sep + fileName;
+			return propertyId.ToString(CultureInfo.InvariantCulture) + seperator + fileName;
 		}
 
-        [Obsolete("This low-level method should NOT exist.", false)]
         public string GetRelativePath(string subfolder, string fileName)
         {
-            var sep = _contentConfig.UploadAllowDirectories
+            var seperator = _contentConfig.UploadAllowDirectories
                 ? Path.DirectorySeparatorChar
                 : '-';
 
-            return subfolder + sep + fileName;
+            return subfolder + seperator + fileName;
         }
 
-        #region Media Path
-
-        /// <summary>
-        /// Gets the file path of a media file.
-        /// </summary>
-        /// <param name="filename">The file name.</param>
-        /// <param name="cuid">The unique identifier of the content/media owning the file.</param>
-        /// <param name="puid">The unique identifier of the property type owning the file.</param>
-        /// <returns>The filesystem-relative path to the media file.</returns>
-        /// <remarks>With the old media path scheme, this CREATES a new media path each time it is invoked.</remarks>
-        public string GetMediaPath(string filename, Guid cuid, Guid puid)
-        {
-            filename = Path.GetFileName(filename);
-            if (filename == null) throw new ArgumentException("Cannot become a safe filename.", "filename");
-            filename = IOHelper.SafeFileName(filename.ToLowerInvariant());
-
-            string folder;
-            if (UseTheNewMediaPathScheme == false)
-            {
-                // old scheme: filepath is "<int>/<filename>" OR "<int>-<filename>"
-                // default media filesystem maps to "~/media/<filepath>"
-                folder = GetNextFolder();
-            }
-            else
-            {
-                // new scheme: path is "<cuid>-<puid>/<filename>" OR "<cuid>-<puid>-<filename>"
-                // default media filesystem maps to "~/media/<filepath>"
-                // assumes that cuid and puid keys can be trusted - and that a single property type
-                // for a single content cannot store two different files with the same name
-                folder = Combine(cuid, puid).ToHexString(/*'/', 2, 4*/); // could use ext to fragment path eg 12/e4/f2/...
-            }
-
-            var filepath = UmbracoConfig.For.UmbracoSettings().Content.UploadAllowDirectories
-                ? Path.Combine(folder, filename)
-                : folder + "-" + filename;
-
-            return filepath;
-        }
-
-        private static byte[] Combine(Guid guid1, Guid guid2)
-        {
-            var bytes1 = guid1.ToByteArray();
-            var bytes2 = guid2.ToByteArray();
-            var bytes = new byte[bytes1.Length];
-            for (var i = 0; i < bytes1.Length; i++)
-                bytes[i] = (byte)(bytes1[i] ^ bytes2[i]);
-            return bytes;
-        }
-
-        /// <summary>
-        /// Gets the file path of a media file.
-        /// </summary>
-        /// <param name="filename">The file name.</param>
-        /// <param name="prevpath">A previous file path.</param>
-        /// <param name="cuid">The unique identifier of the content/media owning the file.</param>
-        /// <param name="puid">The unique identifier of the property type owning the file.</param>
-        /// <returns>The filesystem-relative path to the media file.</returns>
-        /// <remarks>In the old, legacy, number-based scheme, we try to re-use the media folder
-        /// specified by <paramref name="prevpath"/>. Else, we CREATE a new one. Each time we are invoked.</remarks>
-        public string GetMediaPath(string filename, string prevpath, Guid cuid, Guid puid)
-        {
-            if (UseTheNewMediaPathScheme || string.IsNullOrWhiteSpace(prevpath))
-                return GetMediaPath(filename, cuid, puid);
-
-            filename = Path.GetFileName(filename);
-            if (filename == null) throw new ArgumentException("Cannot become a safe filename.", "filename");
-            filename = IOHelper.SafeFileName(filename.ToLowerInvariant());
-
-            // old scheme, with a previous path
-            // prevpath should be "<int>/<filename>" OR "<int>-<filename>"
-            // and we want to reuse the "<int>" part, so try to find it
-
-            var sep = UmbracoConfig.For.UmbracoSettings().Content.UploadAllowDirectories ? "/" : "-";
-            var pos = prevpath.IndexOf(sep, StringComparison.Ordinal);
-            var s = pos > 0 ? prevpath.Substring(0, pos) : null;
-            int ignored;
-
-            var folder = (pos > 0 && int.TryParse(s, out ignored)) ? s : GetNextFolder();
-
-            // ReSharper disable once AssignNullToNotNullAttribute
-            var filepath = UmbracoConfig.For.UmbracoSettings().Content.UploadAllowDirectories
-                ? Path.Combine(folder, filename)
-                : folder + "-" + filename;
-
-            return filepath;
-        }
-
-        /// <summary>
-        /// Gets the next media folder in the original number-based scheme.
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>Should be private, is internal for legacy FileHandlerData which is obsolete.</remarks>
-        internal string GetNextFolder()
-        {
-            EnsureFolderCounterIsInitialized();
-            return Interlocked.Increment(ref _folderCounter).ToString(CultureInfo.InvariantCulture);
-        }
-
-        private void EnsureFolderCounterIsInitialized()
-        {
-            lock (_folderCounterLock)
-            {
-                if (_folderCounterInitialized) return;
-
-                _folderCounter = 1000; // seed
-                var directories = GetDirectories("");
-                foreach (var directory in directories)
-                {
-                    long folderNumber;
-                    if (long.TryParse(directory, out folderNumber) && folderNumber > _folderCounter)
-                        _folderCounter = folderNumber;
-                }
-
-                // note: not multi-domains ie LB safe as another domain could create directories
-                // while we read and parse them - don't fix, move to new scheme eventually
-
-                _folderCounterInitialized = true;
-            }
-        }
-
-        #endregion
-
-        #region Associated Media Files
-
-        /// <summary>
-        /// Stores a media file.
-        /// </summary>
-        /// <param name="content">The content item owning the media file.</param>
-        /// <param name="propertyType">The property type owning the media file.</param>
-        /// <param name="filename">The media file name.</param>
-        /// <param name="filestream">A stream containing the media bytes.</param>
-        /// <param name="oldpath">An optional filesystem-relative filepath to the previous media file.</param>
-        /// <returns>The filesystem-relative filepath to the media file.</returns>
-        /// <remarks>
-        /// <para>The file is considered "owned" by the content/propertyType.</para>
-        /// <para>If an <paramref name="oldpath"/> is provided then that file (and thumbnails) is deleted
-        /// before the new file is saved, and depending on the media path scheme, the folder
-        /// may be reused for the new file.</para>
-        /// </remarks>
-        public string StoreFile(IContentBase content, PropertyType propertyType, string filename, Stream filestream, string oldpath)
-        {
-            if (content == null) throw new ArgumentNullException("content");
-            if (propertyType == null) throw new ArgumentNullException("propertyType");
-            if (string.IsNullOrWhiteSpace(filename)) throw new ArgumentException("Null or empty.", "filename");
-            if (filestream == null) throw new ArgumentNullException("filestream");
-
-            // clear the old file, if any
-            if (string.IsNullOrWhiteSpace(oldpath) == false)
-                DeleteFile(oldpath, true);
-
-            // get the filepath, store the data
-            // use oldpath as "prevpath" to try and reuse the folder, in original number-based scheme
-            var filepath = GetMediaPath(filename, oldpath, content.Key, propertyType.Key);
-            AddFile(filepath, filestream);
-            return filepath;
-        }
-
-        /// <summary>
-        /// Clears a media file.
-        /// </summary>
-        /// <param name="filepath">The filesystem-relative path to the media file.</param>
-        public new void DeleteFile(string filepath)
-        {
-            DeleteFile(filepath, true);
-        }
-
-        /// <summary>
-        /// Copies a media file.
-        /// </summary>
-        /// <param name="content">The content item owning the copy of the media file.</param>
-        /// <param name="propertyType">The property type owning the copy of the media file.</param>
-        /// <param name="sourcepath">The filesystem-relative path to the source media file.</param>
-        /// <returns>The filesystem-relative path to the copy of the media file.</returns>
-        public string CopyFile(IContentBase content, PropertyType propertyType, string sourcepath)
-        {
-            if (content == null) throw new ArgumentNullException("content");
-            if (propertyType == null) throw new ArgumentNullException("propertyType");
-            if (string.IsNullOrWhiteSpace(sourcepath)) throw new ArgumentException("Null or empty.", "sourcepath");
-
-            // ensure we have a file to copy
-            if (FileExists(sourcepath) == false) return null;
-
-            // get the filepath
-            var filename = Path.GetFileName(sourcepath);
-            var filepath = GetMediaPath(filename, content.Key, propertyType.Key);
-            this.CopyFile(sourcepath, filepath);
-            CopyThumbnails(sourcepath, filepath);
-            return filepath;
-        }
-
-        /// <summary>
-        /// Gets or creates a property for a content item.
-        /// </summary>
-        /// <param name="content">The content item.</param>
-        /// <param name="propertyTypeAlias">The property type alias.</param>
-        /// <returns>The property.</returns>
-        private static Property GetProperty(IContentBase content, string propertyTypeAlias)
-        {
-            var property = content.Properties.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
-            if (property != null) return property;
-
-            var propertyType = content.GetContentType().CompositionPropertyTypes
-                .FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
-            if (propertyType == null)
-                throw new Exception("No property type exists with alias " + propertyTypeAlias + ".");
-
-            property = new Property(propertyType);
-            content.Properties.Add(property);
-            return property;
-        }
-
-        public void SetUploadFile(IContentBase content, string propertyTypeAlias, string filename, Stream filestream)
-        {
-            var property = GetProperty(content, propertyTypeAlias);
-            var svalue = property.Value as string;
-            var oldpath = svalue == null ? null : GetRelativePath(svalue);
-            var filepath = StoreFile(content, property.PropertyType, filename, filestream, oldpath);
-            property.Value = GetUrl(filepath);
-            SetUploadFile(content, property, filepath, filestream);
-        }
-
-        public void SetUploadFile(IContentBase content, string propertyTypeAlias, string filepath)
-        {
-            var property = GetProperty(content, propertyTypeAlias);
-            var svalue = property.Value as string;
-            var oldpath = svalue == null ? null : GetRelativePath(svalue); // FIXME DELETE?
-            if (string.IsNullOrWhiteSpace(oldpath) == false && oldpath != filepath)
-                DeleteFile(oldpath, true);
-            property.Value = GetUrl(filepath);
-            using (var filestream = OpenFile(filepath))
-            {
-                SetUploadFile(content, property, filepath, filestream);
-            }
-        }
-
-        // sets a file for the FileUpload property editor
-        // ie generates thumbnails and populates autofill properties
-        private void SetUploadFile(IContentBase content, Property property, string filepath, Stream filestream)
-        {
-            // check if file is an image (and supports resizing and thumbnails etc)
-            var extension = Path.GetExtension(filepath);
-            var isImage = IsImageFile(extension);
-
-            // specific stuff for images (thumbnails etc)
-            if (isImage)
-            {
-                using (var image = Image.FromStream(filestream))
-                {
-                    // use one image for all
-                    GenerateThumbnails(image, filepath, property.PropertyType);
-                    _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream, image);
-                }
-            }
-            else
-            {
-                // will use filepath for extension, and filestream for length
-                _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream);
-            }
-        }
-
-        #endregion
-
-        #region Image
-
-        /// <summary>
-        /// Gets a value indicating whether the file extension corresponds to an image.
-        /// </summary>
-        /// <param name="extension">The file extension.</param>
-        /// <returns>A value indicating whether the file extension corresponds to an image.</returns>
-        public bool IsImageFile(string extension)
-        {
-            if (extension == null) return false;
-            extension = extension.TrimStart('.');
-            return UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.InvariantContains(extension);
-        }
-
-        /// <summary>
-        /// Gets the dimensions of an image.
-        /// </summary>
-        /// <param name="stream">A stream containing the image bytes.</param>
-        /// <returns>The dimension of the image.</returns>
-        /// <remarks>First try with EXIF as it is faster and does not load the entire image
-        /// in memory. Fallback to GDI which means loading the image in memory and thus
-        /// use potentially large amounts of memory.</remarks>
-        public Size GetDimensions(Stream stream)
-        {
-            //Try to load with exif
-            try
-            {
-                var jpgInfo = ImageFile.FromStream(stream);
-
-                if (jpgInfo.Format != ImageFileFormat.Unknown
-                    && jpgInfo.Properties.ContainsKey(ExifTag.PixelYDimension)
-                    && jpgInfo.Properties.ContainsKey(ExifTag.PixelXDimension))
-                {
-                    var height = Convert.ToInt32(jpgInfo.Properties[ExifTag.PixelYDimension].Value);
-                    var width = Convert.ToInt32(jpgInfo.Properties[ExifTag.PixelXDimension].Value);
-                    if (height > 0 && width > 0)
-                    {
-                        return new Size(width, height);
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                //We will just swallow, just means we can't read exif data, we don't want to log an error either
-            }
-
-            //we have no choice but to try to read in via GDI
-            using (var image = Image.FromStream(stream))
-            {
-
-                var fileWidth = image.Width;
-                var fileHeight = image.Height;
-                return new Size(fileWidth, fileHeight);
-            }
-        }
-
-        #endregion
-
-        #region Manage thumbnails
-
-        // note: this does not find 'custom' thumbnails?
-        // will find _thumb and _big-thumb but NOT _custom?
-        public IEnumerable<string> GetThumbnails(string path)
-        {
-            var parentDirectory = Path.GetDirectoryName(path);
-            var extension = Path.GetExtension(path);
-
-            return GetFiles(parentDirectory)
-                .Where(x => x.StartsWith(path.TrimEnd(extension) + "_thumb") || x.StartsWith(path.TrimEnd(extension) + "_big-thumb"))
-                .ToList();
-        }
-
-        public void DeleteFile(string path, bool deleteThumbnails)
-        {
-            base.DeleteFile(path);
-
-            if (deleteThumbnails == false)
-                return;
-
-            DeleteThumbnails(path);
-        }
-
-        public void DeleteThumbnails(string path)
-        {
-            GetThumbnails(path)
-                .ForEach(x => base.DeleteFile(x));
-        }
-
-        public void CopyThumbnails(string sourcePath, string targetPath)
-        {
-            var targetPathBase = Path.GetDirectoryName(targetPath) ?? "";
-            foreach (var sourceThumbPath in GetThumbnails(sourcePath))
-            {
-                var sourceThumbFilename = Path.GetFileName(sourceThumbPath) ?? "";
-                var targetThumbPath = Path.Combine(targetPathBase, sourceThumbFilename);
-                this.CopyFile(sourceThumbPath, targetThumbPath);
-            }
-        }
-
-        #endregion
-
-        #region GenerateThumbnails
-
-        public IEnumerable<ResizedImage> GenerateThumbnails(
-            Image image,
-            string filepath,
-            string preValue)
-        {
-            if (string.IsNullOrWhiteSpace(preValue))
-                return GenerateThumbnails(image, filepath);
-
-            var additionalSizes = new List<int>();
-            var sep = preValue.Contains(",") ? "," : ";";
-            var values = preValue.Split(new[] { sep }, StringSplitOptions.RemoveEmptyEntries);
-            foreach (var value in values)
-            {
-                int size;
-                if (int.TryParse(value, out size))
-                    additionalSizes.Add(size);
-            }
-
-            return GenerateThumbnails(image, filepath, additionalSizes);
-        }
-
-        public IEnumerable<ResizedImage> GenerateThumbnails(
-            Image image,
-            string filepath,
-            IEnumerable<int> additionalSizes = null)
-        {
-            var w = image.Width;
-            var h = image.Height;
-
-            var sizes = additionalSizes == null ? DefaultSizes.Keys : DefaultSizes.Keys.Concat(additionalSizes);
-
-            // start with default sizes,
-            // add additional sizes,
-            // filter out duplicates,
-            // filter out those that would be larger that the original image
-            // and create the thumbnail
-            return sizes
-                .Distinct()
-                .Where(x => w >= x && h >= x)
-                .Select(x => GenerateResized(image, filepath, DefaultSizes.ContainsKey(x) ? DefaultSizes[x] : "", x))
-                .ToList(); // now
-        }
-
-        public IEnumerable<ResizedImage> GenerateThumbnails(
-            Stream filestream,
-            string filepath,
-            PropertyType propertyType)
-        {
-            // get the original image from the original stream
-            if (filestream.CanSeek) filestream.Seek(0, 0); // fixme - what if we cannot seek?
-            using (var image = Image.FromStream(filestream))
-            {
-                return GenerateThumbnails(image, filepath, propertyType);
-            }
-        }
-
-        public IEnumerable<ResizedImage> GenerateThumbnails(
-            Image image,
-            string filepath,
-            PropertyType propertyType)
-        {
-            // if the editor is an upload field, check for additional thumbnail sizes
-            // that can be defined in the prevalue for the property data type. otherwise,
-            // just use the default sizes.
-            var sizes = propertyType.PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias
-                ? ApplicationContext.Current.Services.DataTypeService
-                    .GetPreValuesByDataTypeId(propertyType.DataTypeDefinitionId)
-                    .FirstOrDefault()
-                : string.Empty;
-
-            return GenerateThumbnails(image, filepath, sizes);
-        }
-
-        #endregion
-
-        #region GenerateResized - Generate at resized filepath derived from origin filepath
-
-        public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int maxWidthHeight)
-        {
-            return GenerateResized(originImage, originFilepath, sizeName, maxWidthHeight, -1, -1);
-        }
-
-        public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int fixedWidth, int fixedHeight)
-        {
-            return GenerateResized(originImage, originFilepath, sizeName, -1, fixedWidth, fixedHeight);
-        }
-
-        public ResizedImage GenerateResized(Image originImage, string originFilepath, string sizeName, int maxWidthHeight, int fixedWidth, int fixedHeight)
-        {
-            if (string.IsNullOrWhiteSpace(sizeName))
-                sizeName = "UMBRACOSYSTHUMBNAIL";
-            var extension = Path.GetExtension(originFilepath) ?? string.Empty;
-            var filebase = originFilepath.TrimEnd(extension);
-            var resizedFilepath = filebase + "_" + sizeName + extension;
-
-            return GenerateResizedAt(originImage, resizedFilepath, maxWidthHeight, fixedWidth, fixedHeight);
-        }
-
-        #endregion
-
-        #region GenerateResizedAt - Generate at specified resized filepath
-
-        public ResizedImage GenerateResizedAt(Image originImage, string resizedFilepath, int maxWidthHeight)
-        {
-            return GenerateResizedAt(originImage, resizedFilepath, maxWidthHeight, -1, -1);
-        }
-
-        public ResizedImage GenerateResizedAt(Image originImage, int fixedWidth, int fixedHeight, string resizedFilepath)
-        {
-            return GenerateResizedAt(originImage, resizedFilepath, -1, fixedWidth, fixedHeight);
-        }
-
-        public ResizedImage GenerateResizedAt(Image originImage, string resizedFilepath, int maxWidthHeight, int fixedWidth, int fixedHeight)
-        {
-            // target dimensions
-            int width, height;
-
-            // if maxWidthHeight then get ratio
-            if (maxWidthHeight > 0)
-            {
-                var fx = (float)originImage.Size.Width / maxWidthHeight;
-                var fy = (float)originImage.Size.Height / maxWidthHeight;
-                var f = Math.Max(fx, fy); // fit in thumbnail size
-                width = (int)Math.Round(originImage.Size.Width / f);
-                height = (int)Math.Round(originImage.Size.Height / f);
-                if (width == 0) width = 1;
-                if (height == 0) height = 1;
-            }
-            else if (fixedWidth > 0 && fixedHeight > 0)
-            {
-                width = fixedWidth;
-                height = fixedHeight;
-            }
-            else
-            {
-                width = height = 1;
-            }
-
-            // create new image with best quality settings
-            using (var bitmap = new Bitmap(width, height))
-            using (var graphics = Graphics.FromImage(bitmap))
-            {
-                // if the image size is rather large we cannot use the best quality interpolation mode
-                // because we'll get out of mem exceptions. So we detect how big the image is and use
-                // the mid quality interpolation mode when the image size exceeds our max limit.
-                graphics.InterpolationMode = originImage.Width > 5000 || originImage.Height > 5000
-                    ? InterpolationMode.Bilinear // mid quality
-                    : InterpolationMode.HighQualityBicubic; // best quality
-
-                // everything else is best-quality
-                graphics.SmoothingMode = SmoothingMode.HighQuality;
-                graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
-                graphics.CompositingQuality = CompositingQuality.HighQuality;
-
-                // copy the old image to the new and resize
-                var rect = new Rectangle(0, 0, width, height);
-                graphics.DrawImage(originImage, rect, 0, 0, originImage.Width, originImage.Height, GraphicsUnit.Pixel);
-
-                // copy metadata
-                // fixme - er... no?
-
-                // get an encoder - based upon the file type
-                var extension = (Path.GetExtension(resizedFilepath) ?? "").TrimStart('.').ToLowerInvariant();
-                var encoders = ImageCodecInfo.GetImageEncoders();
-                ImageCodecInfo encoder;
-                switch (extension)
-                {
-                    case "png":
-                        encoder = encoders.Single(t => t.MimeType.Equals("image/png"));
-                        break;
-                    case "gif":
-                        encoder = encoders.Single(t => t.MimeType.Equals("image/gif"));
-                        break;
-                    case "tif":
-                    case "tiff":
-                        encoder = encoders.Single(t => t.MimeType.Equals("image/tiff"));
-                        break;
-                    case "bmp":
-                        encoder = encoders.Single(t => t.MimeType.Equals("image/bmp"));
-                        break;
-                    // TODO: this is dirty, defaulting to jpg but the return value of this thing is used all over the
-                    // place so left it here, but it needs to not set a codec if it doesn't know which one to pick
-                    // Note: when fixing this: both .jpg and .jpeg should be handled as extensions
-                    default:
-                        encoder = encoders.Single(t => t.MimeType.Equals("image/jpeg"));
-                        break;
-                }
-
-                // set compresion ratio to 90%
-                var encoderParams = new EncoderParameters();
-                encoderParams.Param[0] = new EncoderParameter(Encoder.Quality, 90L);
-
-                // save the new image
-                using (var stream = new MemoryStream())
-                {
-                    bitmap.Save(stream, encoder, encoderParams);
-                    stream.Seek(0, 0);
-                    if (resizedFilepath.Contains("UMBRACOSYSTHUMBNAIL"))
-                    {
-                        var filepath = resizedFilepath.Replace("UMBRACOSYSTHUMBNAIL", maxWidthHeight.ToInvariantString());
-                        AddFile(filepath, stream);
-                        if (extension != "jpg")
-                        {
-                            filepath = filepath.TrimEnd(extension) + "jpg";
-                            stream.Seek(0, 0);
-                            AddFile(filepath, stream);
-                        }
-                        // TODO: Remove this, this is ONLY here for backwards compatibility but it is essentially completely unusable see U4-5385
-                        stream.Seek(0, 0);
-                        resizedFilepath = resizedFilepath.Replace("UMBRACOSYSTHUMBNAIL", width + "x" + height);
-                    }
-
-                    AddFile(resizedFilepath, stream);
-                }
-
-                return new ResizedImage(resizedFilepath, width, height);
-            }
-        }
-
-        #endregion
-
-        #region Inner classes
-
-        public class ResizedImage
-        {
-            public ResizedImage()
-            { }
-
-            public ResizedImage(string filepath, int width, int height)
-            {
-                Filepath = filepath;
-                Width = width;
-                Height = height;
-            }
-
-            public string Filepath { get; set; }
-            public int Width { get; set; }
-            public int Height { get; set; }
-        }
-
-        #endregion
-    }
+		public IEnumerable<string> GetThumbnails(string path)
+		{
+			var parentDirectory = Path.GetDirectoryName(path);
+			var extension = Path.GetExtension(path);
+
+			return GetFiles(parentDirectory)
+				.Where(x => x.StartsWith(path.TrimEnd(extension) + "_thumb") || x.StartsWith(path.TrimEnd(extension) + "_big-thumb"))
+				.ToList();
+		}
+
+		public void DeleteFile(string path, bool deleteThumbnails)
+		{
+			DeleteFile(path);
+
+			if (deleteThumbnails == false)
+				return;
+
+			DeleteThumbnails(path);
+		}
+
+		public void DeleteThumbnails(string path)
+		{
+			GetThumbnails(path)
+				.ForEach(DeleteFile);
+		}
+	}
 }

src/Umbraco.Core/IO/PhysicalFileSystem.cs

@@ -6,32 +6,29 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.IO
 {
-    public class PhysicalFileSystem : IFileSystem2
+    public class PhysicalFileSystem : IFileSystem
     {
         // the rooted, filesystem path, using directory separator chars, NOT ending with a separator
         // eg "c:" or "c:\path\to\site" or "\\server\path"
         private readonly string _rootPath;
 
-        // _rootPath, but with separators replaced by forward-slashes
-        // eg "c:" or "c:/path/to/site" or "//server/path"
-        // (is used in GetRelativePath)
-        private readonly string _rootPathFwd;
-
-        // the relative url, using url separator chars, NOT ending with a separator
-        // eg "" or "/Views" or "/Media" or "/<vpath>/Media" in case of a virtual path
+        // the ??? url, using url separator chars, NOT ending with a separator
+        // eg "" (?) or "/Scripts" or ???
         private readonly string _rootUrl;
 
-        // virtualRoot should be "~/path/to/root" eg "~/Views"
-        // the "~/" is mandatory.
         public PhysicalFileSystem(string virtualRoot)
         {
 	        if (virtualRoot == null) throw new ArgumentNullException("virtualRoot");
 			if (virtualRoot.StartsWith("~/") == false)
 				throw new ArgumentException("The virtualRoot argument must be a virtual path and start with '~/'");
 
-            _rootPath = EnsureDirectorySeparatorChar(IOHelper.MapPath(virtualRoot)).TrimEnd(Path.DirectorySeparatorChar);
-            _rootPathFwd = EnsureUrlSeparatorChar(_rootPath);
-            _rootUrl = EnsureUrlSeparatorChar(IOHelper.ResolveUrl(virtualRoot)).TrimEnd('/');
+            _rootPath = IOHelper.MapPath(virtualRoot);
+            _rootPath = EnsureDirectorySeparatorChar(_rootPath);
+            _rootPath = _rootPath.TrimEnd(Path.DirectorySeparatorChar);
+
+            _rootUrl = IOHelper.ResolveUrl(virtualRoot);
+            _rootUrl = EnsureUrlSeparatorChar(_rootUrl);
+            _rootUrl = _rootUrl.TrimEnd('/');
         }
 
         public PhysicalFileSystem(string rootPath, string rootUrl)
@@ -46,24 +43,22 @@ namespace Umbraco.Core.IO
 				throw new ArgumentException("The rootPath argument cannot be a virtual path and cannot start with '~/'");
 
             // rootPath should be... rooted, as in, it's a root path!
+            // but the test suite App.config cannot really "root" anything so we'll have to do it here
+
+            //var localRoot = AppDomain.CurrentDomain.BaseDirectory;
+            var localRoot = IOHelper.GetRootDirectorySafe();
             if (Path.IsPathRooted(rootPath) == false)
             {
-                // but the test suite App.config cannot really "root" anything so we have to do it here
-                var localRoot = IOHelper.GetRootDirectorySafe();
                 rootPath = Path.Combine(localRoot, rootPath);
             }
 
-            _rootPath = EnsureDirectorySeparatorChar(rootPath).TrimEnd(Path.DirectorySeparatorChar);
-            _rootPathFwd = EnsureUrlSeparatorChar(_rootPath);
-            _rootUrl = EnsureUrlSeparatorChar(rootUrl).TrimEnd('/');
+            rootPath = EnsureDirectorySeparatorChar(rootPath);
+            rootUrl = EnsureUrlSeparatorChar(rootUrl);
+
+            _rootPath = rootPath.TrimEnd(Path.DirectorySeparatorChar);
+            _rootUrl = rootUrl.TrimEnd('/');
         }
 
-        /// <summary>
-        /// Gets directories in a directory.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path to the directory.</param>
-        /// <returns>The filesystem-relative path to the directories in the directory.</returns>
-        /// <remarks>Filesystem-relative paths use forward-slashes as directory separators.</remarks>
         public IEnumerable<string> GetDirectories(string path)
         {
             var fullPath = GetFullPath(path);
@@ -85,20 +80,11 @@ namespace Umbraco.Core.IO
             return Enumerable.Empty<string>();
         }
 
-        /// <summary>
-        /// Deletes a directory.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path of the directory.</param>
         public void DeleteDirectory(string path)
         {
             DeleteDirectory(path, false);
         }
 
-        /// <summary>
-        /// Deletes a directory.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path of the directory.</param>
-        /// <param name="recursive">A value indicating whether to recursively delete sub-directories.</param>
         public void DeleteDirectory(string path, bool recursive)
         {
             var fullPath = GetFullPath(path);
@@ -115,71 +101,38 @@ namespace Umbraco.Core.IO
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether a directory exists.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path of the directory.</param>
-        /// <returns>A value indicating whether a directory exists.</returns>
         public bool DirectoryExists(string path)
         {
             var fullPath = GetFullPath(path);
             return Directory.Exists(fullPath);
         }
 
-        /// <summary>
-        /// Saves a file.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path of the file.</param>
-        /// <param name="stream">A stream containing the file data.</param>
-        /// <remarks>Overrides the existing file, if any.</remarks>
         public void AddFile(string path, Stream stream)
         {
             AddFile(path, stream, true);
         }
 
-        /// <summary>
-        /// Saves a file.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path of the file.</param>
-        /// <param name="stream">A stream containing the file data.</param>
-        /// <param name="overrideExisting">A value indicating whether to override the existing file, if any.</param>
-        /// <remarks>If a file exists and <paramref name="overrideExisting"/> is false, an exception is thrown.</remarks>
-        public void AddFile(string path, Stream stream, bool overrideExisting)
+        public void AddFile(string path, Stream stream, bool overrideIfExists)
         {
             var fullPath = GetFullPath(path);
             var exists = File.Exists(fullPath);
-            if (exists && overrideExisting == false)
+            if (exists && overrideIfExists == false) 
                 throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
 
-            var directory = Path.GetDirectoryName(fullPath);
-            if (directory == null) throw new InvalidOperationException("Could not get directory.");
-            Directory.CreateDirectory(directory); // ensure it exists
+            Directory.CreateDirectory(Path.GetDirectoryName(fullPath)); // ensure it exists
 
-            if (stream.CanSeek) // fixme - what else?
+            if (stream.CanSeek)
                 stream.Seek(0, 0);
 
-            using (var destination = (Stream) File.Create(fullPath))
+            using (var destination = (Stream)File.Create(fullPath))
                 stream.CopyTo(destination);
         }
 
-        /// <summary>
-        /// Gets files in a directory.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path of the directory.</param>
-        /// <returns>The filesystem-relative path to the files in the directory.</returns>
-        /// <remarks>Filesystem-relative paths use forward-slashes as directory separators.</remarks>
         public IEnumerable<string> GetFiles(string path)
         {
             return GetFiles(path, "*.*");
         }
 
-        /// <summary>
-        /// Gets files in a directory.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path of the directory.</param>
-        /// <param name="filter">A filter.</param>
-        /// <returns>The filesystem-relative path to the matching files in the directory.</returns>
-        /// <remarks>Filesystem-relative paths use forward-slashes as directory separators.</remarks>
         public IEnumerable<string> GetFiles(string path, string filter)
         {
             var fullPath = GetFullPath(path);
@@ -201,21 +154,12 @@ namespace Umbraco.Core.IO
             return Enumerable.Empty<string>();
         }
 
-        /// <summary>
-        /// Opens a file.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path to the file.</param>
-        /// <returns></returns>
         public Stream OpenFile(string path)
         {
             var fullPath = GetFullPath(path);
             return File.OpenRead(fullPath);
         }
 
-        /// <summary>
-        /// Deletes a file.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path to the file.</param>
         public void DeleteFile(string path)
         {
             var fullPath = GetFullPath(path);
@@ -232,53 +176,52 @@ namespace Umbraco.Core.IO
             }
         }
 
-        /// <summary>
-        /// Gets a value indicating whether a file exists.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path to the file.</param>
-        /// <returns>A value indicating whether the file exists.</returns>
         public bool FileExists(string path)
         {
             var fullpath = GetFullPath(path);
             return File.Exists(fullpath);
         }
 
+        // beware, many things depend on how the GetRelative/AbsolutePath methods work!
+
         /// <summary>
-        /// Gets the filesystem-relative path of a full path or of an url.
+        /// Gets the relative path.
         /// </summary>
         /// <param name="fullPathOrUrl">The full path or url.</param>
         /// <returns>The path, relative to this filesystem's root.</returns>
         /// <remarks>
         /// <para>The relative path is relative to this filesystem's root, not starting with any
-        /// directory separator. All separators are forward-slashes.</para>
+        /// directory separator. If input was recognized as a url (path), then output uses url (path) separator
+        /// chars.</para>
         /// </remarks>
         public string GetRelativePath(string fullPathOrUrl)
         {
             // test url
             var path = fullPathOrUrl.Replace('\\', '/'); // ensure url separator char
 
-            // if it starts with the root url, strip it and trim the starting slash to make it relative
-            // eg "/Media/1234/img.jpg" => "1234/img.jpg"
-            if (IOHelper.PathStartsWith(path, _rootUrl, '/'))
-                return path.Substring(_rootUrl.Length).TrimStart('/');
+            if (IOHelper.PathStartsWith(path, _rootUrl, '/')) // if it starts with the root url...
+                return path.Substring(_rootUrl.Length) // strip it
+                            .TrimStart('/'); // it's relative
 
-            // if it starts with the root path, strip it and trim the starting slash to make it relative
-            // eg "c:/websites/test/root/Media/1234/img.jpg" => "1234/img.jpg"
-            if (IOHelper.PathStartsWith(path, _rootPathFwd, '/'))
-                return path.Substring(_rootPathFwd.Length).TrimStart('/');
+            // test path
+            path = EnsureDirectorySeparatorChar(fullPathOrUrl);
 
-            // unchanged - what else?
-            return path;
+            if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar)) // if it starts with the root path
+                return path.Substring(_rootPath.Length) // strip it
+                            .TrimStart(Path.DirectorySeparatorChar); // it's relative
+
+            // unchanged - including separators
+            return fullPathOrUrl;
         }
 
         /// <summary>
         /// Gets the full path.
         /// </summary>
-        /// <param name="path">The full or filesystem-relative path.</param>
+        /// <param name="path">The full or relative path.</param>
         /// <returns>The full path.</returns>
         /// <remarks>
         /// <para>On the physical filesystem, the full path is the rooted (ie non-relative), safe (ie within this
-        /// filesystem's root) path. All separators are Path.DirectorySeparatorChar.</para>
+        /// filesystem's root) path. All separators are converted to Path.DirectorySeparatorChar.</para>
         /// </remarks>
         public string GetFullPath(string path)
         {
@@ -286,82 +229,49 @@ namespace Umbraco.Core.IO
             var opath = path;
             path = EnsureDirectorySeparatorChar(path);
 
-            // fixme - this part should go!
             // not sure what we are doing here - so if input starts with a (back) slash,
             // we assume it's not a FS relative path and we try to convert it... but it
             // really makes little sense?
             if (path.StartsWith(Path.DirectorySeparatorChar.ToString()))
                 path = GetRelativePath(path);
 
-            // if not already rooted, combine with the root path
-            if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar) == false)
-                path = Path.Combine(_rootPath, path);
+            // if already a full path, return
+            if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
+                return path;
 
-            // sanitize - GetFullPath will take care of any relative
+            // else combine and sanitize, ie GetFullPath will take care of any relative
             // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
             // if the combined path reaches illegal parts of the filesystem
-            path = Path.GetFullPath(path);
+            var fpath = Path.Combine(_rootPath, path);
+            fpath = Path.GetFullPath(fpath);
 
             // at that point, path is within legal parts of the filesystem, ie we have
             // permissions to reach that path, but it may nevertheless be outside of
             // our root path, due to relative segments, so better check
-            if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
-                return path;
+            if (IOHelper.PathStartsWith(fpath, _rootPath, Path.DirectorySeparatorChar))
+                return fpath;
 
-            // nothing prevents us to reach the file, security-wise, yet it is outside
-            // this filesystem's root - throw
             throw new FileSecurityException("File '" + opath + "' is outside this filesystem's root.");
         }
 
-        /// <summary>
-        /// Gets the url.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path.</param>
-        /// <returns>The url.</returns>
-        /// <remarks>All separators are forward-slashes.</remarks>
         public string GetUrl(string path)
         {
             path = EnsureUrlSeparatorChar(path).Trim('/');
             return _rootUrl + "/" + path;
         }
 
-        /// <summary>
-        /// Gets the last-modified date of a directory or file.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path to the directory or the file.</param>
-        /// <returns>The last modified date of the directory or the file.</returns>
         public DateTimeOffset GetLastModified(string path)
         {
-            var fullpath = GetFullPath(path);
-            return DirectoryExists(fullpath)
-                ? new DirectoryInfo(fullpath).LastWriteTimeUtc
-                : new FileInfo(fullpath).LastWriteTimeUtc;
+            return DirectoryExists(path) 
+                ? new DirectoryInfo(GetFullPath(path)).LastWriteTimeUtc 
+                : new FileInfo(GetFullPath(path)).LastWriteTimeUtc;
         }
 
-        /// <summary>
-        /// Gets the created date of a directory or file.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path to the directory or the file.</param>
-        /// <returns>The created date of the directory or the file.</returns>
         public DateTimeOffset GetCreated(string path)
         {
-            var fullpath = GetFullPath(path);
-            return DirectoryExists(fullpath)
-                ? Directory.GetCreationTimeUtc(fullpath)
-                : File.GetCreationTimeUtc(fullpath);
-        }
-
-        /// <summary>
-        /// Gets the size of a file.
-        /// </summary>
-        /// <param name="path">The filesystem-relative path to the file.</param>
-        /// <returns>The file of the size, in bytes.</returns>
-        /// <remarks>If the file does not exist, returns -1.</remarks>
-        public long GetSize(string path)
-        {
-            var fullPath = GetFullPath(path);
-            var file = new FileInfo(fullPath);
-            return file.Exists ? file.Length : -1;
+            return DirectoryExists(path) 
+                ? Directory.GetCreationTimeUtc(GetFullPath(path)) 
+                : File.GetCreationTimeUtc(GetFullPath(path));
         }
 
         #region Helper Methods

src/Umbraco.Core/IO/ResizedImage.cs

@@ -0,0 +1,20 @@
+namespace Umbraco.Core.IO
+{
+    internal class ResizedImage
+    {
+        public ResizedImage()
+        {
+        }
+
+        public ResizedImage(int width, int height, string fileName)
+        {
+            Width = width;
+            Height = height;
+            FileName = fileName;
+        }
+
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public string FileName { get; set; }
+    }
+}

src/Umbraco.Core/IO/ShadowFileSystem.cs

@@ -1,286 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace Umbraco.Core.IO
-{
-    internal class ShadowFileSystem : IFileSystem2
-    {
-        private readonly IFileSystem _fs;
-        private readonly IFileSystem2 _sfs;
-
-        public ShadowFileSystem(IFileSystem fs, IFileSystem2 sfs)
-        {
-            _fs = fs;
-            _sfs = sfs;
-        }
-
-        public IFileSystem Inner
-        {
-            get { return _fs; }
-        }
-
-        public void Complete()
-        {
-            if (_nodes == null) return;
-            var exceptions = new List<Exception>();
-            foreach (var kvp in _nodes)
-            {
-                if (kvp.Value.IsExist)
-                {
-                    if (kvp.Value.IsFile)
-                    {
-                        try
-                        {
-                            using (var stream = _sfs.OpenFile(kvp.Key))
-                                _fs.AddFile(kvp.Key, stream, true);
-                        }
-                        catch (Exception e)
-                        {
-                            exceptions.Add(new Exception("Could not save file \"" + kvp.Key + "\".", e));
-                        }
-                    }
-                }
-                else
-                {
-                    try
-                    {
-                        if (kvp.Value.IsDir)
-                            _fs.DeleteDirectory(kvp.Key, true);
-                        else
-                            _fs.DeleteFile(kvp.Key);
-                    }
-                    catch (Exception e)
-                    {
-                        exceptions.Add(new Exception("Could not delete " + (kvp.Value.IsDir ? "directory": "file") + " \"" + kvp.Key + "\".", e));
-                    }
-                }
-            }
-            _nodes.Clear();
-
-            if (exceptions.Count == 0) return;
-            throw new AggregateException("Failed to apply all changes (see exceptions).", exceptions);
-        }
-
-        private Dictionary<string, ShadowNode> _nodes;
-
-        private Dictionary<string, ShadowNode> Nodes {  get { return _nodes ?? (_nodes = new Dictionary<string, ShadowNode>()); } }
-
-        private class ShadowNode
-        {
-            public ShadowNode(bool isDelete, bool isdir)
-            {
-                IsDelete = isDelete;
-                IsDir = isdir;
-            }
-
-            public bool IsDelete { get; private set; }
-            public bool IsDir { get; private set; }
-
-            public bool IsExist { get { return IsDelete == false; } }
-            public bool IsFile { get { return IsDir == false; } }
-        }
-
-        private static string NormPath(string path)
-        {
-            return path.ToLowerInvariant().Replace("\\", "/");
-        }
-
-        // values can be "" (root), "foo", "foo/bar"...
-        private static bool IsChild(string path, string input)
-        {
-            if (input.StartsWith(path) == false || input.Length < path.Length + 2)
-                return false;
-            if (path.Length > 0 && input[path.Length] != '/') return false;
-            var pos = input.IndexOf("/", path.Length + 1, StringComparison.OrdinalIgnoreCase);
-            return pos < 0;
-        }
-
-        private static bool IsDescendant(string path, string input)
-        {
-            if (input.StartsWith(path) == false || input.Length < path.Length + 2)
-                return false;
-            return path.Length == 0 || input[path.Length] == '/';
-        }
-
-        public IEnumerable<string> GetDirectories(string path)
-        {
-            var normPath = NormPath(path);
-            var shadows = Nodes.Where(kvp => IsChild(normPath, kvp.Key)).ToArray();
-            var directories = _fs.GetDirectories(path);
-            return directories
-                .Except(shadows.Where(kvp => (kvp.Value.IsDir && kvp.Value.IsDelete) || (kvp.Value.IsFile && kvp.Value.IsExist))
-                    .Select(kvp => kvp.Key))
-                .Union(shadows.Where(kvp => kvp.Value.IsDir && kvp.Value.IsExist).Select(kvp => kvp.Key))
-                .Distinct();
-        }
-
-        public void DeleteDirectory(string path)
-        {
-            DeleteDirectory(path, false);
-        }
-
-        public void DeleteDirectory(string path, bool recursive)
-        {
-            if (DirectoryExists(path) == false) return;
-            var normPath = NormPath(path);
-            if (recursive)
-            {
-                Nodes[normPath] = new ShadowNode(true, true);
-                var remove = Nodes.Where(x => IsDescendant(normPath, x.Key)).ToList();
-                foreach (var kvp in remove) Nodes.Remove(kvp.Key);
-                Delete(path, true);
-            }
-            else
-            {
-                if (Nodes.Any(x => IsChild(normPath, x.Key) && x.Value.IsExist) // shadow content
-                    || _fs.GetDirectories(path).Any() || _fs.GetFiles(path).Any()) // actual content
-                    throw new InvalidOperationException("Directory is not empty.");
-                Nodes[path] = new ShadowNode(true, true);
-                var remove = Nodes.Where(x => IsChild(normPath, x.Key)).ToList();
-                foreach (var kvp in remove) Nodes.Remove(kvp.Key);
-                Delete(path, false);
-            }
-        }
-
-        private void Delete(string path, bool recurse)
-        {
-            foreach (var file in _fs.GetFiles(path))
-            {
-                Nodes[NormPath(file)] = new ShadowNode(true, false);
-            }
-            foreach (var dir in _fs.GetDirectories(path))
-            {
-                Nodes[NormPath(dir)] = new ShadowNode(true, true);
-                if (recurse) Delete(dir, true);
-            }
-        }
-
-        public bool DirectoryExists(string path)
-        {
-            ShadowNode sf;
-            if (Nodes.TryGetValue(NormPath(path), out sf))
-                return sf.IsDir && sf.IsExist;
-            return _fs.DirectoryExists(path);
-        }
-
-        public void AddFile(string path, Stream stream)
-        {
-            AddFile(path, stream, true);
-        }
-
-        public void AddFile(string path, Stream stream, bool overrideIfExists)
-        {
-            ShadowNode sf;
-            var normPath = NormPath(path);
-            if (Nodes.TryGetValue(normPath, out sf) && sf.IsExist && (sf.IsDir || overrideIfExists == false))
-                throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
-
-            var parts = normPath.Split('/');
-            for (var i = 0; i < parts.Length - 1; i++)
-            {
-                var dirPath = string.Join("/", parts.Take(i + 1));
-                ShadowNode sd;
-                if (Nodes.TryGetValue(dirPath, out sd))
-                {
-                    if (sd.IsFile) throw new InvalidOperationException("Invalid path.");
-                    if (sd.IsDelete) Nodes[dirPath] = new ShadowNode(false, true);
-                }
-                else
-                {
-                    if (_fs.DirectoryExists(dirPath)) continue;
-                    if (_fs.FileExists(dirPath)) throw new InvalidOperationException("Invalid path.");
-                    Nodes[dirPath] = new ShadowNode(false, true);
-                }
-            }
-
-            _sfs.AddFile(path, stream, overrideIfExists);
-            Nodes[normPath] = new ShadowNode(false, false);
-        }
-
-        public IEnumerable<string> GetFiles(string path)
-        {
-            var normPath = NormPath(path);
-            var shadows = Nodes.Where(kvp => IsChild(normPath, kvp.Key)).ToArray();
-            var files = _fs.GetFiles(path);
-            return files
-                .Except(shadows.Where(kvp => (kvp.Value.IsFile && kvp.Value.IsDelete) || kvp.Value.IsDir)
-                    .Select(kvp => kvp.Key))
-                .Union(shadows.Where(kvp => kvp.Value.IsFile && kvp.Value.IsExist).Select(kvp => kvp.Key))
-                .Distinct();
-        }
-
-        public IEnumerable<string> GetFiles(string path, string filter)
-        {
-            return _fs.GetFiles(path, filter);
-        }
-
-        public Stream OpenFile(string path)
-        {
-            ShadowNode sf;
-            if (Nodes.TryGetValue(NormPath(path), out sf))
-                return sf.IsDir || sf.IsDelete ? null : _sfs.OpenFile(path);
-            return _fs.OpenFile(path);
-        }
-
-        public void DeleteFile(string path)
-        {
-            if (FileExists(path) == false) return;
-            Nodes[NormPath(path)] = new ShadowNode(true, false);
-        }
-
-        public bool FileExists(string path)
-        {
-            ShadowNode sf;
-            if (Nodes.TryGetValue(NormPath(path), out sf))
-                return sf.IsFile && sf.IsExist;
-            return _fs.FileExists(path);
-        }
-
-        public string GetRelativePath(string fullPathOrUrl)
-        {
-            return _fs.GetRelativePath(fullPathOrUrl);
-        }
-
-        public string GetFullPath(string path)
-        {
-            return _fs.GetFullPath(path);
-        }
-
-        public string GetUrl(string path)
-        {
-            return _fs.GetUrl(path);
-        }
-
-        public DateTimeOffset GetLastModified(string path)
-        {
-            ShadowNode sf;
-            if (Nodes.TryGetValue(NormPath(path), out sf) == false) return _fs.GetLastModified(path);
-            if (sf.IsDelete) throw new InvalidOperationException("Invalid path.");
-            return _sfs.GetLastModified(path);
-        }
-
-        public DateTimeOffset GetCreated(string path)
-        {
-            ShadowNode sf;
-            if (Nodes.TryGetValue(NormPath(path), out sf) == false) return _fs.GetCreated(path);
-            if (sf.IsDelete) throw new InvalidOperationException("Invalid path.");
-            return _sfs.GetCreated(path);
-        }
-
-        public long GetSize(string path)
-        {
-            ShadowNode sf;
-            if (Nodes.TryGetValue(NormPath(path), out sf) == false)
-            {
-                // the inner filesystem (_fs) can be IFileSystem2... or just IFileSystem
-                // figure it out and use the most effective GetSize method
-                var fs2 = _fs as IFileSystem2;
-                return fs2 == null ? _fs.GetSize(path) : fs2.GetSize(path);
-            }
-            if (sf.IsDelete || sf.IsDir) throw new InvalidOperationException("Invalid path.");
-            return _sfs.GetSize(path);
-        }
-    }
-}

src/Umbraco.Core/IO/ShadowFileSystemsScope.cs

@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Remoting.Messaging;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.IO
-{
-    internal class ShadowFileSystemsScope : ICompletable
-    {
-        // note: taking a reference to the _manager instead of using manager.Current
-        // to avoid using Current everywhere but really, we support only 1 scope at
-        // a time, not multiple scopes in case of multiple managers (not supported)
-
-        private const string ItemKey = "Umbraco.Core.IO.ShadowFileSystemsScope";
-        private static readonly object Locker = new object();
-        private readonly Guid _id;
-        private readonly ShadowWrapper[] _wrappers;
-
-        static ShadowFileSystemsScope()
-        {
-            SafeCallContext.Register(
-                () =>
-                {
-                    var scope = CallContext.LogicalGetData(ItemKey);
-                    CallContext.FreeNamedDataSlot(ItemKey);
-                    return scope;
-                },
-                o =>
-                {
-                    if (CallContext.LogicalGetData(ItemKey) != null) throw new InvalidOperationException();
-                    if (o != null) CallContext.LogicalSetData(ItemKey, o);
-                });
-        }
-
-        private ShadowFileSystemsScope(Guid id, ShadowWrapper[] wrappers)
-        {
-            LogHelper.Debug<ShadowFileSystemsScope>("Shadow " + id + ".");
-            _id = id;
-            _wrappers = wrappers;
-            foreach (var wrapper in _wrappers)
-                wrapper.Shadow(id);
-        }
-
-        // internal for tests + FileSystemProviderManager
-        // do NOT use otherwise
-        internal static ShadowFileSystemsScope CreateScope(Guid id, ShadowWrapper[] wrappers)
-        {
-            lock (Locker)
-            {
-                if (CallContext.LogicalGetData(ItemKey) != null) throw new InvalidOperationException("Already shadowing.");
-                CallContext.LogicalSetData(ItemKey, ItemKey); // value does not matter
-            }
-            return new ShadowFileSystemsScope(id, wrappers);
-        }
-
-        internal static bool InScope
-        {
-            get { return NoScope == false; }
-        }
-
-        internal static bool NoScope
-        {
-            get { return CallContext.LogicalGetData(ItemKey) == null; }
-        }
-
-        public void Complete()
-        {
-            lock (Locker)
-            {
-                LogHelper.Debug<ShadowFileSystemsScope>("UnShadow " + _id + " (complete).");
-
-                var exceptions = new List<Exception>();
-                foreach (var wrapper in _wrappers)
-                {
-                    try
-                    {
-                        // this may throw an AggregateException if some of the changes could not be applied
-                        wrapper.UnShadow(true);
-                    }
-                    catch (AggregateException ae)
-                    {
-                        exceptions.Add(ae);
-                    }
-                }
-
-                if (exceptions.Count > 0)
-                    throw new AggregateException("Failed to apply all changes (see exceptions).", exceptions);
-
-                // last, & *only* if successful (otherwise we'll unshadow & cleanup as best as we can)
-                CallContext.FreeNamedDataSlot(ItemKey);
-            }
-        }
-
-        public void Dispose()
-        {
-            lock (Locker)
-            {
-                if (CallContext.LogicalGetData(ItemKey) == null) return;
-
-                try
-                {
-                    LogHelper.Debug<ShadowFileSystemsScope>("UnShadow " + _id + " (abort)");
-                    foreach (var wrapper in _wrappers)
-                        wrapper.UnShadow(false); // should not throw
-                }
-                finally
-                {
-                    // last, & always
-                    CallContext.FreeNamedDataSlot(ItemKey);
-                }
-            }
-        }
-    }
-}

src/Umbraco.Core/IO/ShadowWrapper.cs

@@ -1,158 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace Umbraco.Core.IO
-{
-    internal class ShadowWrapper : IFileSystem2
-    {
-        private readonly IFileSystem _innerFileSystem;
-        private readonly string _shadowPath;
-        private ShadowFileSystem _shadowFileSystem;
-        private string _shadowDir;
-
-        public ShadowWrapper(IFileSystem innerFileSystem, string shadowPath)
-        {
-            _innerFileSystem = innerFileSystem;
-            _shadowPath = shadowPath;
-        }
-
-        internal void Shadow(Guid id)
-        {
-            // note: no thread-safety here, because ShadowFs is thread-safe due to the check
-            // on ShadowFileSystemsScope.None - and if None is false then we should be running
-            // in a single thread anyways
-
-            var virt = "~/App_Data/Shadow/" + id + "/" + _shadowPath;
-            _shadowDir = IOHelper.MapPath(virt);
-            Directory.CreateDirectory(_shadowDir);
-            var tempfs = new PhysicalFileSystem(virt);
-            _shadowFileSystem = new ShadowFileSystem(_innerFileSystem, tempfs);
-        }
-
-        internal void UnShadow(bool complete)
-        {
-            var shadowFileSystem = _shadowFileSystem;
-            var dir = _shadowDir;
-            _shadowFileSystem = null;
-            _shadowDir = null;
-
-            try
-            {
-                // this may throw an AggregateException if some of the changes could not be applied
-                if (complete) shadowFileSystem.Complete();
-            }
-            finally
-            {
-                // in any case, cleanup
-                try
-                {
-                    Directory.Delete(dir, true);
-                    dir = dir.Substring(0, dir.Length - _shadowPath.Length - 1);
-                    if (Directory.EnumerateFileSystemEntries(dir).Any() == false)
-                        Directory.Delete(dir, true);
-                }
-                catch
-                {
-                    // ugly, isn't it? but if we cannot cleanup, bah, just leave it there
-                }
-            }
-        }
-
-        private IFileSystem FileSystem
-        {
-            get { return ShadowFileSystemsScope.NoScope ? _innerFileSystem : _shadowFileSystem; }
-        }
-
-        public IEnumerable<string> GetDirectories(string path)
-        {
-            return FileSystem.GetDirectories(path);
-        }
-
-        public void DeleteDirectory(string path)
-        {
-            FileSystem.DeleteDirectory(path);
-        }
-
-        public void DeleteDirectory(string path, bool recursive)
-        {
-            FileSystem.DeleteDirectory(path, recursive);
-        }
-
-        public bool DirectoryExists(string path)
-        {
-            return FileSystem.DirectoryExists(path);
-        }
-
-        public void AddFile(string path, Stream stream)
-        {
-            FileSystem.AddFile(path, stream);
-        }
-
-        public void AddFile(string path, Stream stream, bool overrideExisting)
-        {
-            FileSystem.AddFile(path, stream, overrideExisting);
-        }
-
-        public IEnumerable<string> GetFiles(string path)
-        {
-            return FileSystem.GetFiles(path);
-        }
-
-        public IEnumerable<string> GetFiles(string path, string filter)
-        {
-            return FileSystem.GetFiles(path, filter);
-        }
-
-        public Stream OpenFile(string path)
-        {
-            return FileSystem.OpenFile(path);
-        }
-
-        public void DeleteFile(string path)
-        {
-            FileSystem.DeleteFile(path);
-        }
-
-        public bool FileExists(string path)
-        {
-            return FileSystem.FileExists(path);
-        }
-
-        public string GetRelativePath(string fullPathOrUrl)
-        {
-            return FileSystem.GetRelativePath(fullPathOrUrl);
-        }
-
-        public string GetFullPath(string path)
-        {
-            return FileSystem.GetFullPath(path);
-        }
-
-        public string GetUrl(string path)
-        {
-            return FileSystem.GetUrl(path);
-        }
-
-        public DateTimeOffset GetLastModified(string path)
-        {
-            return FileSystem.GetLastModified(path);
-        }
-
-        public DateTimeOffset GetCreated(string path)
-        {
-            return FileSystem.GetCreated(path);
-        }
-
-        public long GetSize(string path)
-        {
-            var filesystem = FileSystem; // will be either a ShadowFileSystem OR the actual underlying IFileSystem
-
-            // and the underlying filesystem can be IFileSystem2... or just IFileSystem
-            // figure it out and use the most effective GetSize method
-            var filesystem2 = filesystem as IFileSystem2;
-            return filesystem2 == null ? filesystem.GetSize(path) : filesystem2.GetSize(path);
-        }
-    }
-}

src/Umbraco.Core/IO/SystemDirectories.cs

@@ -69,16 +69,7 @@ namespace Umbraco.Core.IO
             }
         }
 
-        public static string AppCode
-        {
-            get
-            {
-                //NOTE: this is not configurable and shouldn't need to be
-                return "~/App_Code";
-            }
-        }
-
-        public static string AppPlugins
+		public static string AppPlugins
 		{
 			get
 			{
@@ -96,23 +87,7 @@ namespace Umbraco.Core.IO
 			}
 		}
 
-        public static string PartialViews
-        {
-            get
-            {
-                return MvcViews + "/Partials/";
-            }
-        }
-
-        public static string MacroPartials
-        {
-            get
-            {
-                return MvcViews + "/MacroPartials/"; 
-                
-            }
-        }
-
+       
         public static string Media
         {
             get

src/Umbraco.Core/IO/UmbracoMediaFile.cs

@@ -1,7 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
 using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 using System.Web;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Media;
 
@@ -80,15 +86,15 @@ namespace Umbraco.Core.IO
         private void Initialize()
         {
             Filename = _fs.GetFileName(Path);
-            var ext = _fs.GetExtension(Path);
-            Extension = string.IsNullOrEmpty(ext) == false
-                ? ext.TrimStart('.').ToLowerInvariant()
+            Extension = _fs.GetExtension(Path) != null
+                ? _fs.GetExtension(Path).Substring(1).ToLowerInvariant()
                 : "";
             Url = _fs.GetUrl(Path);
-
             Exists = _fs.FileExists(Path);
             if (Exists == false)
+            {
                 LogHelper.Warn<UmbracoMediaFile>("The media file doesn't exist: " + Path);
+            }
         }
 
         public bool Exists { get; private set; }
@@ -111,15 +117,27 @@ namespace Umbraco.Core.IO
         {
             get
             {
-                if (_length.HasValue) return _length.Value;
-                _length = Exists ? _fs.GetSize(Path) : -1;
+                if (_length == null)
+                {
+                    if (Exists)
+                    {
+                        _length = _fs.GetSize(Path);
+                    }
+                    else
+                    {
+                        _length = -1;
+                    }
+                }
                 return _length.Value;
             }
         }
 
         public bool SupportsResizing
         {
-            get { return _fs.IsImageFile(Extension); }
+            get
+            {
+                return UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.InvariantContains(Extension);
+            }
         }
 
         public string GetFriendlyName()
@@ -129,49 +147,67 @@ namespace Umbraco.Core.IO
 
         public Size GetDimensions()
         {
-            if (_size.HasValue) return _size.Value;
-
-            if (_fs.FileExists(Path))
+            if (_size == null)
             {
-                EnsureFileSupportsResizing();
-
-                using (var fs = _fs.OpenFile(Path))
+                if (_fs.FileExists(Path))
                 {
-                    _size = _fs.GetDimensions(fs);
+                    EnsureFileSupportsResizing();
+
+                    using (var fs = _fs.OpenFile(Path))
+                    {
+                        _size = ImageHelper.GetDimensions(fs);
+                    }
+                }
+                else
+                {
+                    _size = new Size(-1, -1);
                 }
             }
-            else
-            {
-                _size = new Size(-1, -1);
-            }
-
             return _size.Value;
         }
 
         public string Resize(int width, int height)
         {
-            if (Exists == false) return string.Empty;
+            if (Exists)
+            {
+                EnsureFileSupportsResizing();
 
-            EnsureFileSupportsResizing();
-            var filepath = Resize(width, height, -1, string.Empty);
-            return _fs.GetUrl(filepath);
+                var fileNameThumb = DoResize(width, height, -1, string.Empty);
+
+                return _fs.GetUrl(fileNameThumb);
+            }
+            return string.Empty;
         }
 
         public string Resize(int maxWidthHeight, string fileNameAddition)
         {
-            if (Exists == false) return string.Empty;
+            if (Exists)
+            {
+                EnsureFileSupportsResizing();
 
-            EnsureFileSupportsResizing();
-            var filepath = Resize(-1, -1, maxWidthHeight, fileNameAddition);
-            return _fs.GetUrl(filepath);
+                var fileNameThumb = DoResize(-1, -1, maxWidthHeight, fileNameAddition);
+
+                return _fs.GetUrl(fileNameThumb);
+            }
+            return string.Empty;
         }
 
-        private string Resize(int width, int height, int maxWidthHeight, string sizeName)
+        private string DoResize(int width, int height, int maxWidthHeight, string fileNameAddition)
         {
-            using (var filestream = _fs.OpenFile(Path))
-            using (var image = Image.FromStream(filestream))
+            using (var fs = _fs.OpenFile(Path))
             {
-                return _fs.GenerateResized(image, Path, sizeName, maxWidthHeight, width, height).Filepath;
+                using (var image = Image.FromStream(fs))
+                {
+                    var fileNameThumb = string.IsNullOrWhiteSpace(fileNameAddition)
+                        ? string.Format("{0}_UMBRACOSYSTHUMBNAIL." + Extension, Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)))
+                        : string.Format("{0}_{1}." + Extension, Path.Substring(0, Path.LastIndexOf(".", StringComparison.Ordinal)), fileNameAddition);
+
+                    var thumbnail = maxWidthHeight == -1
+                        ? ImageHelper.GenerateThumbnail(image, width, height, fileNameThumb, Extension, _fs)
+                        : ImageHelper.GenerateThumbnail(image, maxWidthHeight, fileNameThumb, Extension, _fs);
+
+                    return thumbnail.FileName;
+                }
             }
         }
 
@@ -180,5 +216,7 @@ namespace Umbraco.Core.IO
             if (SupportsResizing == false)
                 throw new InvalidOperationException(string.Format("The file {0} is not an image, so can't get dimensions", Filename));
         }
+
+
     }
 }

src/Umbraco.Core/Logging/AsyncForwardingAppenderBase.cs

@@ -1,21 +1,20 @@
+using System;
 using log4net.Appender;
 using log4net.Core;
 using log4net.Util;
-using System;
-using System.Runtime.Remoting.Messaging;
 
 namespace Umbraco.Core.Logging
 {
-    /// <summary>
-    /// Borrowed from https://github.com/cjbhaines/Log4Net.Async - will reference Nuget packages directly in v8
-    /// </summary>
+    /// <remarks>
+    /// Based on https://github.com/cjbhaines/Log4Net.Async
+    /// </remarks>
     public abstract class AsyncForwardingAppenderBase : ForwardingAppender
     {
         #region Private Members
 
         private const FixFlags DefaultFixFlags = FixFlags.Partial;
-        private FixFlags fixFlags = DefaultFixFlags;
-        private LoggingEventHelper loggingEventHelper;
+        private FixFlags _fixFlags = DefaultFixFlags;
+        private LoggingEventHelper _loggingEventHelper;
 
         #endregion Private Members
 
@@ -23,25 +22,10 @@ namespace Umbraco.Core.Logging
 
         public FixFlags Fix
         {
-            get { return fixFlags; }
+            get { return _fixFlags; }
             set { SetFixFlags(value); }
         }
 
-        /// <summary>
-        /// Returns HttpContext.Current
-        /// </summary>
-        protected internal object HttpContext
-        {
-            get
-            {
-                return CallContext.HostContext;
-            }
-            set
-            {
-                CallContext.HostContext = value;
-            }
-        }
-
         /// <summary>
         /// The logger name that will be used for logging internal errors.
         /// </summary>
@@ -54,7 +38,7 @@ namespace Umbraco.Core.Logging
         public override void ActivateOptions()
         {
             base.ActivateOptions();
-            loggingEventHelper = new LoggingEventHelper(InternalLoggerName, DefaultFixFlags);
+            _loggingEventHelper = new LoggingEventHelper(InternalLoggerName, DefaultFixFlags);
             InitializeAppenders();
         }
 
@@ -68,10 +52,10 @@ namespace Umbraco.Core.Logging
 
         private void SetFixFlags(FixFlags newFixFlags)
         {
-            if (newFixFlags != fixFlags)
+            if (newFixFlags != _fixFlags)
             {
-                loggingEventHelper.Fix = newFixFlags;
-                fixFlags = newFixFlags;
+                _loggingEventHelper.Fix = newFixFlags;
+                _fixFlags = newFixFlags;
                 InitializeAppenders();
             }
         }
@@ -100,7 +84,7 @@ namespace Umbraco.Core.Logging
         protected void ForwardInternalError(string message, Exception exception, Type thisType)
         {
             LogLog.Error(thisType, message, exception);
-            var loggingEvent = loggingEventHelper.CreateLoggingEvent(Level.Error, message, exception);
+            var loggingEvent = _loggingEventHelper.CreateLoggingEvent(Level.Error, message, exception);
             ForwardLoggingEvent(loggingEvent, thisType);
         }
 

src/Umbraco.Core/Logging/AsynchronousRollingFileAppender.cs

@@ -1,7 +1,6 @@
 using log4net.Core;
 using log4net.Util;
 using System;
-using System.ComponentModel;
 using System.Runtime.Remoting.Messaging;
 using System.Security.Principal;
 using System.Threading;
@@ -13,11 +12,7 @@ namespace Umbraco.Core.Logging
     /// <summary>
     /// Based on https://github.com/cjbhaines/Log4Net.Async
     /// which is based on code by Chris Haines http://cjbhaines.wordpress.com/2012/02/13/asynchronous-log4net-appenders/
-    /// This is an old/deprecated logger and has been superceded by ParallelForwardingAppender which is included in Umbraco and 
-    /// also by AsyncForwardingAppender in the Log4Net.Async library.
 	/// </summary>
-	[Obsolete("This is superceded by the ParallelForwardingAppender, this will be removed in v8")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
 	public class AsynchronousRollingFileAppender : RollingFileAppender
 	{
 		private RingBuffer<LoggingEvent> pendingAppends;
@@ -203,4 +198,79 @@ namespace Umbraco.Core.Logging
         }
     }
 
+    internal interface IQueue<T>
+    {
+        void Enqueue(T item);
+        bool TryDequeue(out T ret);
+    }
+
+    internal class RingBuffer<T> : IQueue<T>
+    {
+        private readonly object lockObject = new object();
+        private readonly T[] buffer;
+        private readonly int size;
+        private int readIndex = 0;
+        private int writeIndex = 0;
+        private bool bufferFull = false;
+
+        public int Size { get { return size; } }
+
+        public event Action<object, EventArgs> BufferOverflow;
+
+        public RingBuffer(int size)
+        {
+            this.size = size;
+            buffer = new T[size];
+        }
+
+        public void Enqueue(T item)
+        {
+            var bufferWasFull = false;
+            lock (lockObject)
+            {
+                buffer[writeIndex] = item;
+                writeIndex = (++writeIndex) % size;
+                if (bufferFull)
+                {
+                    bufferWasFull = true;
+                    readIndex = writeIndex;
+                }
+                else if (writeIndex == readIndex)
+                {
+                    bufferFull = true;
+                }
+            }
+
+            if (bufferWasFull)
+            {
+                if (BufferOverflow != null)
+                {
+                    BufferOverflow(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        public bool TryDequeue(out T ret)
+        {
+            if (readIndex == writeIndex && !bufferFull)
+            {
+                ret = default(T);
+                return false;
+            }
+            lock (lockObject)
+            {
+                if (readIndex == writeIndex && !bufferFull)
+                {
+                    ret = default(T);
+                    return false;
+                }
+
+                ret = buffer[readIndex];
+                buffer[readIndex] = default(T);
+                readIndex = (++readIndex) % size;
+                bufferFull = false;
+                return true;
+            }
+        }
+    }
 }

src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs

@@ -3,11 +3,7 @@ using System.Linq;
 
 namespace Umbraco.Core.Logging
 {
-    /// <summary>
-    /// Implements <see cref="ILogger"/> on top of System.Diagnostics.Debug.
-    /// </summary>
-    /// <remarks>Useful for tests.</remarks>
-    public class DebugDiagnosticsLogger : ILogger
+    internal class DebugDiagnosticsLogger : ILogger
     {
         public void Error(Type callingType, string message, Exception exception)
         {

src/Umbraco.Core/Logging/IQueue.cs

@@ -1,12 +0,0 @@
-namespace Umbraco.Core.Logging
-{
-    /// <summary>
-    /// Borrowed from https://github.com/cjbhaines/Log4Net.Async - will reference Nuget packages directly in v8
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal interface IQueue<T>
-    {
-        void Enqueue(T item);
-        bool TryDequeue(out T ret);
-    }
-}