Revert "V8: Don't show multiple open menus (take two) (#5609 )"

This reverts commit 9ce996cbba. (cherry picked from commit 1d49c8626e)
Makes checks a little more robust
2019-07-24 12:02:41 +02:00 · 2019-07-24 11:37:29 +02:00 · 2019-07-24 11:37:17 +02:00 · 2019-07-24 10:59:01 +02:00 · 2019-07-23 12:48:48 +02:00 · 2019-07-23 19:03:14 +10:00
1632 changed files with 35268 additions and 29886 deletions
@@ -1,14 +1,176 @@
-Umbraco Cms Build
--
----
+# Umbraco Cms Build

-# Quick!
+## Are you sure?

-To build Umbraco, fire PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `README.md`...). There, trigger the build with the following command:
+In order to use Umbraco as a CMS and build your website with it, you should not build it yourself. If you're reading this then you're trying to contribute to Umbraco or you're debugging a complex issue.
+
+- Are you about to create a pull request for Umbraco?
+- Are you trying to get to the bottom of a problem in your existing Umbraco installation?
+
+If the answer is yes, please read on. Otherwise, make sure to head on over [to the download page](https://our.umbraco.com/download) and start using Umbraco CMS as intended.
+
+**Table of contents**
+
+[Building from source](#building-from-source)
+  * [The quick build](#quick)
+  * [Build infrastructure](#build-infrastructure)
+    * [Properties](#properties)
+    * [GetUmbracoVersion](#getumbracoversion)
+    * [SetUmbracoVersion](#setumbracoversion)
+    * [Build](#build)
+    * [Build-UmbracoDocs](#build-umbracodocs)
+    * [Verify-NuGet](#verify-nuget)
+  * [Cleaning up](#cleaning-up)
+
+[Azure DevOps](#azure-devops)
+
+[Quirks](#quirks)
+  * [Powershell quirks](#powershell-quirks)
+  * [Git quirks](#git-quirks)
+
+
+## Building from source
+
+Did you read ["Are you sure"](#are-you-sure)?
+
+### Quick!
+
+To build Umbraco, fire up PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `LICENSE.md`...). There, trigger the build with the following command:

    build/build.ps1
    
-## PowerShell Quirks
+You might run into [Powershell quirks](#powershell-quirks).
+
+### Build Infrastructure
+
+The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
+
+    $ubuild = build/build.ps1 -get
+
+The object exposes various properties and methods that can be used to fine-grain build Umbraco. Some, but not all, of them are detailed below.
+    
+#### Properties
+
+The object exposes the following properties:
+
+* `SolutionRoot`: the absolute path to the solution root
+* `VisualStudio`: a Visual Studio object (see below)
+* `NuGet`: the absolute path to the NuGet executable
+* `Zip`: the absolute path to the 7Zip executable
+* `VsWhere`: the absolute path to the VsWhere executable
+* `NodePath`: the absolute path to the Node install
+* `NpmPath`: the absolute path to the Npm install
+
+The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
+
+* `Path`: Visual Studio installation path (eg some place under `Program Files`)
+* `Major`: Visual Studio major version (eg `15` for VS 2017)
+* `Minor`: Visual Studio minor version
+* `MsBUild`: the absolute path to the MsBuild executable
+
+#### GetUmbracoVersion
+
+Gets an object representing the current Umbraco version. Example:
+
+    $v = $ubuild.GetUmbracoVersion()
+    Write-Host $v.Semver
+
+The object exposes the following properties:
+
+* `Semver`: the semver object representing the version
+* `Release`: the main part of the version (eg `7.6.33`)
+* `Comment`: the pre release part of the version (eg `alpha02`)
+* `Build`: the build number part of the version (eg `1234`)
+
+#### SetUmbracoVersion
+
+Modifies Umbraco files with the new version.
+
+>This entirely replaces the legacy `UmbracoVersion.txt` file. Do *not* edit version infos in files.
+
+The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
+
+    $ubuild.SetUmbracoVersion("7.6.33")
+    $ubuild.SetUmbracoVersion("7.6.33-alpha.2")
+    $ubuild.SetUmbracoVersion("7.6.33+1234")
+    $ubuild.SetUmbracoVersion("7.6.33-beta.5+5678")
+
+#### Build
+
+Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
+
+    $ubuild.Build()
+
+Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
+
+**Note: web.config**
+
+Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
+
+#### Build-UmbracoDocs
+
+Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
+
+    Build-UmbracoDocs
+
+Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
+
+#### Verify-NuGet
+
+Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
+
+    Verify-NuGet
+
+### Cleaning up
+
+Once the solution has been used to run a site, one may want to "reset" the solution in order to run a fresh new site again.
+
+At the very minimum, you want
+
+    git clean -Xdf src/Umbraco.Web.UI/App_Data
+    rm src/Umbraco.Web.UI/web.config
+
+Then, a simple 'Rebuild All' in Visual Studio will recreate a fresh `web.config` but should be quite fast (since it does not really need to rebuild anything).
+
+The `clean` Git command force (`-f`) removes (`-X`, note the capital X) all files and directories (`-d`) that are ignored by Git.
+
+This will leave media files and views around, but in most cases, it will be enough.
+
+To perform a more complete clear, you will want to also delete the content of the media, views, scripts... directories.
+
+The following command will force remove all untracked files and directories, whether they are ignored by Git or not. Combined with `git reset` it can recreate a pristine working directory. 
+
+    git clean -xdf .
+    
+For git documentation see:
+* git [clean](<https://git-scm.com/docs/git-clean>)
+* git [reset](<https://git-scm.com/docs/git-reset>)
+
+## Azure DevOps
+
+Umbraco uses Azure DevOps for continuous integration, nightly builds and release builds. The Umbraco CMS project on DevOps [is available for anonymous users](https://umbraco.visualstudio.com/Umbraco%20Cms).
+
+DevOps uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
+
+* `pre-build`: prepares the build
+* `compile-belle`: compiles Belle
+* `compile-umbraco`: compiles Umbraco
+* `pre-tests`: prepares the tests
+* `compile-tests`: compiles the tests
+* `pre-packages`: prepares the packages
+* `pkg-zip`: creates the zip files
+* `pre-nuget`: prepares NuGet packages
+* `pkg-nuget`: creates NuGet packages
+
+All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated DevOps tasks. Similarly, creating the NuGet packages is also performed by dedicated DevOps tasks.
+
+Finally, the produced artifacts are published in two containers that can be downloaded from DevOps: `zips` contains the zip files while `nuget` contains the NuGet packages.
+
+>During a DevOps build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in DevOps tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with DevOps at the moment.
+
+## Quirks
+
+### PowerShell Quirks

 There is a good chance that running `build.ps1` ends up in error, with messages such as

@@ -45,120 +207,6 @@ The best solution is to unblock the Zip file before un-zipping: right-click the

    PS> Get-ChildItem -Recurse *.* | Unblock-File

-## Git Quirks
+### Git Quirks

-Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
-
-# Build Infrastructure
-
-The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
-
-    $ubuild = build/build.ps1 -get
-
-The object exposes various properties and methods that can be used to fine-grain build Umbraco. Some, but not all, of them are detailed below.
-    
-## Properties
-
-The object exposes the following properties:
-
-* `SolutionRoot`: the absolute path to the solution root
-* `VisualStudio`: a Visual Studio object (see below)
-* `NuGet`: the absolute path to the NuGet executable
-* `Zip`: the absolute path to the 7Zip executable
-* `VsWhere`: the absolute path to the VsWhere executable
-* `NodePath`: the absolute path to the Node install
-* `NpmPath`: the absolute path to the Npm install
-
-The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
-
-* `Path`: Visual Studio installation path (eg some place under `Program Files`)
-* `Major`: Visual Studio major version (eg `15` for VS 2017)
-* `Minor`: Visual Studio minor version
-* `MsBUild`: the absolute path to the MsBuild executable
-
-## GetUmbracoVersion
-
-Gets an object representing the current Umbraco version. Example:
-
-    $v = $ubuild.GetUmbracoVersion()
-    Write-Host $v.Semver
-
-The object exposes the following properties:
-
-* `Semver`: the semver object representing the version
-* `Release`: the main part of the version (eg `7.6.33`)
-* `Comment`: the pre release part of the version (eg `alpha02`)
-* `Build`: the build number part of the version (eg `1234`)
-
-## SetUmbracoVersion
-
-Modifies Umbraco files with the new version.
-
->This entirely replaces the legacy `UmbracoVersion.txt` file. Do *not* edit version infos in files.
-
-The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
-
-    $ubuild.SetUmbracoVersion("7.6.33")
-    $ubuild.SetUmbracoVersion("7.6.33-alpha.2")
-    $ubuild.SetUmbracoVersion("7.6.33+1234")
-    $ubuild.SetUmbracoVersion("7.6.33-beta.5+5678")
-
-## Build
-
-Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
-
-    $ubuild.Build()
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-### web.config
-
-Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
-
-## Build-UmbracoDocs
-
-Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
-
-    Build-UmbracoDocs
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-## Verify-NuGet
-
-Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
-
-    Verify-NuGet
-
-# VSTS
-
-Continuous integration, nightly builds and release builds run on VSTS.
-
-VSTS uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
-
-* `pre-build`: prepares the build
-* `compile-belle`: compiles Belle
-* `compile-umbraco`: compiles Umbraco
-* `pre-tests`: prepares the tests
-* `compile-tests`: compiles the tests
-* `pre-packages`: prepares the packages
-* `pkg-zip`: creates the zip files
-* `pre-nuget`: prepares NuGet packages
-* `pkg-nuget`: creates NuGet packages
-
-All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated VSTS tasks. Similarly, creating the NuGet packages is also performed by dedicated VSTS tasks.
-
-Finally, the produced artifacts are published in two containers that can be downloaded from VSTS: `zips` contains the zip files while `nuget` contains the NuGet packages.
-
->During a VSTS build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in VSTS tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with VSTS at the moment.
-
-# Notes
-
-*This part needs to be cleaned up*
-
-Nightlies should use some sort of build number.
-
-We should increment versions as soon as a version is released. Ie, as soon as `7.6.33` is released, we should `Set-UmbracoVersion 7.6.34-alpha` and push.
-
-NuGet / NuSpec consistency checks are performed in tests. We should move it so it is done as part of the PowerShell script even before we try to compile and run the tests.
-
-/eof
+Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
@@ -1,34 +0,0 @@
-Umbraco Cms Clear
--
----
-
-Once the solution has been used to run a site, one may want to "reset" the solution in order to run a fresh new site again.
-
-## Fast
-
-At the very minimum, you want
-
-    git clean -Xdf src/Umbraco.Web.UI/App_Data
-    rm src/Umbraco.Web.UI/web.config
-
-Then, a simple 'Rebuild All' in Visual Studio will recreate a fresh `web.config` but should be quite fast (since it does not really need to rebuild anything).
-
-The `clean` Git command force (`-f`) removes (`-X`, note the capital X) all files and directories (`-d`) that are ignored by Git.
-
-This will leave medias and views around, but in most cases, it will be enough.
-
-## More
-
-To perform a more complete clear, you will want to also delete the content of the media, views, masterpages, scripts... directories.
-
-## Full
-
-The following command will force remove all untracked files and directories, be they ignored by Git or not. Combined with `git reset` it can recreate a pristine working directory. 
-
-    git clean -xdf .
-    
-## Docs
-
-See
-* git [clean](<https://git-scm.com/docs/git-clean>)
-* git [reset](<https://git-scm.com/docs/git-reset>)
@@ -1,97 +1,187 @@
-_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/.github/V8_GETTING_STARTED.md) to go to the v8 branch_
-# Contributing to Umbraco CMS
-
-👍🎉 First off, thanks for taking the time to contribute! 🎉👍
-
-The following is a set of guidelines for contributing to Umbraco CMS.
-
-These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
-
-Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
-
-## Contributing code changes
-
-This document gives you a quick overview on how to get started, we will link to in-depth documentation throughout if you need some more background info.
-
-
-## Guidelines for contributions we welcome
-
-Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valuable time.
-
-We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md). Make sure to talk to us before making large changes.
-
-Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you sent us a PR, your PR will not be closed as unwanted.
-
-## How do I begin?
-
-Great question! The short version goes like this:
-
-  * **Fork** - create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
-
-  ![Fork the repository](img/forkrepository.png)
-
-  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
-  
-  ![Clone the fork](img/clonefork.png)
-
-  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
-  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
-  * **Commit** - done? Yay! 🎉 It is recommended to create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`
-  * **Push** - great, now you can push the changes up to your fork on GitHub
-  * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
-
-  ![Create a pull request](img/createpullrequest.png)
-
-### Further reading
-
-At this point you might want to [read on about contributing in depth](CONTRIBUTING_DETAILED.md). 
-
-### Reviews
-
-You've sent us your first contribution, congratulations! Now what?
-
-The [pull request team](#the-pr-team) can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request you to make some additional changes.
-
-We have [a process in place which you can read all about](REVIEW_PROCESS.md). The very abbreviated version is:
-
- Your PR will get a reply within 48 hours
- An in-depth reply will be added within at most 2 weeks
- The PR will be either merged or rejected within at most 4 weeks
- Sometimes it is difficult to meet these timelines and we'll talk to you
-
-## Styleguides
-
-To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
-
-That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
-
-## The PR team
-
-The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members
-
- [Anders Bjerner](https://github.com/abjerner)
- [Dave Woestenborghs](https://github.com/dawoe)
- [Emma Burstow](https://github.com/emmaburstow)
- [Poornima Nayar](https://github.com/poornimanayar)
-
-These wonderful volunteers will provide you with a first reply to your PR, review and test out your changes and might ask more questions. After that they'll let Umbraco HQ know if everything seems okay. 
-
-## Questions?
-
-You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love open conversations and we are a friendly bunch. No question you have is stupid. Any questions you have usually helps out multiple people with the same question. Ask away:
-
- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
-
-## Code of Conduct
-
-This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
-
-
-## Contributing to Umbraco, in depth
-
-There are other ways to contribute, and there's a few more things that you might be wondering about. We will answer the [most common questions and ways to contribute in our detailed documentation](CONTRIBUTING_DETAILED.md).
-
-## Credits
-
-This contribution guide borrows heavily from the excellent work on [the Atom contribution guide](https://github.com/atom/atom/blob/master/CONTRIBUTING.md). A big [#h5yr](http://h5yr.com/) to them!
+# Contributing to Umbraco CMS
+
+👍🎉 First off, thanks for taking the time to contribute! 🎉👍
+
+The following is a set of guidelines for contributing to Umbraco CMS.
+
+These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+
+Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
+
+**Code of conduct**
+
+This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
+
+**Table of contents**
+
+[Contributing code changes](#contributing-code-changes)
+  * [Guidelines for contributions we welcome](#guidelines-for-contributions-we-welcome)
+  * [What can I start with?](#what-can-i-start-with)
+  * [How do I begin?](#how-do-i-begin)
+  * [Pull requests](#pull-requests)
+
+[Reviews](#reviews)
+  * [Styleguides](#styleguides)
+  * [The PR team](#the-pr-team)
+  * [Questions?](#questions)
+
+[Working with the code](#working-with-the-code)
+  * [Building Umbraco from source code](#building-umbraco-from-source-code)
+  * [Working with the source code](#working-with-the-source-code)
+  * [Making changes after the PR was opened](#making-changes-after-the-pr-was-opened)
+  * [Which branch should I target for my contributions?](#which-branch-should-i-target-for-my-contributions)
+  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
+
+## Contributing code changes
+
+This document gives you a quick overview on how to get started.
+
+### Guidelines for contributions we welcome
+
+Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valuable time.
+
+We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md). Make sure to talk to us before making large changes.
+
+Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you sent us a PR, your PR will not be closed as unwanted.
+
+### What can I start with?
+
+Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` issues](https://github.com/umbraco/Umbraco-CMS/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs+)
+
+### How do I begin?
+
+Great question! The short version goes like this:
+
+  * **Fork** - create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
+
+  ![Fork the repository](img/forkrepository.png)
+
+  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
+
+  ![Clone the fork](img/clonefork.png)
+
+  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
+  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
+  * **Commit** - done? Yay! 🎉 **Important:** create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`. When you have a branch, commit your changes. Don't commit to `v8/dev`, create a new branch first.
+  * **Push** - great, now you can push the changes up to your fork on GitHub
+  * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
+
+  ![Create a pull request](img/createpullrequest.png)
+
+### Pull requests
+The most successful pull requests usually look a like this:
+
+  * Fill in the required template
+  * Include screenshots and animated GIFs in your pull request whenever possible.
+  * Unit tests, while optional are awesome, thank you!
+  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated
+
+Again, these are guidelines, not strict requirements.
+
+## Reviews
+
+You've sent us your first contribution, congratulations! Now what?
+
+The [pull request team](#the-pr-team) can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request you to make some additional changes.
+
+We have [a process in place which you can read all about](REVIEW_PROCESS.md). The very abbreviated version is:
+
+- Your PR will get a reply within 48 hours
+- An in-depth reply will be added within at most 2 weeks
+- The PR will be either merged or rejected within at most 4 weeks
+- Sometimes it is difficult to meet these timelines and we'll talk to you
+
+### Styleguides
+
+To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
+
+That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
+
+### The PR team
+
+The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members
+
+- [Anders Bjerner](https://github.com/abjerner)
+- [Dave Woestenborghs](https://github.com/dawoe)
+- [Emma Burstow](https://github.com/emmaburstow)
+- [Poornima Nayar](https://github.com/poornimanayar)
+
+These wonderful volunteers will provide you with a first reply to your PR, review and test out your changes and might ask more questions. After that they'll let Umbraco HQ know if everything seems okay.
+
+### Questions?
+
+You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love open conversations and we are a friendly bunch. No question you have is stupid. Any questions you have usually helps out multiple people with the same question. Ask away:
+
+- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
+- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
+
+## Working with the code
+
+### Building Umbraco from source code
+
+In order to build the Umbraco source code locally, first make sure you have the following installed.
+
+  * Visual Studio 2017 v15.9.7+
+  * Node v10+
+  * npm v6.4.1+
+
+The easiest way to get started is to run `build.ps1` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.
+
+Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.9.7 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
+
+![Gulp build in Visual Studio](img/gulpbuild.png)
+
+After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser, follow the directions there to get a working Umbraco install up and running.
+
+### Working with the source code
+
+Some parts of our source code are over 10 years old now. And when we say "old", we mean "mature" of course!
+
+There's two big areas that you should know about:
+
+  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
+  You may need to run the following commands to set up gulp properly:
+  ```
+  npm cache clean --force
+  npm install
+  npm run build
+  ```
+  2. "The rest" is a C# based codebase, which is mostly ASP.NET MVC based. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
+
+To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.
+
+  * [The AngularJS based backoffice files](https://our.umbraco.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
+  * [The C# application](https://our.umbraco.com/apidocs/csharp/)
+
+### Which branch should I target for my contributions?
+
+We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `v8/dev`. Whatever the default is, that's where we'd like you to target your contributions.
+
+![Which branch should I target?](img/defaultbranch.png)
+
+### Making changes after the PR was opened
+
+If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
+
+### Keeping your Umbraco fork in sync with the main repository
+
+We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
+
+Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
+
+To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
+
+```
+git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
+```
+
+Then when you want to get the changes from the main repository:
+
+```
+git fetch upstream
+git rebase upstream/v8/dev
+```
+
+In this command we're syncing with the `v8/dev` branch, but you can of course choose another one if needed.
+
+(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
@@ -1,162 +0,0 @@
-# Contributing in detail
-
-There's more than one way to contribute to Umbraco, there's some more suggestions below.
-
-When contributing code to Umbraco there's plenty of things you'll want to know, skip down to [What should I know before I get started](#what-should-i-know-before-i-get-started) for the answers to your burning questions.
-
-#### Table Of Contents
-
-[How Can I Contribute?](#how-can-i-contribute)
-  * [Reporting Bugs](#reporting-bugs)
-  * [Suggesting Enhancements](#suggesting-enhancements)
-  * [Your First Code Contribution](#your-first-code-contribution)
-  * [Pull Requests](#pull-requests)
-
-[Styleguides](#styleguides)
-
-[What should I know before I get started?](#what-should-i-know-before-i-get-started)
-  * [Working with the source code](#working-with-the-source-code)
-  * [What branch should I target for my contributions?](#what-branch-should-i-target-for-my-contributions)
-  * [Building Umbraco from source code](#building-umbraco-from-source-code)
-  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
-
-## How Can I Contribute?
-
-### Reporting Bugs
-This section guides you through submitting a bug report for Umbraco CMS. Following these guidelines helps maintainers and the community understand your report 📝, reproduce the behavior 💻 💻, and find related reports 🔎.
-
-Before creating bug reports, please check [this list](#before-submitting-a-bug-report) as you might find out that you don't need to create one. When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](https://github.com/umbraco/Umbraco-CMS/issues/new/choose), the information it asks for helps us resolve issues faster.
-
-> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
-
-##### Before Submitting A Bug Report
-
-  * Most importantly, check **if you can reproduce the problem** in the [latest version of Umbraco](https://our.umbraco.com/download/). We might have already fixed your particular problem.
-  * It also helps tremendously to check if the issue you're experiencing is present in **a clean install** of the Umbraco version you're currently using. Custom code can have side-effects that don't occur in a clean install.
-  * **Use the Google**. Whatever you're experiencing, Google it plus "Umbraco" - usually you can get some pretty good hints from the search results, including open issues and further troubleshooting hints.
-  * If you do find and existing issue has **and the issue is still open**, add a comment to the existing issue if you have additional information. If you have the same problem and no new info to add, just "star" the issue.
-
-Explain the problem and include additional details to help maintainers reproduce the problem. The following is a long description which we've boiled down into a few very simple questions in the issue tracker when you create a new issue. We're listing the following hints to indicate that the most successful reports usually have a lot of this ground covered:
-
-  * **Use a clear and descriptive title** for the issue to identify the problem.
-  * **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining which steps you took in the backoffice to get to a certain undesireable result, e.g. you created a document type, inherting 3 levels deep, added a certain datatype, tried to save it and you got an error.
-  * **Provide specific examples to demonstrate the steps**. If you wrote some code, try to provide a code sample as specific as possible to be able to reproduce the behavior.
-  * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
-  * **Explain which behavior you expected to see instead and why.**
-
-Provide more context by answering these questions:
-
-  * **Can you reproduce the problem** when `debug="false"` in your `web.config` file?
-  * **Did the problem start happening recently** (e.g. after updating to a new version of Umbraco) or was this always a problem?
-  * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
-
-Include details about your configuration and environment:
-
-  * **Which version of Umbraco are you using?**
-  * **What is the environment you're using Umbraco in?** Is this a problem on your local machine or on a server. Tell us about your configuration: Windows version, IIS/IISExpress, database type, etc.
-  * **Which packages do you have installed?**
-
-### Suggesting Enhancements
-
-This section guides you through submitting an enhancement suggestion for Umbraco, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion 📝 and find related suggestions 🔎.
-
-Most of the suggestions in the [reporting bugs](#reporting-bugs) section also count for suggesting enhancements.
-
-Some additional hints that may be helpful:
-
-  * **Include screenshots and animated GIFs** which help you demonstrate the steps or point out the part of Umbraco which the suggestion is related to.
-  * **Explain why this enhancement would be useful to most Umbraco users** and isn't something that can or should be implemented as a [community package](https://our.umbraco.com/projects/).
-
-### Your First Code Contribution
-
-Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` and issues](https://issues.umbraco.org/issues?q=&project=U4&tagValue=upforgrabs&release=&issueType=&search=search) or on the [new issue tracker](https://github.com/umbraco/Umbraco-CMS/issues?q=is%3Aopen+is%3Aissue+label%3Acommunity%2Fup-for-grabs).
-
-### Pull Requests
-
-The most successful pull requests usually look a like this:
-
-  * Fill in the required template
-  * Include screenshots and animated GIFs in your pull request whenever possible.
-  * Unit tests, while optional are awesome, thank you!
-  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated
-
-Again, these are guidelines, not strict requirements.
-
-## Making changes after the PR was opened
-
-If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
-
-## Styleguides
-
-To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
-
-That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
-
-## What should I know before I get started?
-
-### Working with the source code
-
-Some parts of our source code is over 10 years old now. And when we say "old", we mean "mature" of course!
-
-There's two big areas that you should know about:
-
-  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
-  You may need to run the following commands to set up gulp properly:
-  ```
-  npm cache clean
-  npm install -g gulp
-  npm install -g gulp-cli
-  npm install
-  gulp build
-  ```
-  2. "The rest" is a C# based codebase, with some traces of our WebForms past but mostly ASP.NET MVC based these days. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
-
-To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.
-
-  * [The AngularJS based backoffice files](https://our.umbraco.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
-  * [The rest](https://our.umbraco.com/apidocs/csharp/)
-
-### What branch should I target for my contributions?
-
-We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `dev-v7`. Whatever the default is, that's where we'd like you to target your contributions.
-
-![What branch do you want me to target?](img/defaultbranch.png)
-
-### Building Umbraco from source code
-
-In order to build the Umbraco source code locally, first make sure you have the following installed.
-
-  * Visual Studio 2017 v15.3+
-  * Node v10+ (Installed via `build.bat` script. If you already have it installed, make sure you're running at least v10)
-  * npm v6.4.1+ (Installed via `build.bat` script. If you already have it installed, make sure you're running at least v6.4.1)
-
-The easiest way to get started is to run `build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.
-
-Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.3 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
-
-![Gulp build in Visual Studio](img/gulpbuild.png)
-
-After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser, follow the directions there to get a working Umbraco install up and running.
-
-### Keeping your Umbraco fork in sync with the main repository
-
-We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
-
-Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
-
-To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
-
-```
-git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
-```
-
-Then when you want to get the changes from the main repository:
-
-```
-git fetch upstream
-git rebase upstream/dev-v7
-```
-
-In this command we're syncing with the `dev-v7` branch, but you can of course choose another one if needed.
-
-(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
@@ -1,33 +0,0 @@
-# Contributing to Umbraco CMS
-
-When you’re considering creating a pull request for Umbraco CMS, we will categorize them in two different sizes, small and large.
-
-The process for both sizes is very similar, as [explained in the contribution document](CONTRIBUTING.md#how-do-i-begin).
-
-## Small PRs
-Bug fixes and small improvements - can be recognized by seeing a small number of changes and possibly a small number of new files.
-
-We’re usually able to handle small PRs pretty quickly. A community volunteer will do the initial review and flag it for Umbraco HQ as “community tested”. If everything looks good, it will be merged pretty quickly [as per the described process](REVIEW_PROCESS.md).
-
-### Up for grabs
-
-Umbraco HQ will regularly mark newly created issues on the issue tracker with the `Up for grabs` tag. This means that the proposed changes are wanted in Umbraco but the HQ does not have the time to make them at this time. These issues are usually small enough to fit in the "Small PRs" category and we encourage anyone to pick them up and help out.  
-
-If you do start working on something, make sure to leave a small comment on the issue saying something like: "I'm working on this". That way other people stumbling upon the issue know they don't need to pick it up, someone already has.
-
-## Large PRs
-New features and large refactorings - can be recognized by seeing a large number of changes, plenty of new files, updates to package manager files (NuGet’s packages.config, NPM’s packages.json, etc.).  
-
-We would love to follow the same process for larger PRs but this is not always possible due to time limitations and priorities that need to be aligned. We don’t want to put up any barriers, but this document should set the correct expectations.  
-
-Please make sure to describe your idea in an issue, it helps to put in mockup screenshots or videos.  
-
-If the change makes sense for HQ to include in Umbraco CMS we will leave you some feedback on how we’d like to see it being implemented. 
-
-If a larger pull request is encouraged by Umbraco HQ, the process will be similar to what is described in the [small PRs process](#small-prs) above, we’ll get feedback to you within 14 days. Finalizing and merging the PR might take longer though as it will likely need to be picked up by the development team to make sure everything is in order. We’ll keep you posted on the progress.
-
-### Pull request or package?
-
-If it doesn’t fit in CMS right now, we will likely encourage you to make it into a package instead. A package is a great way to check out popularity of a feature, learn how people use it, validate good usability and to fix bugs.  
-
-Eventually, a package could "graduate" to be included in the CMS.  
@@ -2,11 +2,20 @@

 - [ ] I have added steps to test this contribution in the description below

-If there's an existing issue for this PR then this fixes: <!-- link to the issue here! -->
+If there's an existing issue for this PR then this fixes <!-- link to the issue here! -->

 ### Description
-<!-- A description of the changes proposed in the pull-request and how to test these changes -->
+<!-- 
+    A description of the changes proposed in the pull-request and how to test these changes.

+    The most successful pull requests usually look a like this:
+
+    * Fill in this template with details: what did you do, why did you do it, how can we test the changes?
+    * Include screenshots and animated GIFs in your pull request whenever possible.
+    * Unit tests, while optional are awesome, thank you!
+
+    While these are guidelines and not strict requirements, they really help us evaluate your PR quicker.
+-->


 <!-- Thanks for contributing to Umbraco CMS! -->
@@ -1,62 +1,40 @@
-_You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
-[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
-
-_Looking for Umbraco version 7? [Click here](https://github.com/umbraco/Umbraco-CMS) to go to the v7 branch._
-
-_Ready to try out Version 8? [See the quick start guide](V8_GETTING_STARTED.md)._
-
-When is Umbraco 8 coming?
-=========================
-When it's ready. We're done with the major parts of the architecture work and are focusing on three separate tracks to prepare Umbraco 8 for release:
-1) Editor Track (_currently in progress_). Without editors, there's no market for Umbraco. So we want to make sure that Umbraco 8 is full of love for editors.
-2) Partner Track. Without anyone implementing Umbraco, there's nothing for editors to update. So we want to make sure that Umbraco 8 is a joy to implement
-3) Contributor Track. Without our fabulous ecosystem of both individual Umbracians and 3rd party ISVs, Umbraco wouldn't be as rich a platform as it is today. We want to make sure that it's easy, straight forward and as backwards-compatible as possible to create packages for Umbraco
-
-Once a track is done, we start releasing previews where we ask people to test the features we believe are ready. While the testing is going on and we gather feedback, we move on to the next track. This doesn't mean that there hasn't already been work done in the area, but that a track focuses on finalizing, polishing and preparing the features for release.
-
-Umbraco CMS
-===========
-The friendliest, most flexible and fastest growing ASP.NET CMS, and used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
-
-[![ScreenShot](img/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.
-
-## Watch an introduction video
-
-[![ScreenShot](https://shop.umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
-
-## Umbraco - The Friendly 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 - and 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, right out of the box.
-
-Umbraco is not only loved by developers, but is a content editor's dream. Enjoy intuitive editing tools, media management, responsive views, and approval workflows to send your content live.
-
-Used by more than 443,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scalable. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 220,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay.
-
-To view more examples, please visit [https://umbraco.com/case-studies-testimonials/](https://umbraco.com/case-studies-testimonials/)
-
-## 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.
-
-## Trying out Umbraco CMS
-
-[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet, with full support for all your custom .NET code and integrations. You're up and running in less than a minute, and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14-day trial, no credit card needed.
-
-If you want to DIY, you can [download Umbraco](https://our.umbraco.com/download) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host it yourself, and handling deployments and upgrades will be all up to you.
-
-## Community
-
-Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.com). Our Umbraco features forums for questions and answers, documentation, downloadable plugins for Umbraco, and a rich collection of community resources.
-
-## 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](CONTRIBUTING.md).
-
-## 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](CONTRIBUTING_DETAILED.md#reporting-bugs).
-
-You can comment and report issues on the [github issue tracker](https://github.com/umbraco/Umbraco-CMS/issues).
-Since [September 2018](https://umbraco.com/blog/a-second-take-on-umbraco-issue-tracker-hello-github-issues/), the old issue tracker is in read-only mode, but can still be found at [http://issues.umbraco.org](http://issues.umbraco.org).
+# [Umbraco CMS](https://umbraco.com) &middot; [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](../LICENSE.md) [![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=v8/dev)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) [![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
+
+Umbraco is the friendliest, most flexible and fastest growing ASP.NET CMS, and used by more than 500,000 websites worldwide. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
+
+Learn more at [umbraco.com](https://umbraco.com)
+
+<p align="center">
+  <img src="img/logo.png" alt="Umbraco Logo" />
+</p>
+
+See the official [Umbraco website](https://umbraco.com) for an introduction, core mission and values of the product and team behind it.
+
+- [Getting Started](#getting-started)
+- [Documentation](#documentation)
+- [Community](#join-the-umbraco-community)
+- [Contributing](#contributing)
+
+Please also see our [Code of Conduct](CODE_OF_CONDUCT.md).
+
+## Getting Started
+
+[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet, with full support for all your custom .NET code and integrations. You're up and running in less than a minute, and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14-day trial, no credit card needed.
+
+If you want to DIY, you can [download Umbraco]((https://our.umbraco.com/download)) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host it yourself, and handling deployments and upgrades will be all up to you.
+
+## Documentation
+
+The documentation for Umbraco CMS can be found [on Our Umbraco](https://our.umbraco.com/documentation/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions.
+
+## Join the Umbraco community
+
+Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.com/). Our Umbraco features forums for questions and answers, documentation, downloadable plugins for Umbraco, and a rich collection of community resources.
+
+Besides "Our", we all support each other also via Twitter: [Umbraco HQ](https://twitter.com/umbraco), [Release Updates](https://twitter.com/umbracoproject), [#umbraco](https://twitter.com/hashtag/umbraco)
+
+
+## Contributing
+
+Umbraco is contribution-focused and community-driven. If you want to contribute back to the Umbraco source code, please check out our [guide to contributing](CONTRIBUTING.md).
+
@@ -1,25 +0,0 @@
-# Review process
-
-You're an awesome person and have sent us your contribution in the form of a pull request! It's now time to relax for a bit and wait for our response. 
-
-In order to set some expectations, here's what happens next.
-
-## Review process
-
-You will get an initial reply within 48 hours (workdays) to acknowledge that we’ve seen your PR and we’ll pick it up as soon as we can.
-
-You will get feedback within at most 14 days after opening the PR. You’ll most likely get feedback sooner though. Then there are a few possible outcomes:
-
- Your proposed change is awesome! We merge it in and it will be included in the next minor release of Umbraco
- If the change is a high priority bug fix, we will cherry-pick it into the next patch release as well so that we can release it as soon as possible
- Your proposed change is awesome but needs a bit more work, we’ll give you feedback on the changes we’d like to see
- Your proposed change is awesome but.. not something we’re looking to include at this point. We’ll close your PR and the related issue (we’ll be nice about it!)
-
-## Are you still available?
-
-We understand you have other things to do and can't just drop everything to help us out.   
-So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.  
-
-If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.  
-
-There will be times that we really like your proposed changes and we’ll finish the final improvements we’d like to see ourselves. You still get the credits and your commits will live on in the git repository.
@@ -1,37 +0,0 @@
-## A quick start guide for getting up and runnning with Umbraco v8
-
-### What you need:
-
-* [Visual Studio 2017 Community (Free)](https://www.visualstudio.com/vs/community/), or Professional, Enterprise, etc... _(**Minimum of Version 15.7** or higher, this is important, you WILL get issues with lesser versions)_
-* .NET Framework 4.7.2 installed, get it here: https://www.microsoft.com/net/download/thank-you/net472?survey=false
-* .NET Framework 4.7.2 developer pack, get it here: https://www.microsoft.com/net/download/thank-you/net472-developer-pack _(be sure this is the ENU file which will be named `NDP472-DevPack-ENU.exe`)_
-* Clone the Umbraco repository using the `temp8` branch. If your git client doesn't support specifying the branch as you clone then use the command `git clone --single-branch -b temp8 <your fork url>`. _(If you clone the repo using the default v7 branch and then checkout the `temp8` branch you **might** get problems)_
-
-### Start the solution
-
-* Open the `/src/umbraco.sln` Visual Studio solution
-* Start the solution (easiest way is to use `ctrl + F5`)
-* When the solution is first built this may take some time since it will restore all nuget and npm packages, build the .net solution and also build the angular solution
-* When the website starts you'll see the Umbraco installer and just follow the prompts
-* You're all set!
-
-### Want to run from a zip instead?
-
-If you just want to try out a few things, you can run the site from a zip file which you can download from here https://github.com/umbraco/Umbraco-CMS/releases/tag/temp8-cg18. 
-
-We recommend running the site with the Visual Studio since you'll be able to remain up to date with the latest source code changes.
-
-### Making code changes
-
-* _[The process for making code changes in v8 is the same as v7](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md)_
-* Any .NET changes you make you just need to compile
-* Any Angular/JS changes you make you will need to make sure you are running the Gulp build. Easiest way to do this is from within Visual Studio in the `Task Runner Explorer`. You can find this window by pressing `ctrl + q` and typing in `Task Runner Explorer`. In this window you'll see all Gulp tasks, double click on the `dev` task, this will compile the angular solution and start a file watcher, then any html/js changes you make are automatically built.  
-* When making js changes, you should have the chrome developer tools open to ensure that cache is disabled
-* If you are only making C# changes and are not touching the UI code at all, you can significantly speed up the VS build by adding an empty file specifically called `~/src/preserve.belle`. The UI (Belle) build will then be skipped during a Rebuild.
-
-### What to work on?
-
-We are keeping track of [known issues and limitations here](http://issues.umbraco.org/issue/U4-11279). These line items will eventually be turned into actual tasks to be worked on. Feel free to help us keep this list updated if you find issues and even help fix some of these items. If there is a particular item you'd like to help fix please mention this on the task and we'll create a sub task for the item to continue discussion there.
-
-There's [a list of tasks for v8 that haven't been completed](https://github.com/umbraco/Umbraco-CMS/labels/release%2F8.0.0). If you are interested in helping out with any of these please mention this on the task. This list will be constantly updated as we begin to document and design some of the other tasks that still need to get done.
-
@@ -1,160 +1,164 @@
-#
-# Umbraco Cms Git Ignore
-#
-
-# common files
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*.orig
-*.suo
-*.vs10x
-*.ndproj
+#
+# Umbraco Cms Git Ignore
+#
+
+# common files
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*.orig
+*.suo
+*.vs10x
+*.ndproj
 *.ignorer.*
-
-# common directories
-.DS_Store
-._.DS_Store
-.vs/
-/local/
-
-# build directories
-[Bb]in/
-[Db]ebug*/
-[Rr]elease*/
-obj/
-
-# tools
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-tools/NDepend/
-
-
-
-
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-[sS]ource
-[sS]andbox
-umbraco.config
-App_Data/TEMP/*
-[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
-[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
-[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
-[Uu]mbraco/[Pp]resentation/[Ff]onts/*
-[Uu]mbraco/[Pp]resentation/[Cc]ss/*
-
-src/Umbraco.Web.UI/[Cc]ss/*
-src/Umbraco.Web.UI/App_Code/*
-src/Umbraco.Web.UI/App_Data/*
-src/Umbraco.Tests/App_Data/*
-src/Umbraco.Web.UI/[Mm]edia/*
-src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
-src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
-!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
-src/Umbraco.Web.UI/[Xx]slt/*
-src/Umbraco.Web.UI/[Ii]mages/*
-src/Umbraco.Web.UI/[Ss]cripts/*
-src/Umbraco.Web.UI/Web.*.config.transformed
-
-umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
-umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
-
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/[Vv]iews/*.cshtml
-src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
-src/Umbraco.Web.UI/[Vv]iews/*
-src/packages/
-src/packages/repositories.config
-
-src/Umbraco.Web.UI/[Ww]eb.config
-*.transformed
-
-node_modules
-lib-bower
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/*.loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
-
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-src/Umbraco.Web.UI.Client/vwd.webinfo
-
-src/Umbraco.Web.UI/App_Plugins/*
-src/*.psess
-src/*.vspx
-
-NDependOut/*
-QueryResult.htm
-
-src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
-src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
-src/Umbraco.Web.UI/[Uu]mbraco/plugins/*
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/Umbraco.Web.UI.Client/bower_components/*
-/src/Umbraco.Web.UI/[Uu]mbraco/preview
-/src/Umbraco.Web.UI/[Uu]mbraco/preview.old
-
-# ignore rule for clearing out Belle (avoid rebuilding all the time)
-preserve.belle
-
-#Ignore Rule for output of generated documentation files from Grunt docserve
-src/Umbraco.Web.UI.Client/docs/api
-src/*.boltdata/
-src/umbraco.sln.ide/*
-src/.vs/
-
-src/Umbraco.Web.UI/[Jj]s/*
-src/Umbraco.Tests/[Mm]edia
-tools/docfx/*
-apidocs/_site/*
-src/*/project.lock.json
-src/.idea/*
-
-apidocs/api/*
-build/docs.zip
-build/ui-docs.zip
-build/csharp-docs.zip
-src/packages/
-src/PrecompiledWeb/*
-
-# build
-build.out/
-build.tmp/
-build/hooks/
-build/temp/
-
-
-
+
+# common directories
+.DS_Store
+._.DS_Store
+.vs/
+/local/
+
+# build directories
+[Bb]in/
+[Db]ebug*/
+[Rr]elease*/
+obj/
+
+# tools
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+tools/NDepend/
+
+
+
+
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+[sS]ource
+[sS]andbox
+umbraco.config
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+src/Umbraco.Web.UI/[Cc]ss/*
+src/Umbraco.Web.UI/App_Code/*
+src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Tests/App_Data/*
+src/Umbraco.Web.UI/[Mm]edia/*
+src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
+src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
+!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
+src/Umbraco.Web.UI/[Xx]slt/*
+src/Umbraco.Web.UI/[Ii]mages/*
+src/Umbraco.Web.UI/[Ss]cripts/*
+src/Umbraco.Web.UI/Web.*.config.transformed
+
+umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
+umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+
+src/Umbraco.Tests/config/applications.config
+src/Umbraco.Tests/config/trees.config
+src/Umbraco.Web.UI/web.config
+src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config
+src/Umbraco.Web.UI/[Cc]onfig/serilog.config
+src/Umbraco.Web.UI/[Cc]onfig/serilog.user.config
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+
+node_modules
+lib-bower
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/*.loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+
+src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+src/Umbraco.Web.UI.Client/vwd.webinfo
+
+src/Umbraco.Web.UI/App_Plugins/*
+src/*.psess
+src/*.vspx
+
+NDependOut/*
+QueryResult.htm
+
+src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
+src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
+src/Umbraco.Web.UI/[Uu]mbraco/plugins/*
+build/ApiDocs/*
+build/ApiDocs/Output/*
+src/Umbraco.Web.UI.Client/bower_components/*
+/src/Umbraco.Web.UI/[Uu]mbraco/preview
+/src/Umbraco.Web.UI/[Uu]mbraco/preview.old
+
+# ignore rule for clearing out Belle (avoid rebuilding all the time)
+preserve.belle
+
+#Ignore Rule for output of generated documentation files from Grunt docserve
+src/Umbraco.Web.UI.Client/docs/api
+src/*.boltdata/
+src/umbraco.sln.ide/*
+src/.vs/
+
+src/Umbraco.Web.UI/[Jj]s/*
+src/Umbraco.Tests/[Mm]edia
+tools/docfx/*
+apidocs/_site/*
+src/*/project.lock.json
+src/.idea/*
+
+apidocs/api/*
+build/docs.zip
+build/ui-docs.zip
+build/csharp-docs.zip
+src/packages/
+src/PrecompiledWeb/*
+
+# build
+build.out/
+build.tmp/
+build/hooks/
+build/temp/
+
+
+
 # eof
+/src/Umbraco.Web.UI.Client/TESTS-*.xml
+/src/ApiDocs/api/*
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="3.4.4">
+    <metadata minClientVersion="4.1.0">
        <id>UmbracoCms.Core</id>
        <version>8.0.0</version>
        <title>Umbraco Cms Core Binaries</title>
@@ -14,6 +14,7 @@
        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
        <language>en-US</language>
        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
        <dependencies>

            <group targetFramework="net472">
@@ -22,7 +23,6 @@
                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
                  not want this to happen as the alpha of the next major is, really, the next major already.
                -->
-                <dependency id="AutoMapper" version="[8.0.0,8.999999)" />
                <dependency id="LightInject" version="[5.4.0,5.999999)" />
                <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
                <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
@@ -40,10 +40,12 @@
                <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
                <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
                <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
+                <dependency id="Serilog.Sinks.Map" version="[1.0.0,1.999999)" />
+                <dependency id="Serilog.Sinks.Async" version="[1.3.0,1.999999)" />
                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
                <dependency id="NPoco" version="[3.9.4,3.999999)" />
            </group>
-            
+
        </dependencies>
    </metadata>
    <files>
@@ -51,10 +53,9 @@
        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />

        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net472\Umbraco.Core.xml" />

        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
-        <file src="$BuildTmp$\..\src\Umbraco.Core\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib\net472\Umbraco.Core.pdb" />
    </files>
 </package>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="3.4.4">
+    <metadata minClientVersion="4.1.0">
        <id>UmbracoCms.Web</id>
        <version>8.0.0</version>
        <title>Umbraco Cms Core Binaries</title>
@@ -14,6 +14,7 @@
        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
        <language>en-US</language>
        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
        <dependencies>

            <group targetFramework="net472">
@@ -27,9 +28,9 @@
                <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
                <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
                <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.0-beta078,1.999999)" />
+                <dependency id="Examine" version="[1.0.0,1.999999)" />
                <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
-                <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
+                <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
                <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
                <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
                <dependency id="Markdown" version="[2.2.1,2.999999)" />
@@ -43,7 +44,7 @@
                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />

            </group>
-            
+
        </dependencies>
    </metadata>
    <files>
@@ -53,14 +54,12 @@
        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />

        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\Umbraco.Web.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\Umbraco.Examine.xml" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\net472\Umbraco.Web.xml" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net472\Umbraco.Web.UI.xml" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\net472\Umbraco.Examine.xml" />

        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib" />
-        <file src="$BuildTmp$\..\src\Umbraco.Web\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
-        <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib" />
-        <file src="$BuildTmp$\..\src\Umbraco.Examine\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Examine" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib\net472\Umbraco.Web.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib\net472\Umbraco.Examine.pdb" />
    </files>
 </package>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="3.4.4">
+    <metadata minClientVersion="4.1.0">
        <id>UmbracoCms</id>
        <version>8.0.0</version>
        <title>Umbraco Cms</title>
@@ -14,6 +14,7 @@
        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
        <language>en-US</language>
        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
        <dependencies>

            <group targetFramework="net472">
@@ -25,15 +26,15 @@
                  not want this to happen as the alpha of the next major is, really, the next major already.
                -->
                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.37]" />
-                <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
-                <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
+                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.1.0]" />
+                <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
+                <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
                <dependency id="Microsoft.Net.Compilers" version="[2.10.0,2.999999)" />

            </group>

-            
+
        </dependencies>
    </metadata>
    <files>
@@ -58,6 +59,7 @@
        <!-- config transforms -->
        <!-- beware! config transforms not supported by PackageReference -->
        <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
+        <file src="tools\serilog.config.install.xdt" target="Content\config\serilog.config.install.xdt" />
        <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.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" /> <!-- FIXME: Content\ !! and then... transform?! -->
@@ -1,12 +1,13 @@

-  _    _ __  __ ____  _____           _____ ____
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \
- | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
- | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
- | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/
+                       888                                         
+                       888                                         
+888  888 88888b.d88b.  88888b.  888d888  8888b.   .d8888b  .d88b.  
+888  888 888 "888 "88b 888 "88b 888P"       "88b d88P"    d88""88b 
+888  888 888  888  888 888  888 888     .d888888 888      888  888 
+Y88b 888 888  888  888 888 d88P 888     888  888 Y88b.    Y88..88P 
+ "Y88888 888  888  888 88888P"  888     "Y888888  "Y8888P  "Y88P"  

----------------------------------------------------
+------------------------------------------------------------------

 Don't forget to build!

@@ -8,7 +8,7 @@
    </configSections>

    <system.web.webPages.razor>
-        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(factoryType)" xdt:Transform="SetAttributes(factoryType)" />
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(factoryType)" xdt:Transform="SetAttributes(factoryType)" />
        <pages pageBaseType="System.Web.Mvc.WebViewPage">
            <namespaces>
                <add namespace="Umbraco.Web.PublishedContentModels" xdt:Transform="InsertIfMissing" />
@@ -18,13 +18,13 @@

    <system.web>
        <pages
-          pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-          pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-          userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+          userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
        xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)"
        xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
            <controls>
-                <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" xdt:Locator="Match(namespace)" xdt:Transform="SetAttributes(assembly)" />
+                <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" xdt:Locator="Match(namespace)" xdt:Transform="SetAttributes(assembly)" />
            </controls>
        </pages>
    </system.web>
@@ -126,45 +126,55 @@
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
    </assemblyBinding>
  </runtime>

-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-        </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+ <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>

  <system.web.webPages.razor xdt:Transform="Remove" />

@@ -1,93 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-
-Write-Host "installPath:" "${installPath}"
-Write-Host "toolsPath:" "${toolsPath}"
-
-Write-Host " "
-
-if ($project) {
-	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
-
-	# Create paths and list them
-	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
-	Write-Host "projectPath:" "${projectPath}"		
-	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
-	Write-Host "backupPath:" "${backupPath}"		
-	$copyLogsPath = Join-Path $backupPath "CopyLogs"
-	Write-Host "copyLogsPath:" "${copyLogsPath}"			
-	$umbracoBinFolder = Join-Path $projectPath "bin"
-	Write-Host "umbracoBinFolder:" "${umbracoBinFolder}"		
-
-	# Create backup folder and logs folder if it doesn't exist yet
-	New-Item -ItemType Directory -Force -Path $backupPath
-	New-Item -ItemType Directory -Force -Path $copyLogsPath
-	
-	# After backing up, remove all umbraco dlls from bin folder in case dll files are included in the VS project
-	# See: http://issues.umbraco.org/issue/U4-4930
-	
-	if(Test-Path $umbracoBinFolder) {
-		$umbracoBinBackupPath = Join-Path $backupPath "bin"
-		
-		New-Item -ItemType Directory -Force -Path $umbracoBinBackupPath
-		
-		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
-		
-		# Delete files Umbraco ships with
-		if(Test-Path $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll) { Remove-Item $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.Web.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.Core.dll) { Remove-Item $umbracoBinFolder\Umbraco.Core.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Umbraco.Examine.dll) { Remove-Item $umbracoBinFolder\Umbraco.Examine.dll -Force -Confirm:$false }
-		
-		# Delete files Umbraco depends upon
-		$amd64Folder = Join-Path $umbracoBinFolder "amd64"
-		if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false }
-		$x86Folder = Join-Path $umbracoBinFolder "x86"
-		if(Test-Path $x86Folder) { Remove-Item $x86Folder -Force -Recurse -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\AutoMapper.dll) { Remove-Item $umbracoBinFolder\AutoMapper.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\AutoMapper.Net4.dll) { Remove-Item $umbracoBinFolder\AutoMapper.Net4.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\ClientDependency.Core.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\ClientDependency.Core.Mvc.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.Mvc.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\CookComputing.XmlRpcV2.dll) { Remove-Item $umbracoBinFolder\CookComputing.XmlRpcV2.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Examine.dll) { Remove-Item $umbracoBinFolder\Examine.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\HtmlAgilityPack.dll) { Remove-Item $umbracoBinFolder\HtmlAgilityPack.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\ICSharpCode.SharpZipLib.dll) { Remove-Item $umbracoBinFolder\ICSharpCode.SharpZipLib.dll -Force -Confirm:$false }
-		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 }
-		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Owin.dll) { Remove-Item $umbracoBinFolder\Owin.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\Semver.dll) { Remove-Item $umbracoBinFolder\Semver.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Collections.Immutable.dll) { Remove-Item $umbracoBinFolder\System.Collections.Immutable.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Reflection.Metadata.dll) { Remove-Item $umbracoBinFolder\System.Reflection.Metadata.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Net.Http.Extensions.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Extensions.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Net.Http.Primitives.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Primitives.dll -Force -Confirm:$false }	
-		if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.Razor.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.WebPages.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Deployment.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Deployment.dll -Force -Confirm:$false }
-		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Razor.dll -Force -Confirm:$false }		
-	}
-}
@@ -11,38 +11,27 @@ if ($project) {
 	# Create paths and list them
 	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
 	Write-Host "projectPath:" "${projectPath}"
-	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
-	Write-Host "backupPath:" "${backupPath}"
-	$copyLogsPath = Join-Path $backupPath "CopyLogs"
-	Write-Host "copyLogsPath:" "${copyLogsPath}"	
 	$webConfigSource = Join-Path $projectPath "Web.config"
 	Write-Host "webConfigSource:" "${webConfigSource}"
 	$configFolder = Join-Path $projectPath "Config"
 	Write-Host "configFolder:" "${configFolder}"

-	# Create backup folder and logs folder if it doesn't exist yet
-	New-Item -ItemType Directory -Force -Path $backupPath
-	New-Item -ItemType Directory -Force -Path $copyLogsPath
-	
-	# Create a backup of original web.config
-	Copy-Item $webConfigSource $backupPath -Force
-	
-	# Backup config files folder	
-	if(Test-Path $configFolder) {
-		$umbracoBackupPath = Join-Path $backupPath "Config"
-		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
-		
-		robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
-	}
-	
 	# Copy umbraco and umbraco_files from package to project folder
 	$umbracoFolder = Join-Path $projectPath "Umbraco"
-	New-Item -ItemType Directory -Force -Path $umbracoFolder
+	New-Item -ItemType Directory -Force -Path $umbracoFolder	
 	$umbracoFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco"		
-	$umbracoBackupPath = Join-Path $backupPath "Umbraco"
-	New-Item -ItemType Directory -Force -Path $umbracoBackupPath		
-	robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
-	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
+
+    Write-Host "copying files to $umbracoFolder ..."
+    # see https://support.microsoft.com/en-us/help/954404/return-codes-that-are-used-by-the-robocopy-utility-in-windows-server-2
+    robocopy $umbracoFolderSource $umbracoFolder /is /it /e
+    if (($lastexitcode -eq 1) -or ($lastexitcode -eq 3) -or ($lastexitcode -eq 5) -or ($lastexitcode -eq 7))
+    {
+        write-host "Copy succeeded!"
+    }
+    else
+    {
+        write-host "Copy failed with exit code:" $lastexitcode
+    }

 	$copyWebconfig = $true
 	$destinationWebConfig = Join-Path $projectPath "Web.config"
@@ -62,7 +51,11 @@ if ($project) {
 				}
 			}
 		} 
-		Catch { }
+		Catch 
+		{ 
+			Write-Host "An error occurred:"
+  			Write-Host $_
+		}
 	}
 	
 	if($copyWebconfig -eq $true) 
@@ -96,15 +89,12 @@ if ($project) {
 		} 
 		Catch 
 		{
-			# Not a big problem if this fails, let it go
+            # Not a big problem if this fails, let it go
+			# Write-Host "An error occurred:"
+  			# Write-Host $_			
 		}
 	}
 	
-	$installFolder = Join-Path $projectPath "Install"
-	if(Test-Path $installFolder) {
-		Remove-Item $installFolder -Force -Recurse -Confirm:$false
-	}
-	
 	# Open appropriate readme
 	if($copyWebconfig -eq $true)  
 	{
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">>
+    <appSettings>
+
+        <add key="serilog:using:File" value="Umbraco.Core" xdt:Transform="SetAttributes(value)" xdt:Locator="Match(key)"/>
+        <add key="serilog:write-to:File.shared" xdt:Transform="Remove" xdt:Locator="Match(key)"/>
+
+    </appSettings>
+</configuration>
@@ -0,0 +1,44 @@
+$uenv=build/build.ps1 -get
+
+$src = "$($uenv.SolutionRoot)\src"
+$tmp = $uenv.BuildTemp
+$out = $uenv.BuildOutput
+$DocFxJson = "$src\ApiDocs\docfx.json"
+$DocFxSiteOutput = "$tmp\_site\*.*"
+
+################ Do the UI docs
+$uenv.CompileBelle()
+
+"Moving to Umbraco.Web.UI.Client folder"
+cd .\src\Umbraco.Web.UI.Client
+
+"Generating the docs and waiting before executing the next commands"
+& gulp docs | Out-Null
+
+# change baseUrl
+$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
+$IndexPath = "./docs/api/index.html"
+(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
+
+# zip it
+& $uenv.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
+
+
+################ Do the c# docs
+
+# Build the solution in debug mode
+$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
+#$uenv.CompileUmbraco()
+
+#restore nuget packages
+$uenv.RestoreNuGet()
+
+# run DocFx
+$DocFx = $uenv.BuildEnv.DocFx
+
+Write-Host "$DocFxJson"
+& $DocFx metadata $DocFxJson
+& $DocFx build $DocFxJson
+
+# zip it
+& $uenv.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
@@ -11,11 +11,21 @@
    [Alias("loc")]
    [switch] $local = $false,

+	# enable docfx
+    [Parameter(Mandatory=$false)]
+    [Alias("doc")]
+    [switch] $docfx = $false,
+
    # keep the build directories, don't clear them
    [Parameter(Mandatory=$false)]
    [Alias("c")]
    [Alias("cont")]
-    [switch] $continue = $false
+    [switch] $continue = $false,
+
+    # execute a command
+    [Parameter(Mandatory=$false, ValueFromRemainingArguments=$true)]
+    [String[]]
+    $command
  )

  # ################################################################
@@ -26,7 +36,7 @@
  $ubuild = &"$PSScriptRoot\build-bootstrap.ps1"
  if (-not $?) { return }
  $ubuild.Boot($PSScriptRoot,
-    @{ Local = $local; },
+    @{ Local = $local; WithDocFx = $docfx },
    @{ Continue = $continue })
  if ($ubuild.OnError()) { return }

@@ -382,13 +392,13 @@
    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
        -Properties BuildTmp="$($this.BuildTemp)" `
        -Version "$($this.Version.Semver.ToString())" `
-        -Symbols -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Core." }

    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Web.nuspec" `
        -Properties BuildTmp="$($this.BuildTemp)" `
        -Version "$($this.Version.Semver.ToString())" `
-        -Symbols -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." }

    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
@@ -420,6 +430,53 @@
    $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
  })

+  $ubuild.DefineMethod("PrepareCSharpDocs",
+  {
+    Write-Host "Prepare C# Documentation"
+
+    $src = "$($this.SolutionRoot)\src"
+      $tmp = $this.BuildTemp
+      $out = $this.BuildOutput
+    $DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
+    $DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
+
+
+	#restore nuget packages
+	$this.RestoreNuGet()
+    # run DocFx
+    $DocFx = $this.BuildEnv.DocFx
+
+    & $DocFx metadata $DocFxJson
+    & $DocFx build $DocFxJson
+
+    # zip it
+    & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
+  })
+
+  $ubuild.DefineMethod("PrepareAngularDocs",
+  {
+    Write-Host "Prepare Angular Documentation"
+
+    $src = "$($this.SolutionRoot)\src"
+      $out = $this.BuildOutput
+
+    $this.CompileBelle()
+
+    "Moving to Umbraco.Web.UI.Client folder"
+    cd .\src\Umbraco.Web.UI.Client
+
+    "Generating the docs and waiting before executing the next commands"
+    & gulp docs | Out-Null
+
+    # change baseUrl
+    $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
+    $IndexPath = "./docs/api/index.html"
+    (Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
+
+    # zip it
+    & $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
+  })
+
  $ubuild.DefineMethod("Build",
  {
    $error.Clear()
@@ -451,6 +508,7 @@
    if ($this.OnError()) { return }
    $this.PostPackageHook()
    if ($this.OnError()) { return }
+
    Write-Host "Done"
  })

@@ -475,7 +533,11 @@
  # run
  if (-not $get)
  {
-    $ubuild.Build()
+    if ($command.Length -eq 0)
+    {
+      $command = @( "Build" )
+    }
+    $ubuild.RunMethod($command);
    if ($ubuild.OnError()) { return }
  }
  if ($get) { return $ubuild }
@@ -2,21 +2,20 @@
  "metadata": [
    {
      "src": [
-        {
+        { 
+          "src": "../",
          "files": [
            "Umbraco.Core/Umbraco.Core.csproj",
            "Umbraco.Web/Umbraco.Web.csproj"
          ],
          "exclude": [
            "**/obj/**",
-            "**/bin/**",
-            "_site/**"
-          ],
-          "cwd": "../src"
+            "**/bin/**"
+          ]
        }
      ],
-      "dest": "../apidocs/api",
-      "filter": "../apidocs/docfx.filter.yml"
+      "dest": "api",
+      "filter": "docfx.filter.yml"
    }
  ],
  "build": {
@@ -35,19 +34,7 @@
          "*.md"
        ],
        "exclude": [
-          "obj/**",
-          "_site/**"
-        ]
-      }
-    ],
-    "resource": [
-      {
-        "files": [
-          "images/**"
-        ],
-        "exclude": [
-          "obj/**",
-          "_site/**"
+          "obj/**"
        ]
      }
    ],
@@ -57,8 +44,7 @@
          "**.md"
        ],
        "exclude": [
-          "obj/**",
-          "_site/**"
+          "obj/**"
        ]
      }
    ],
@@ -67,9 +53,9 @@
      "_enableSearch": true,
      "_disableContribution": false
    },
-    "dest": "_site",
+    "dest": "../../build.tmp/_site",
    "template": [
      "default", "umbracotemplate"
    ]
  }
-}
+}
@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]

 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.0.0")]
-[assembly: AssemblyInformationalVersion("8.0.0-alpha.58")]
+[assembly: AssemblyFileVersion("8.1.1")]
+[assembly: AssemblyInformationalVersion("8.1.1")]
@@ -67,31 +67,34 @@ namespace Umbraco.Core
                : new NamedSemaphoreReleaser(_semaphore2);
        }

-        public Task<IDisposable> LockAsync()
-        {
-            var wait = _semaphore != null
-                ? _semaphore.WaitAsync()
-                : _semaphore2.WaitOneAsync();
+        //NOTE: We don't use the "Async" part of this lock at all
+        //TODO: Remove this and rename this class something like SystemWideLock, then we can re-instate this logic if we ever need an Async lock again

-            return wait.IsCompleted
-                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-                : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
-                    this, CancellationToken.None,
-                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        }
+        //public Task<IDisposable> LockAsync()
+        //{
+        //    var wait = _semaphore != null
+        //        ? _semaphore.WaitAsync()
+        //        : _semaphore2.WaitOneAsync();

-        public Task<IDisposable> LockAsync(int millisecondsTimeout)
-        {
-            var wait = _semaphore != null
-                ? _semaphore.WaitAsync(millisecondsTimeout)
-                : _semaphore2.WaitOneAsync(millisecondsTimeout);
+        //    return wait.IsCompleted
+        //        ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+        //        : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
+        //            this, CancellationToken.None,
+        //            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+        //}

-            return wait.IsCompleted
-                ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-                : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
-                    this, CancellationToken.None,
-                    TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        }
+        //public Task<IDisposable> LockAsync(int millisecondsTimeout)
+        //{
+        //    var wait = _semaphore != null
+        //        ? _semaphore.WaitAsync(millisecondsTimeout)
+        //        : _semaphore2.WaitOneAsync(millisecondsTimeout);
+
+        //    return wait.IsCompleted
+        //        ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
+        //        : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
+        //            this, CancellationToken.None,
+        //            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
+        //}

        public IDisposable Lock()
        {
@@ -1,10 +1,10 @@
 using System;
 using System.Reflection;
-using System.Text.RegularExpressions;
 using System.Web;
 using Umbraco.Core;

-[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")]
+// no binding redirect for now = de-activate
+//[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")]

 namespace Umbraco.Core
 {
@@ -18,7 +18,7 @@ namespace Umbraco.Core
            // this only gets called when an assembly can't be resolved
            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
        }
-        
+
        /// <summary>
        /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies
        /// </summary>
@@ -27,14 +27,19 @@ namespace Umbraco.Core
        /// <returns></returns>
        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
        {
+            // When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another.
+
+            // keep here for reference - we don't use AutoMapper
+            /*
            //AutoMapper:
+            // this is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code.
            // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
            // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
            if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null"))
                return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
+            */

            return null;
-
        }
    }
 }
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Web;

 namespace Umbraco.Core.Cache
@@ -110,7 +111,7 @@ namespace Umbraco.Core.Cache

        #region Lock

-        private bool _entered;
+        private const string ContextItemsLockKey = "Umbraco.Core.Cache.HttpRequestCache::LockEntered";

        protected override void EnterReadLock() => EnterWriteLock();

@@ -118,7 +119,13 @@ namespace Umbraco.Core.Cache
        {
            if (HasContextItems)
            {
-                System.Threading.Monitor.Enter(ContextItems.SyncRoot, ref _entered);
+                // note: cannot keep 'entered' as a class variable here,
+                // since there is one per request - so storing it within
+                // ContextItems - which is locked, so this should be safe
+
+                var entered = false;
+                Monitor.Enter(ContextItems.SyncRoot, ref entered);
+                ContextItems[ContextItemsLockKey] = entered;
            }
        }

@@ -126,11 +133,10 @@ namespace Umbraco.Core.Cache

        protected override void ExitWriteLock()
        {
-            if (_entered)
-            {
-                _entered = false;
-                System.Threading.Monitor.Exit(ContextItems.SyncRoot);
-            }
+            var entered = (bool?) ContextItems[ContextItemsLockKey] ?? false;
+            if (entered)
+                Monitor.Exit(ContextItems.SyncRoot);
+            ContextItems.Remove(ContextItemsLockKey);
        }

        #endregion
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Scoping;

 namespace Umbraco.Core.Cache
 {
@@ -13,11 +12,6 @@ namespace Umbraco.Core.Cache

        public static NoCacheRepositoryCachePolicy<TEntity, TId> Instance { get; } = new NoCacheRepositoryCachePolicy<TEntity, TId>();

-        public IRepositoryCachePolicy<TEntity, TId> Scoped(IAppPolicyCache runtimeCache, IScope scope)
-        {
-            throw new NotImplementedException();
-        }
-
        public TEntity Get(TId id, Func<TId, TEntity> performGet, Func<TId[], IEnumerable<TEntity>> performGetAll)
        {
            return performGet(id);
@@ -1,13 +0,0 @@
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Represents a core <see cref="IComposer"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>All core composers are required by (compose before) all user composers,
-    /// and require (compose after) all runtime composers.</para>
-    /// </remarks>
-    [ComposeAfter(typeof(IRuntimeComposer))]
-    public interface ICoreComposer : IComposer
-    { }
-}
@@ -1,11 +0,0 @@
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Represents a runtime <see cref="IComposer"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>All runtime composers are required by (compose before) all core composers</para>
-    /// </remarks>
-    public interface IRuntimeComposer : IComposer
-    { }
-}
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Web;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
@@ -10,7 +11,7 @@ using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Compose
 {
    public sealed class AuditEventsComponent : IComponent
    {
@@ -43,21 +44,22 @@ namespace Umbraco.Core.Components
        public void Terminate()
        { }

+        internal static IUser UnknownUser => new User { Id = Constants.Security.UnknownUserId, Name = Constants.Security.UnknownUserName, Email = "" };
+
        private IUser CurrentPerformingUser
        {
            get
            {
                var identity = Thread.CurrentPrincipal?.GetUmbracoIdentity();
-                return identity == null
-                    ? new User { Id = 0, Name = "SYSTEM", Email = "" }
-                    : _userService.GetUserById(Convert.ToInt32(identity.Id));
+                var user = identity == null ? null : _userService.GetUserById(Convert.ToInt32(identity.Id));
+                return user ?? UnknownUser;
            }
        }

        private IUser GetPerformingUser(int userId)
        {
            var found = userId >= 0 ? _userService.GetUserById(userId) : null;
-            return found ?? new User {Id = 0, Name = "SYSTEM", Email = ""};
+            return found ?? UnknownUser;
        }

        private string PerformingIp
@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Components
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Compose
 {
    public sealed class AuditEventsComposer : ComponentComposer<AuditEventsComponent>, ICoreComposer
    { }
@@ -1,9 +1,10 @@
 using System.IO;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Compose
 {
    public sealed class ManifestWatcherComponent : IComponent
    {
@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Components
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Compose
 {
    [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
    public class ManifestWatcherComposer : ComponentComposer<ManifestWatcherComponent>, ICoreComposer
@@ -3,7 +3,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Compose
 {
    // TODO: This should just exist in the content service/repo!
    public sealed class RelateOnCopyComponent : IComponent
@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Components
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Compose
 {
    [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
    public sealed class RelateOnCopyComposer : ComponentComposer<RelateOnCopyComponent>, ICoreComposer
@@ -5,7 +5,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Compose
 {
    public sealed class RelateOnTrashComponent : IComponent
    {
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Components

        private static void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
        {
-            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContent.ToInvariantString())))
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinContentString)))
            {
                var relationService = Current.Services.RelationService;
                const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias;
@@ -37,7 +37,7 @@ namespace Umbraco.Core.Components

        private static void MediaService_Moved(IMediaService sender, MoveEventArgs<IMedia> e)
        {
-            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMedia.ToInvariantString())))
+            foreach (var item in e.MoveInfoCollection.Where(x => x.OriginalPath.Contains(Constants.System.RecycleBinMediaString)))
            {
                var relationService = Current.Services.RelationService;
                const string relationTypeAlias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias;
@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Components
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Compose
 {
    [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
    public sealed class RelateOnTrashComposer : ComponentComposer<RelateOnTrashComponent>, ICoreComposer
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Represents the collection of <see cref="IComponent"/> implementations.
@@ -24,7 +23,7 @@ namespace Umbraco.Core.Components
        {
            using (_logger.DebugDuration<ComponentCollection>($"Initializing. (log components when >{LogThresholdMilliseconds}ms)", "Initialized."))
            {
-                foreach (var component in this.Reverse()) // terminate components in reverse order
+                foreach (var component in this)
                {
                    var componentType = component.GetType();
                    using (_logger.DebugDuration<ComponentCollection>($"Initializing {componentType.FullName}.", $"Initialized {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Builds a <see cref="ComponentCollection"/>.
@@ -31,7 +30,7 @@ namespace Umbraco.Core.Components

        protected override IComponent CreateItem(IFactory factory, Type itemType)
        {
-            using (_logger.DebugDuration<Composers>($"Creating {itemType.FullName}.", $"Created {itemType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
+            using (_logger.DebugDuration<ComponentCollectionBuilder>($"Creating {itemType.FullName}.", $"Created {itemType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
            {
                return base.CreateItem(factory, itemType);
            }
@@ -1,4 +1,6 @@
-namespace Umbraco.Core.Components
+using Umbraco.Core.Compose;
+
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Provides a base class for composers which compose a component.
@@ -1,6 +1,6 @@
 using System;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Indicates that a composer requires another composer.
@@ -1,6 +1,6 @@
 using System;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Indicates that a component is required by another composer.
@@ -6,7 +6,7 @@ using System.Text;
 using Umbraco.Core.Collections;
 using Umbraco.Core.Logging;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    // note: this class is NOT thread-safe in any ways

@@ -70,7 +70,23 @@ namespace Umbraco.Core.Components
            }
        }

-        private IEnumerable<Type> PrepareComposerTypes()
+        internal IEnumerable<Type> PrepareComposerTypes()
+        {
+            var requirements = GetRequirements();
+
+            // only for debugging, this is verbose
+            //_logger.Debug<Composers>(GetComposersReport(requirements));
+
+            var sortedComposerTypes = SortComposers(requirements);
+
+            // bit verbose but should help for troubleshooting
+            //var text = "Ordered Composers: " + Environment.NewLine + string.Join(Environment.NewLine, sortedComposerTypes) + Environment.NewLine;
+            _logger.Debug<Composers>("Ordered Composers: {SortedComposerTypes}", sortedComposerTypes);
+
+            return sortedComposerTypes;
+        }
+
+        internal Dictionary<Type, List<Type>> GetRequirements(bool throwOnMissing = true)
        {
            // create a list, remove those that cannot be enabled due to runtime level
            var composerTypeList = _composerTypes
@@ -89,25 +105,69 @@ namespace Umbraco.Core.Components
            // enable or disable composers
            EnableDisableComposers(composerTypeList);

-            // sort the composers according to their dependencies
-            var requirements = new Dictionary<Type, List<Type>>();
-            foreach (var type in composerTypeList) requirements[type] = null;
-            foreach (var type in composerTypeList)
+            void GatherInterfaces<TAttribute>(Type type, Func<TAttribute, Type> getTypeInAttribute, HashSet<Type> iset, List<Type> set2)
+                where TAttribute : Attribute
            {
-                GatherRequirementsFromRequireAttribute(type, composerTypeList, requirements);
-                GatherRequirementsFromRequiredByAttribute(type, composerTypeList, requirements);
+                foreach (var attribute in type.GetCustomAttributes<TAttribute>())
+                {
+                    var typeInAttribute = getTypeInAttribute(attribute);
+                    if (typeInAttribute != null && // if the attribute references a type ...
+                        typeInAttribute.IsInterface && // ... which is an interface ...
+                        typeof(IComposer).IsAssignableFrom(typeInAttribute) && // ... which implements IComposer ...
+                        !iset.Contains(typeInAttribute)) // ... which is not already in the list
+                    {
+                        // add it to the new list
+                        iset.Add(typeInAttribute);
+                        set2.Add(typeInAttribute);
+
+                        // add all its interfaces implementing IComposer
+                        foreach (var i in typeInAttribute.GetInterfaces().Where(x => typeof(IComposer).IsAssignableFrom(x)))
+                        {
+                            iset.Add(i);
+                            set2.Add(i);
+                        }
+                    }
+                }
            }

-            // only for debugging, this is verbose
-            //_logger.Debug<Composers>(GetComposersReport(requirements));
+            // gather interfaces too
+            var interfaces = new HashSet<Type>(composerTypeList.SelectMany(x => x.GetInterfaces().Where(y => typeof(IComposer).IsAssignableFrom(y))));
+            composerTypeList.AddRange(interfaces);
+            var list1 = composerTypeList;
+            while (list1.Count > 0)
+            {
+                var list2 = new List<Type>();
+                foreach (var t in list1)
+                {
+                    GatherInterfaces<ComposeAfterAttribute>(t, a => a.RequiredType, interfaces, list2);
+                    GatherInterfaces<ComposeBeforeAttribute>(t, a => a.RequiringType, interfaces, list2);
+                }
+                composerTypeList.AddRange(list2);
+                list1 = list2;
+            }

+            // sort the composers according to their dependencies
+            var requirements = new Dictionary<Type, List<Type>>();
+            foreach (var type in composerTypeList)
+                requirements[type] = null;
+            foreach (var type in composerTypeList)
+            {
+                GatherRequirementsFromAfterAttribute(type, composerTypeList, requirements, throwOnMissing);
+                GatherRequirementsFromBeforeAttribute(type, composerTypeList, requirements);
+            }
+
+            return requirements;
+        }
+
+        internal IEnumerable<Type> SortComposers(Dictionary<Type, List<Type>> requirements)
+        {
            // sort composers
            var graph = new TopoGraph<Type, KeyValuePair<Type, List<Type>>>(kvp => kvp.Key, kvp => kvp.Value);
            graph.AddItems(requirements);
            List<Type> sortedComposerTypes;
            try
            {
-                sortedComposerTypes = graph.GetSortedItems().Select(x => x.Key).ToList();
+                sortedComposerTypes = graph.GetSortedItems().Select(x => x.Key).Where(x => !x.IsInterface).ToList();
            }
            catch (Exception e)
            {
@@ -117,40 +177,37 @@ namespace Umbraco.Core.Components
                throw;
            }

-            // bit verbose but should help for troubleshooting
-            //var text = "Ordered Composers: " + Environment.NewLine + string.Join(Environment.NewLine, sortedComposerTypes) + Environment.NewLine;
-            _logger.Debug<Composers>("Ordered Composers: {SortedComposerTypes}", sortedComposerTypes);
-
            return sortedComposerTypes;
        }

-        private static string GetComposersReport(Dictionary<Type, List<Type>> requirements)
+        internal static string GetComposersReport(Dictionary<Type, List<Type>> requirements)
        {
            var text = new StringBuilder();
            text.AppendLine("Composers & Dependencies:");
+            text.AppendLine("  <  compose before");
+            text.AppendLine("  >  compose after");
+            text.AppendLine("  :  implements");
+            text.AppendLine("  =  depends");
            text.AppendLine();

+            bool HasReq(IEnumerable<Type> types, Type type)
+                => types.Any(x => type.IsAssignableFrom(x) && !x.IsInterface);
+
            foreach (var kvp in requirements)
            {
                var type = kvp.Key;

                text.AppendLine(type.FullName);
                foreach (var attribute in type.GetCustomAttributes<ComposeAfterAttribute>())
-                    text.AppendLine("  -> " + attribute.RequiredType + (attribute.Weak.HasValue
-                        ? (attribute.Weak.Value ? " (weak)" : (" (strong" + (requirements.ContainsKey(attribute.RequiredType) ? ", missing" : "") + ")"))
-                        : ""));
-                foreach (var attribute in type.GetCustomAttributes<ComposeBeforeAttribute>())
-                    text.AppendLine("  -< " + attribute.RequiringType);
-                foreach (var i in type.GetInterfaces())
                {
-                    text.AppendLine("  : " + i.FullName);
-                    foreach (var attribute in i.GetCustomAttributes<ComposeAfterAttribute>())
-                        text.AppendLine("    -> " + attribute.RequiredType + (attribute.Weak.HasValue
-                            ? (attribute.Weak.Value ? " (weak)" : (" (strong" + (requirements.ContainsKey(attribute.RequiredType) ? ", missing" : "") + ")"))
-                            : ""));
-                    foreach (var attribute in i.GetCustomAttributes<ComposeBeforeAttribute>())
-                        text.AppendLine("    -< " + attribute.RequiringType);
+                    var weak = !(attribute.RequiredType.IsInterface ? attribute.Weak == false : attribute.Weak != true);
+                    text.AppendLine("  > " + attribute.RequiredType +
+                        (weak ? " (weak" : " (strong") + (HasReq(requirements.Keys, attribute.RequiredType) ? ", found" : ", missing") + ")");
                }
+                foreach (var attribute in type.GetCustomAttributes<ComposeBeforeAttribute>())
+                    text.AppendLine("  < " + attribute.RequiringType);
+                foreach (var i in type.GetInterfaces())
+                    text.AppendLine("  : " + i.FullName);
                if (kvp.Value != null)
                    foreach (var t in kvp.Value)
                        text.AppendLine("  = " + t);
@@ -221,16 +278,16 @@ namespace Umbraco.Core.Components
                types.Remove(kvp.Key);
        }

-        private static void GatherRequirementsFromRequireAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
+        private static void GatherRequirementsFromAfterAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements, bool throwOnMissing = true)
        {
            // get 'require' attributes
            // these attributes are *not* inherited because we want to "custom-inherit" for interfaces only
-            var requireAttributes = type
+            var afterAttributes = type
                .GetInterfaces().SelectMany(x => x.GetCustomAttributes<ComposeAfterAttribute>()) // those marking interfaces
                .Concat(type.GetCustomAttributes<ComposeAfterAttribute>()); // those marking the composer

            // what happens in case of conflicting attributes (different strong/weak for same type) is not specified.
-            foreach (var attr in requireAttributes)
+            foreach (var attr in afterAttributes)
            {
                if (attr.RequiredType == type) continue; // ignore self-requirements (+ exclude in implems, below)

@@ -238,13 +295,13 @@ namespace Umbraco.Core.Components
                // unless strong, and then require at least one enabled composer implementing that interface
                if (attr.RequiredType.IsInterface)
                {
-                    var implems = types.Where(x => x != type && attr.RequiredType.IsAssignableFrom(x)).ToList();
+                    var implems = types.Where(x => x != type && attr.RequiredType.IsAssignableFrom(x) && !x.IsInterface).ToList();
                    if (implems.Count > 0)
                    {
                        if (requirements[type] == null) requirements[type] = new List<Type>();
                        requirements[type].AddRange(implems);
                    }
-                    else if (attr.Weak == false) // if explicitly set to !weak, is strong, else is weak
+                    else if (attr.Weak == false && throwOnMissing) // if explicitly set to !weak, is strong, else is weak
                        throw new Exception($"Broken composer dependency: {type.FullName} -> {attr.RequiredType.FullName}.");
                }
                // requiring a class = require that the composer is enabled
@@ -256,28 +313,28 @@ namespace Umbraco.Core.Components
                        if (requirements[type] == null) requirements[type] = new List<Type>();
                        requirements[type].Add(attr.RequiredType);
                    }
-                    else if (attr.Weak != true) // if not explicitly set to weak, is strong
+                    else if (attr.Weak != true && throwOnMissing) // if not explicitly set to weak, is strong
                        throw new Exception($"Broken composer dependency: {type.FullName} -> {attr.RequiredType.FullName}.");
                }
            }
        }

-        private static void GatherRequirementsFromRequiredByAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
+        private static void GatherRequirementsFromBeforeAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
        {
            // get 'required' attributes
            // these attributes are *not* inherited because we want to "custom-inherit" for interfaces only
-            var requiredAttributes = type
+            var beforeAttributes = type
                .GetInterfaces().SelectMany(x => x.GetCustomAttributes<ComposeBeforeAttribute>()) // those marking interfaces
                .Concat(type.GetCustomAttributes<ComposeBeforeAttribute>()); // those marking the composer

-            foreach (var attr in requiredAttributes)
+            foreach (var attr in beforeAttributes)
            {
                if (attr.RequiringType == type) continue; // ignore self-requirements (+ exclude in implems, below)

                // required by an interface = by any enabled composer implementing this that interface
                if (attr.RequiringType.IsInterface)
                {
-                    var implems = types.Where(x => x != type && attr.RequiringType.IsAssignableFrom(x)).ToList();
+                    var implems = types.Where(x => x != type && attr.RequiringType.IsAssignableFrom(x) && !x.IsInterface).ToList();
                    foreach (var implem in implems)
                    {
                        if (requirements[implem] == null) requirements[implem] = new List<Type>();
@@ -1,16 +0,0 @@
-using AutoMapper;
-using Umbraco.Core.Components;
-using Umbraco.Core.Models.Identity;
-
-namespace Umbraco.Core.Composing.Composers
-
-{
-    public static class CoreMappingProfilesComposer
-    {
-        public static Composition ComposeCoreMappingProfiles(this Composition composition)
-        {
-            composition.Register<Profile, IdentityMapperProfile>();
-            return composition;
-        }
-    }
-}
@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Represents a composition.
@@ -134,7 +133,11 @@ namespace Umbraco.Core.Components

            Configs.RegisterWith(_register);

-            return _register.CreateFactory();
+            IFactory factory = null;
+            // ReSharper disable once AccessToModifiedClosure -- on purpose
+            _register.Register(_ => factory, Lifetime.Singleton);
+            factory = _register.CreateFactory();
+            return factory;
        }

        /// <summary>
@@ -1,13 +1,11 @@
-using Umbraco.Core.Components;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Configuration.UmbracoSettings;

-namespace Umbraco.Core.Composing.Composers
+namespace Umbraco.Core.Composing.CompositionExtensions
 {
    /// <summary>
    /// Compose configurations.
    /// </summary>
-    public static class ConfigurationComposer
+    public static class Configuration
    {
        public static Composition ComposeConfiguration(this Composition composition)
        {
@@ -0,0 +1,17 @@
+using Umbraco.Core.Mapping;
+using Umbraco.Core.Models.Identity;
+
+namespace Umbraco.Core.Composing.CompositionExtensions
+
+{
+    public static class CoreMappingProfiles
+    {
+        public static Composition ComposeCoreMappingProfiles(this Composition composition)
+        {
+            composition.RegisterUnique<UmbracoMapper>();
+            composition.WithCollectionBuilder<MapDefinitionCollectionBuilder>()
+                .Add<IdentityMapDefinition>();
+            return composition;
+        }
+    }
+}
@@ -1,10 +1,10 @@
-using Umbraco.Core.Components;
+using Umbraco.Core.Compose;
 using Umbraco.Core.IO;
 using Umbraco.Core.IO.MediaPathSchemes;

-namespace Umbraco.Core.Composing.Composers
+namespace Umbraco.Core.Composing.CompositionExtensions
 {
-    public static class FileSystemsComposer
+    public static class FileSystems
    {
        /*
         * HOW TO REPLACE THE MEDIA UNDERLYING FILESYSTEM
@@ -73,13 +73,13 @@ namespace Umbraco.Core.Composing.Composers
            // it needs to be registered (not only the interface) because it provides additional
            // functionality eg for scoping, and is injected in the scope provider - whereas the
            // interface is really for end-users to get access to filesystems.
-            composition.RegisterUnique(factory => factory.CreateInstance<FileSystems>(factory));
+            composition.RegisterUnique(factory => factory.CreateInstance<IO.FileSystems>(factory));

            // register IFileSystems, which gives access too all filesystems
-            composition.RegisterUnique<IFileSystems>(factory => factory.GetInstance<FileSystems>());
+            composition.RegisterUnique<IFileSystems>(factory => factory.GetInstance<IO.FileSystems>());

            // register the scheme for media paths
-            composition.RegisterUnique<IMediaPathScheme, TwoGuidsMediaPathScheme>();
+            composition.RegisterUnique<IMediaPathScheme, UniqueMediaPathScheme>();

            // register the IMediaFileSystem implementation
            composition.RegisterFileSystem<IMediaFileSystem, MediaFileSystem>();
@@ -1,13 +1,12 @@
-using Umbraco.Core.Components;
-using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;

-namespace Umbraco.Core.Composing.Composers
+namespace Umbraco.Core.Composing.CompositionExtensions
 {
    /// <summary>
    /// Composes repositories.
    /// </summary>
-    public static class RepositoriesComposer
+    public static class Repositories
    {
        public static Composition ComposeRepositories(this Composition composition)
        {
@@ -47,6 +46,7 @@ namespace Umbraco.Core.Composing.Composers
            composition.RegisterUnique<IPartialViewRepository, PartialViewRepository>();
            composition.RegisterUnique<IScriptRepository, ScriptRepository>();
            composition.RegisterUnique<IStylesheetRepository, StylesheetRepository>();
+            composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();

            return composition;
        }
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Components;
 using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
@@ -10,9 +9,9 @@ using Umbraco.Core.Packaging;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;

-namespace Umbraco.Core.Composing.Composers
+namespace Umbraco.Core.Composing.CompositionExtensions
 {
-    public static class ServicesComposer
+    public static class Services
    {
        public static Composition ComposeServices(this Composition composition)
        {
@@ -99,7 +98,6 @@ namespace Umbraco.Core.Composing.Composers
                : appPlugins.GetDirectories()
                    .SelectMany(x => x.GetDirectories("Lang"))
                    .SelectMany(x => x.GetFiles("*.xml", SearchOption.TopDirectoryOnly))
-                    .Where(x => Path.GetFileNameWithoutExtension(x.FullName).Length == 5)
                    .Select(x => new LocalizedTextServiceSupplementaryFileSource(x, false));

            //user defined langs that overwrite the default, these should not be used by plugin creators
@@ -107,7 +105,6 @@ namespace Umbraco.Core.Composing.Composers
                ? Enumerable.Empty<LocalizedTextServiceSupplementaryFileSource>()
                : configLangFolder
                    .GetFiles("*.user.xml", SearchOption.TopDirectoryOnly)
-                    .Where(x => Path.GetFileNameWithoutExtension(x.FullName).Length == 10)
                    .Select(x => new LocalizedTextServiceSupplementaryFileSource(x, true));

            return new LocalizedTextServiceFileSources(
@@ -4,6 +4,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PackageActions;
 using Umbraco.Core.Packaging;
@@ -103,6 +104,9 @@ namespace Umbraco.Core.Composing

        #region Getters

+        public static UmbracoMapper Mapper
+            => _factory.GetInstance<UmbracoMapper>();
+
        public static IShortStringHelper ShortStringHelper
            => _shortStringHelper ?? (_shortStringHelper = _factory?.TryGetInstance<IShortStringHelper>()
                                  ?? new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(Configs.Settings())));
@@ -1,6 +1,6 @@
 using System;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Indicates that a composer should be disabled.
@@ -1,6 +1,6 @@
 using System;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Indicates that a composer should be disabled.
@@ -1,6 +1,6 @@
 using System;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Indicates that a composer should be enabled.
@@ -1,6 +1,6 @@
 using System;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Indicates that a composer should be enabled.
@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Represents a component.
@@ -1,6 +1,4 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Represents a composer.
@@ -10,7 +8,6 @@ namespace Umbraco.Core.Components
        /// <summary>
        /// Compose.
        /// </summary>
-        /// <param name="composition"></param>
        void Compose(Composition composition);
    }
-}
+}
@@ -0,0 +1,11 @@
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Represents a core <see cref="IComposer"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>Core composers compose after the initial composer, and before user composers.</para>
+    /// </remarks>
+    public interface ICoreComposer : IComposer
+    { }
+}
@@ -1,12 +1,12 @@
-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Represents a user <see cref="IComposer"/>.
    /// </summary>
    /// <remarks>
-    /// <para>All user composers require (compose after) all core composers.</para>
+    /// <para>User composers compose after core composers, and before the final composer.</para>
    /// </remarks>
    [ComposeAfter(typeof(ICoreComposer))]
    public interface IUserComposer : IComposer
    { }
-}
+}
@@ -1,7 +1,6 @@
 using System;
-using Umbraco.Core.Composing;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Composing
 {
    /// <summary>
    /// Marks a composer to indicate a minimum and/or maximum runtime level for which the composer would compose.
@@ -0,0 +1,171 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Implements an un-ordered collection builder.
+    /// </summary>
+    /// <typeparam name="TBuilder">The type of the builder.</typeparam>
+    /// <typeparam name="TCollection">The type of the collection.</typeparam>
+    /// <typeparam name="TItem">The type of the items.</typeparam>
+    /// <remarks>
+    /// <para>A set collection builder is the most basic collection builder,
+    /// where items are not ordered.</para>
+    /// </remarks>
+    public abstract class SetCollectionBuilderBase<TBuilder, TCollection, TItem> : CollectionBuilderBase<TBuilder, TCollection, TItem>
+        where TBuilder : SetCollectionBuilderBase<TBuilder, TCollection, TItem>
+        where TCollection : class, IBuilderCollection<TItem>
+    {
+        protected abstract TBuilder This { get; }
+
+        /// <summary>
+        /// Clears all types in the collection.
+        /// </summary>
+        /// <returns>The builder.</returns>
+        public TBuilder Clear()
+        {
+            Configure(types => types.Clear());
+            return This;
+        }
+
+        /// <summary>
+        /// Adds a type to the collection.
+        /// </summary>
+        /// <typeparam name="T">The type to append.</typeparam>
+        /// <returns>The builder.</returns>
+        public TBuilder Add<T>()
+            where T : TItem
+        {
+            Configure(types =>
+            {
+                var type = typeof(T);
+                if (types.Contains(type)) types.Remove(type);
+                types.Add(type);
+            });
+            return This;
+        }
+
+        /// <summary>
+        /// Adds a type to the collection.
+        /// </summary>
+        /// <param name="type">The type to append.</param>
+        /// <returns>The builder.</returns>
+        public TBuilder Add(Type type)
+        {
+            Configure(types =>
+            {
+                EnsureType(type, "register");
+                if (types.Contains(type)) types.Remove(type);
+                types.Add(type);
+            });
+            return This;
+        }
+
+        /// <summary>
+        ///  Adds types to the collections.
+        /// </summary>
+        /// <param name="types">The types to append.</param>
+        /// <returns>The builder.</returns>
+        public TBuilder Add(IEnumerable<Type> types)
+        {
+            Configure(list =>
+            {
+                foreach (var type in types)
+                {
+                    // would be detected by CollectionBuilderBase when registering, anyways, but let's fail fast
+                    EnsureType(type, "register");
+                    if (list.Contains(type)) list.Remove(type);
+                    list.Add(type);
+                }
+            });
+            return This;
+        }
+
+        /// <summary>
+        /// Removes a type from the collection.
+        /// </summary>
+        /// <typeparam name="T">The type to remove.</typeparam>
+        /// <returns>The builder.</returns>
+        public TBuilder Remove<T>()
+            where T : TItem
+        {
+            Configure(types =>
+            {
+                var type = typeof(T);
+                if (types.Contains(type)) types.Remove(type);
+            });
+            return This;
+        }
+
+        /// <summary>
+        /// Removes a type from the collection.
+        /// </summary>
+        /// <param name="type">The type to remove.</param>
+        /// <returns>The builder.</returns>
+        public TBuilder Remove(Type type)
+        {
+            Configure(types =>
+            {
+                EnsureType(type, "remove");
+                if (types.Contains(type)) types.Remove(type);
+            });
+            return This;
+        }
+
+        /// <summary>
+        /// Replaces a type in the collection.
+        /// </summary>
+        /// <typeparam name="TReplaced">The type to replace.</typeparam>
+        /// <typeparam name="T">The type to insert.</typeparam>
+        /// <returns>The builder.</returns>
+        /// <remarks>Throws if the type to replace does not already belong to the collection.</remarks>
+        public TBuilder Replace<TReplaced, T>()
+            where TReplaced : TItem
+            where T : TItem
+        {
+            Configure(types =>
+            {
+                var typeReplaced = typeof(TReplaced);
+                var type = typeof(T);
+                if (typeReplaced == type) return;
+
+                var index = types.IndexOf(typeReplaced);
+                if (index < 0) throw new InvalidOperationException();
+
+                if (types.Contains(type)) types.Remove(type);
+                index = types.IndexOf(typeReplaced); // in case removing type changed index
+                types.Insert(index, type);
+                types.Remove(typeReplaced);
+            });
+            return This;
+        }
+
+        /// <summary>
+        /// Replaces a type in the collection.
+        /// </summary>
+        /// <param name="typeReplaced">The type to replace.</param>
+        /// <param name="type">The type to insert.</param>
+        /// <returns>The builder.</returns>
+        /// <remarks>Throws if the type to replace does not already belong to the collection.</remarks>
+        public TBuilder Replace(Type typeReplaced, Type type)
+        {
+            Configure(types =>
+            {
+                EnsureType(typeReplaced, "find");
+                EnsureType(type, "register");
+
+                if (typeReplaced == type) return;
+
+                var index = types.IndexOf(typeReplaced);
+                if (index < 0) throw new InvalidOperationException();
+
+                if (types.Contains(type)) types.Remove(type);
+                index = types.IndexOf(typeReplaced); // in case removing type changed index
+                types.Insert(index, type);
+                types.Remove(typeReplaced);
+            });
+            return This;
+        }
+    }
+}
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Provides a base class for collections of types.
+    /// </summary>
+    public abstract class TypeCollectionBuilderBase<TBuilder, TCollection, TConstraint> : ICollectionBuilder<TCollection, Type>
+        where TBuilder : TypeCollectionBuilderBase<TBuilder, TCollection, TConstraint>
+        where TCollection : class, IBuilderCollection<Type>
+    {
+        private readonly HashSet<Type> _types = new HashSet<Type>();
+
+        protected abstract TBuilder This { get; }
+
+        private static Type Validate(Type type, string action)
+        {
+            if (!typeof(TConstraint).IsAssignableFrom(type))
+                throw new InvalidOperationException($"Cannot {action} type {type.FullName} as it does not inherit from/implement {typeof(TConstraint).FullName}.");
+            return type;
+        }
+
+        public TBuilder Add(Type type)
+        {
+            _types.Add(Validate(type, "add"));
+            return This;
+        }
+
+        public TBuilder Add<T>()
+        {
+            Add(typeof(T));
+            return This;
+        }
+
+        public TBuilder Add(IEnumerable<Type> types)
+        {
+            foreach (var type in types) Add(type);
+            return This;
+        }
+
+        public TBuilder Remove(Type type)
+        {
+            _types.Remove(Validate(type, "remove"));
+            return This;
+        }
+
+        public TBuilder Remove<T>()
+        {
+            Remove(typeof(T));
+            return This;
+        }
+
+        public TCollection CreateCollection(IFactory factory)
+        {
+            return factory.CreateInstance<TCollection>(_types);
+        }
+
+        public void RegisterWith(IRegister register)
+        {
+            register.Register(CreateCollection, Lifetime.Singleton);
+        }
+    }
+}
@@ -42,30 +42,30 @@ namespace Umbraco.Core.Composing
        private string _currentAssembliesHash;
        private IEnumerable<Assembly> _assemblies;
        private bool _reportedChange;
-        private static LocalTempStorage _localTempStorage;
-        private static string _fileBasePath;
+        private readonly string _localTempPath;
+        private string _fileBasePath;

        /// <summary>
        /// Initializes a new instance of the <see cref="TypeLoader"/> class.
        /// </summary>
        /// <param name="runtimeCache">The application runtime cache.</param>
-        /// <param name="localTempStorage">Files storage mode.</param>
+        /// <param name="localTempPath">Files storage location.</param>
        /// <param name="logger">A profiling logger.</param>
-        public TypeLoader(IAppPolicyCache runtimeCache, LocalTempStorage localTempStorage, IProfilingLogger logger)
-            : this(runtimeCache, localTempStorage, logger, true)
+        public TypeLoader(IAppPolicyCache runtimeCache, string localTempPath, IProfilingLogger logger)
+            : this(runtimeCache, localTempPath, logger, true)
        { }

        /// <summary>
        /// Initializes a new instance of the <see cref="TypeLoader"/> class.
        /// </summary>
        /// <param name="runtimeCache">The application runtime cache.</param>
-        /// <param name="localTempStorage">Files storage mode.</param>
+        /// <param name="localTempPath">Files storage location.</param>
        /// <param name="logger">A profiling logger.</param>
        /// <param name="detectChanges">Whether to detect changes using hashes.</param>
-        internal TypeLoader(IAppPolicyCache runtimeCache, LocalTempStorage localTempStorage, IProfilingLogger logger, bool detectChanges)
+        internal TypeLoader(IAppPolicyCache runtimeCache, string localTempPath, IProfilingLogger logger, bool detectChanges)
        {
            _runtimeCache = runtimeCache ?? throw new ArgumentNullException(nameof(runtimeCache));
-            _localTempStorage = localTempStorage == LocalTempStorage.Unknown ? LocalTempStorage.Default : localTempStorage;
+            _localTempPath = localTempPath;
            _logger = logger ?? throw new ArgumentNullException(nameof(logger));

            if (detectChanges)
@@ -388,25 +388,7 @@ namespace Umbraco.Core.Composing
                if (_fileBasePath != null)
                    return _fileBasePath;

-                switch (_localTempStorage)
-                {
-                    case LocalTempStorage.AspNetTemp:
-                        _fileBasePath = Path.Combine(HttpRuntime.CodegenDir, "UmbracoData", "umbraco-types");
-                        break;
-                    case LocalTempStorage.EnvironmentTemp:
-                        // include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
-                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
-                        // utilizing an old path - assuming we cannot have SHA1 collisions on AppDomainAppId
-                        var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
-                        var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", appDomainHash);
-                        _fileBasePath = Path.Combine(cachePath, "umbraco-types");
-                        break;
-                    case LocalTempStorage.Default:
-                    default:
-                        var tempFolder = IOHelper.MapPath(SystemDirectories.TempData.EnsureEndsWith('/') + "TypesCache");
-                        _fileBasePath = Path.Combine(tempFolder, "umbraco-types." + NetworkHelper.FileSafeMachineName);
-                        break;
-                }
+                _fileBasePath = Path.Combine(_localTempPath, "TypesCache", "umbraco-types." + NetworkHelper.FileSafeMachineName);

                // ensure that the folder exists
                var directory = Path.GetDirectoryName(_fileBasePath);
@@ -1,64 +1,24 @@
 using System;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Dictionary;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Dictionary;
 using Umbraco.Core.IO;
-using Umbraco.Core.Migrations;
+using Umbraco.Core.Logging.Viewer;
+using Umbraco.Core.Manifest;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.PackageActions;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
-using Umbraco.Core.Logging.Viewer;
-using Umbraco.Core.PackageActions;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core
 {
    /// <summary>
    /// Provides extension methods to the <see cref="Composition"/> class.
    /// </summary>
-    public static class CompositionExtensions
+    public static partial class CompositionExtensions
    {
-        #region FileSystems
-
-        /// <summary>
-        /// Registers a filesystem.
-        /// </summary>
-        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
-        /// <typeparam name="TImplementing">The implementing type.</typeparam>
-        /// <param name="composition">The composition.</param>
-        /// <returns>The register.</returns>
-        public static void RegisterFileSystem<TFileSystem, TImplementing>(this Composition composition)
-            where TImplementing : FileSystemWrapper, TFileSystem
-            where TFileSystem : class
-        {
-            composition.RegisterUnique<TFileSystem>(factory =>
-            {
-                var fileSystems = factory.GetInstance<FileSystems>();
-                var supporting = factory.GetInstance<SupportingFileSystems>();
-                return fileSystems.GetFileSystem<TImplementing>(supporting.For<TFileSystem>());
-            });
-        }
-
-        /// <summary>
-        /// Registers a filesystem.
-        /// </summary>
-        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
-        /// <param name="composition">The composition.</param>
-        /// <returns>The register.</returns>
-        public static void RegisterFileSystem<TFileSystem>(this Composition composition)
-            where TFileSystem : FileSystemWrapper
-        {
-            composition.RegisterUnique(factory =>
-            {
-                var fileSystems = factory.GetInstance<FileSystems>();
-                var supporting = factory.GetInstance<SupportingFileSystems>();
-                return fileSystems.GetFileSystem<TFileSystem>(supporting.For<TFileSystem>());
-            });
-        }
-
-        #endregion
-
        #region Collection Builders

        /// <summary>
@@ -107,15 +67,15 @@ namespace Umbraco.Core.Components
        /// Gets the validators collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
-        internal static ManifestValueValidatorCollectionBuilder Validators(this Composition composition)
+        internal static ManifestValueValidatorCollectionBuilder ManifestValueValidators(this Composition composition)
            => composition.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>();

        /// <summary>
-        /// Gets the post-migrations collection builder.
+        /// Gets the manifest filter collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
-        internal static PostMigrationCollectionBuilder PostMigrations(this Composition composition)
-            => composition.WithCollectionBuilder<PostMigrationCollectionBuilder>();
+        public static ManifestFilterCollectionBuilder ManifestFilters(this Composition composition)
+            => composition.WithCollectionBuilder<ManifestFilterCollectionBuilder>();

        /// <summary>
        /// Gets the components collection builder.
@@ -251,6 +211,28 @@ namespace Umbraco.Core.Components
            composition.RegisterUnique(_ => registrar);
        }

+        /// <summary>
+        /// Sets the database server messenger options.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="factory">A function creating the options.</param>
+        /// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
+        public static void SetDatabaseServerMessengerOptions(this Composition composition, Func<IFactory, DatabaseServerMessengerOptions> factory)
+        {
+            composition.RegisterUnique(factory);
+        }
+
+        /// <summary>
+        /// Sets the database server messenger options.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="options">Options.</param>
+        /// <remarks>Use DatabaseServerRegistrarAndMessengerComposer.GetDefaultOptions to get the options that Umbraco would use by default.</remarks>
+        public static void SetDatabaseServerMessengerOptions(this Composition composition, DatabaseServerMessengerOptions options)
+        {
+            composition.RegisterUnique(_ => options);
+        }
+
        /// <summary>
        /// Sets the short string helper.
        /// </summary>
@@ -0,0 +1,35 @@
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides extension methods to the <see cref="Composition"/> class.
+    /// </summary>
+    public static partial class CompositionExtensions
+    {
+        /// <summary>
+        /// Registers essential services.
+        /// </summary>
+        public static void RegisterEssentials(this Composition composition,
+            ILogger logger, IProfiler profiler, IProfilingLogger profilingLogger,
+            IMainDom mainDom,
+            AppCaches appCaches,
+            IUmbracoDatabaseFactory databaseFactory,
+            TypeLoader typeLoader,
+            IRuntimeState state)
+        {
+            composition.RegisterUnique(logger);
+            composition.RegisterUnique(profiler);
+            composition.RegisterUnique(profilingLogger);
+            composition.RegisterUnique(mainDom);
+            composition.RegisterUnique(appCaches);
+            composition.RegisterUnique(databaseFactory);
+            composition.RegisterUnique(factory => factory.GetInstance<IUmbracoDatabaseFactory>().SqlContext);
+            composition.RegisterUnique(typeLoader);
+            composition.RegisterUnique(state);
+        }
+    }
+}
@@ -0,0 +1,47 @@
+using Umbraco.Core.Composing;
+using Umbraco.Core.IO;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides extension methods to the <see cref="Composition"/> class.
+    /// </summary>
+    public static partial class CompositionExtensions
+    {
+        /// <summary>
+        /// Registers a filesystem.
+        /// </summary>
+        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
+        /// <typeparam name="TImplementing">The implementing type.</typeparam>
+        /// <param name="composition">The composition.</param>
+        /// <returns>The register.</returns>
+        public static void RegisterFileSystem<TFileSystem, TImplementing>(this Composition composition)
+            where TImplementing : FileSystemWrapper, TFileSystem
+            where TFileSystem : class
+        {
+            composition.RegisterUnique<TFileSystem>(factory =>
+            {
+                var fileSystems = factory.GetInstance<FileSystems>();
+                var supporting = factory.GetInstance<SupportingFileSystems>();
+                return fileSystems.GetFileSystem<TImplementing>(supporting.For<TFileSystem>());
+            });
+        }
+
+        /// <summary>
+        /// Registers a filesystem.
+        /// </summary>
+        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
+        /// <param name="composition">The composition.</param>
+        /// <returns>The register.</returns>
+        public static void RegisterFileSystem<TFileSystem>(this Composition composition)
+            where TFileSystem : FileSystemWrapper
+        {
+            composition.RegisterUnique(factory =>
+            {
+                var fileSystems = factory.GetInstance<FileSystems>();
+                var supporting = factory.GetInstance<SupportingFileSystems>();
+                return fileSystems.GetFileSystem<TFileSystem>(supporting.For<TFileSystem>());
+            });
+        }
+    }
+}
@@ -1,43 +1,12 @@
-using Umbraco.Core.Cache;
-using Umbraco.Core.Components;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence;
+using Umbraco.Core.Composing;

-namespace Umbraco.Core.Composing
+namespace Umbraco.Core
 {
    /// <summary>
    /// Provides extension methods to the <see cref="Composition"/> class.
    /// </summary>
-    public static class CompositionExtensions
+    public static partial class CompositionExtensions
    {
-        #region Essentials
-
-        /// <summary>
-        /// Registers essential services.
-        /// </summary>
-        public static void RegisterEssentials(this Composition composition,
-            ILogger logger, IProfiler profiler, IProfilingLogger profilingLogger,
-            IMainDom mainDom,
-            AppCaches appCaches,
-            IUmbracoDatabaseFactory databaseFactory,
-            TypeLoader typeLoader,
-            IRuntimeState state)
-        {
-            composition.RegisterUnique(logger);
-            composition.RegisterUnique(profiler);
-            composition.RegisterUnique(profilingLogger);
-            composition.RegisterUnique(mainDom);
-            composition.RegisterUnique(appCaches);
-            composition.RegisterUnique(databaseFactory);
-            composition.RegisterUnique(factory => factory.GetInstance<IUmbracoDatabaseFactory>().SqlContext);
-            composition.RegisterUnique(typeLoader);
-            composition.RegisterUnique(state);
-        }
-
-        #endregion
-
-        #region Unique
-
        /// <summary>
        /// Registers a unique service as its own implementation.
        /// </summary>
@@ -62,7 +31,5 @@ namespace Umbraco.Core.Composing
        /// </summary>
        public static void RegisterUnique<TService>(this Composition composition, TService instance)
            => composition.RegisterUnique(typeof(TService), instance);
-
-        #endregion
    }
-}
+}
@@ -7,6 +7,7 @@ using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;

 namespace Umbraco.Core
 {
@@ -41,7 +42,12 @@ namespace Umbraco.Core
            configs.Add(() => new CoreDebug());

            // GridConfig depends on runtime caches, manifest parsers... and cannot be available during composition
-            configs.Add<IGridConfig>(factory => new GridConfig(factory.GetInstance<ILogger>(), factory.GetInstance<AppCaches>(), configDir, factory.GetInstance<IRuntimeState>().Debug));
+            configs.Add<IGridConfig>(factory => new GridConfig(
+                factory.GetInstance<ILogger>(),
+                factory.GetInstance<AppCaches>(),
+                configDir,
+                factory.GetInstance<ManifestParser>(),
+                factory.GetInstance<IRuntimeState>().Debug));
        }
    }
 }
@@ -5,14 +5,8 @@ using System.Net.Configuration;
 using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
-using System.Web.Security;
-using System.Xml;
 using System.Xml.Linq;
-using System.Xml.XPath;
-using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Security;

 namespace Umbraco.Core.Configuration
 {
@@ -24,16 +18,15 @@ namespace Umbraco.Core.Configuration
    /// </summary>
    public class GlobalSettings : IGlobalSettings
    {
+        private string _localTempPath;

-        #region Private static fields
-
-        
+        // TODO these should not be static
        private static string _reservedPaths;
        private static string _reservedUrls;
+
        //ensure the built on (non-changeable) reserved paths are there at all times
        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
        internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
-        #endregion

        /// <summary>
        /// Used in unit testing to reset all config items that were set with property setters (i.e. did not come from config)
@@ -138,7 +131,7 @@ namespace Umbraco.Core.Configuration
                    : "~/App_Data/umbraco.config";
            }
        }
-        
+
        /// <summary>
        /// Gets the path to umbraco's root directory (/umbraco by default).
        /// </summary>
@@ -170,7 +163,7 @@ namespace Umbraco.Core.Configuration
                SaveSetting(Constants.AppSettings.ConfigurationStatus, value);
            }
        }
-        
+
        /// <summary>
        /// Saves a setting into the configuration file.
        /// </summary>
@@ -213,7 +206,7 @@ namespace Umbraco.Core.Configuration
                ConfigurationManager.RefreshSection("appSettings");
            }
        }
-              
+
        /// <summary>
        /// Gets a value indicating whether umbraco is running in [debug mode].
        /// </summary>
@@ -257,7 +250,7 @@ namespace Umbraco.Core.Configuration
                }
            }
        }
-        
+
        /// <summary>
        /// Returns the number of days that should take place between version checks.
        /// </summary>
@@ -276,13 +269,8 @@ namespace Umbraco.Core.Configuration
                }
            }
        }
-        
-        /// <summary>
-        /// This is the location type to store temporary files such as cache files or other localized files for a given machine
-        /// </summary>
-        /// <remarks>
-        /// Currently used for the xml cache file and the plugin cache files
-        /// </remarks>
+
+        /// <inheritdoc />
        public LocalTempStorage LocalTempStorageLocation
        {
            get
@@ -295,6 +283,48 @@ namespace Umbraco.Core.Configuration
            }
        }

+        /// <inheritdoc />
+        public string LocalTempPath
+        {
+            get
+            {
+                if (_localTempPath != null)
+                    return _localTempPath;
+
+                switch (LocalTempStorageLocation)
+                {
+                    case LocalTempStorage.AspNetTemp:
+                        return _localTempPath = System.IO.Path.Combine(HttpRuntime.CodegenDir, "UmbracoData");
+
+                    case LocalTempStorage.EnvironmentTemp:
+
+                        // environment temp is unique, we need a folder per site
+
+                        // use a hash
+                        // combine site name and application id
+                        //  site name is a Guid on Cloud
+                        //  application id is eg /LM/W3SVC/123456/ROOT
+                        // the combination is unique on one server
+                        // and, if a site moves from worker A to B and then back to A...
+                        //  hopefully it gets a new Guid or new application id?
+
+                        var siteName = HostingEnvironment.SiteName;
+                        var applicationId = HostingEnvironment.ApplicationID; // ie HttpRuntime.AppDomainAppId
+
+                        var hashString = siteName + "::" + applicationId;
+                        var hash = hashString.GenerateHash();
+                        var siteTemp = System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", hash);
+
+                        return _localTempPath = siteTemp;
+
+                    //case LocalTempStorage.Default:
+                    //case LocalTempStorage.Unknown:
+                    default:
+                        return _localTempPath = IOHelper.MapPath("~/App_Data/TEMP");
+                }
+            }
+        }
+
        /// <summary>
        /// Gets the default UI language.
        /// </summary>
@@ -348,10 +378,5 @@ namespace Umbraco.Core.Configuration
                }
            }
        }
-
    }
-
-
-
-
 }
@@ -128,6 +128,7 @@ namespace Umbraco.Core.Configuration
            if (routes == null) throw new ArgumentNullException(nameof(routes));

            //check if the current request matches a route, if so then it is reserved.
+            //TODO: This value should be cached! Else this is doing double routing in MVC every request!
            var route = routes.GetRouteData(httpContext);
            if (route != null)
                return true;
@@ -1,14 +1,15 @@
 using System.IO;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Manifest;

 namespace Umbraco.Core.Configuration.Grid
 {
    class GridConfig : IGridConfig
    {
-        public GridConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, bool isDebug)
+        public GridConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, ManifestParser manifestParser, bool isDebug)
        {
-            EditorsConfig = new GridEditorsConfig(logger, appCaches, configFolder, isDebug);
+            EditorsConfig = new GridEditorsConfig(logger, appCaches, configFolder, manifestParser, isDebug);
        }

        public IGridEditorsConfig EditorsConfig { get; }
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Newtonsoft.Json.Linq;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
@@ -15,13 +13,15 @@ namespace Umbraco.Core.Configuration.Grid
        private readonly ILogger _logger;
        private readonly AppCaches _appCaches;
        private readonly DirectoryInfo _configFolder;
+        private readonly ManifestParser _manifestParser;
        private readonly bool _isDebug;

-        public GridEditorsConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, bool isDebug)
+        public GridEditorsConfig(ILogger logger, AppCaches appCaches, DirectoryInfo configFolder, ManifestParser manifestParser, bool isDebug)
        {
            _logger = logger;
            _appCaches = appCaches;
            _configFolder = configFolder;
+            _manifestParser = manifestParser;
            _isDebug = isDebug;
        }

@@ -31,9 +31,6 @@ namespace Umbraco.Core.Configuration.Grid
            {
                List<GridEditor> GetResult()
                {
-                    // TODO: should use the common one somehow! + ignoring _appPlugins here!
-                    var parser = new ManifestParser(_appCaches, Current.ManifestValidators, _logger);
-
                    var editors = new List<GridEditor>();
                    var gridConfig = Path.Combine(_configFolder.FullName, "grid.editors.config.js");
                    if (File.Exists(gridConfig))
@@ -42,7 +39,7 @@ namespace Umbraco.Core.Configuration.Grid

                        try
                        {
-                            editors.AddRange(parser.ParseGridEditors(sourceString));
+                            editors.AddRange(_manifestParser.ParseGridEditors(sourceString));
                        }
                        catch (Exception ex)
                        {
@@ -51,7 +48,7 @@ namespace Umbraco.Core.Configuration.Grid
                    }

                    // add manifest editors, skip duplicates
-                    foreach (var gridEditor in parser.Manifest.GridEditors)
+                    foreach (var gridEditor in _manifestParser.Manifest.GridEditors)
                    {
                        if (editors.Contains(gridEditor) == false) editors.Add(gridEditor);
                    }
@@ -1,6 +1,4 @@
-using System;
-
-namespace Umbraco.Core.Configuration
+namespace Umbraco.Core.Configuration
 {
    /// <summary>
    /// Contains general settings information for the entire Umbraco instance based on information from  web.config appsettings 
@@ -61,11 +59,13 @@ namespace Umbraco.Core.Configuration
        int VersionCheckPeriod { get; }

        /// <summary>
-        /// This is the location type to store temporary files such as cache files or other localized files for a given machine
+        /// Gets the configuration for the location of temporary files.
        /// </summary>
-        /// <remarks>
-        /// Used for some cache files and for specific environments such as Azure
-        /// </remarks>
        LocalTempStorage LocalTempStorageLocation { get; }
+
+        /// <summary>
+        /// Gets the location of temporary files.
+        /// </summary>
+        string LocalTempPath { get; }
    }
 }
@@ -93,7 +93,6 @@ namespace Umbraco.Core
            /// </summary>
            public const string DisableElectionForSingleServer = "Umbraco.Core.DisableElectionForSingleServer";

-            
            /// <summary>
            /// Debug specific web.config AppSetting keys for Umbraco
            /// </summary>
@@ -77,7 +77,7 @@
            /// alias for the macro tree.
            /// </summary>
            public const string Macros = "macros";
-            
+
            /// <summary>
            /// alias for the datatype tree.
            /// </summary>
@@ -92,7 +92,7 @@
            /// alias for the dictionary tree.
            /// </summary>
            public const string Dictionary = "dictionary";
-            
+
            public const string Stylesheets = "stylesheets";

            /// <summary>
@@ -121,7 +121,7 @@
            public const string Templates = "templates";

            public const string RelationTypes = "relationTypes";
-            
+
            public const string Languages = "languages";

            /// <summary>
@@ -145,11 +145,11 @@

            public const string PartialViewMacros = "partialViewMacros";

-			public const string LogViewer = "logViewer";
+            public const string LogViewer = "logViewer";

            public static class Groups
            {
-				public const string Settings = "settingsGroup";
+                public const string Settings = "settingsGroup";

                public const string Templating = "templatingGroup";

@@ -92,10 +92,10 @@ namespace Umbraco.Core
                /// </summary>
                public const string Extension = "umbracoExtension";

-				/// <summary>
-				/// The default height/width of an image file if the size can't be determined from the metadata
-				/// </summary>
-				public const int DefaultSize = 200;
+                /// <summary>
+                /// The default height/width of an image file if the size can't be determined from the metadata
+                /// </summary>
+                public const int DefaultSize = 200;
            }

            /// <summary>
@@ -209,71 +209,71 @@ namespace Umbraco.Core
                public static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
                {
                    return new Dictionary<string, PropertyType>
+                    {
                        {
+                            Comments,
+                            new PropertyType(PropertyEditors.Aliases.TextArea, ValueStorageType.Ntext, true, Comments)
                            {
-                                Comments,
-                                new PropertyType(PropertyEditors.Aliases.TextArea, ValueStorageType.Ntext, true, Comments)
-                                    {
-                                        Name = CommentsLabel
-                                    }
-                            },
-                            {
-                                FailedPasswordAttempts,
-                                new PropertyType(PropertyEditors.Aliases.NoEdit, ValueStorageType.Integer, true, FailedPasswordAttempts)
-                                    {
-                                        Name = FailedPasswordAttemptsLabel
-                                    }
-                            },
-                            {
-                                IsApproved,
-                                new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsApproved)
-                                    {
-                                        Name = IsApprovedLabel
-                                    }
-                            },
-                            {
-                                IsLockedOut,
-                                new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsLockedOut)
-                                    {
-                                        Name = IsLockedOutLabel
-                                    }
-                            },
-                            {
-                                LastLockoutDate,
-                                new PropertyType(PropertyEditors.Aliases.NoEdit, ValueStorageType.Date, true, LastLockoutDate)
-                                    {
-                                        Name = LastLockoutDateLabel
-                                    }
-                            },
-                            {
-                                LastLoginDate,
-                                new PropertyType(PropertyEditors.Aliases.NoEdit, ValueStorageType.Date, true, LastLoginDate)
-                                    {
-                                        Name = LastLoginDateLabel
-                                    }
-                            },
-                            {
-                                LastPasswordChangeDate,
-                                new PropertyType(PropertyEditors.Aliases.NoEdit, ValueStorageType.Date, true, LastPasswordChangeDate)
-                                    {
-                                        Name = LastPasswordChangeDateLabel
-                                    }
-                            },
-                            {
-                                PasswordAnswer,
-                                new PropertyType(PropertyEditors.Aliases.NoEdit, ValueStorageType.Nvarchar, true, PasswordAnswer)
-                                    {
-                                        Name = PasswordAnswerLabel
-                                    }
-                            },
-                            {
-                                PasswordQuestion,
-                                new PropertyType(PropertyEditors.Aliases.NoEdit, ValueStorageType.Nvarchar, true, PasswordQuestion)
-                                    {
-                                        Name = PasswordQuestionLabel
-                                    }
+                                Name = CommentsLabel
                            }
-                        };
+                        },
+                        {
+                            FailedPasswordAttempts,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Integer, true, FailedPasswordAttempts)
+                            {
+                                Name = FailedPasswordAttemptsLabel
+                            }
+                        },
+                        {
+                            IsApproved,
+                            new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsApproved)
+                            {
+                                Name = IsApprovedLabel
+                            }
+                        },
+                        {
+                            IsLockedOut,
+                            new PropertyType(PropertyEditors.Aliases.Boolean, ValueStorageType.Integer, true, IsLockedOut)
+                            {
+                                Name = IsLockedOutLabel
+                            }
+                        },
+                        {
+                            LastLockoutDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLockoutDate)
+                            {
+                                Name = LastLockoutDateLabel
+                            }
+                        },
+                        {
+                            LastLoginDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastLoginDate)
+                            {
+                                Name = LastLoginDateLabel
+                            }
+                        },
+                        {
+                            LastPasswordChangeDate,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Date, true, LastPasswordChangeDate)
+                            {
+                                Name = LastPasswordChangeDateLabel
+                            }
+                        },
+                        {
+                            PasswordAnswer,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordAnswer)
+                            {
+                                Name = PasswordAnswerLabel
+                            }
+                        },
+                        {
+                            PasswordQuestion,
+                            new PropertyType(PropertyEditors.Aliases.Label, ValueStorageType.Nvarchar, true, PasswordQuestion)
+                            {
+                                Name = PasswordQuestionLabel
+                            }
+                        }
+                    };
                }
            }

@@ -1,27 +1,375 @@
-namespace Umbraco.Core
+using System;
+
+namespace Umbraco.Core
 {
    public static partial class Constants
    {
        public static class DataTypes
        {
-            public const int LabelString = -92;
+            //NOTE: unfortunately due to backwards compat we can't move/rename these, with the addition of the GUID
+            //constants, it would make more sense to have these suffixed with "ID" or in a Subclass called "INT", for
+            //now all we can do is make a subclass called Guids to put the GUID IDs.
+
+            public const int LabelString = System.DefaultLabelDataTypeId;
            public const int LabelInt = -91;
            public const int LabelBigint = -93;
            public const int LabelDateTime = -94;
            public const int LabelTime = -98;
            public const int LabelDecimal = -99;

+            public const int Textarea = -89;
            public const int Textbox = -88;
+            public const int RichtextEditor = -87;
            public const int Boolean = -49;
            public const int DateTime = -36;
            public const int DropDownSingle = -39;
            public const int DropDownMultiple = -42;
+            public const int Upload = -90;

            public const int DefaultContentListView = -95;
            public const int DefaultMediaListView = -96;
            public const int DefaultMembersListView = -97;

+            public const int ImageCropper = 1043;
            public const int Tags = 1041;
+
+            public static class ReservedPreValueKeys
+            {
+                public const string IgnoreUserStartNodes = "ignoreUserStartNodes";
+            }
+
+            /// <summary>
+            /// Defines the identifiers for Umbraco data types as constants for easy centralized access/management.
+            /// </summary>
+            public static class Guids
+            {   
+
+                /// <summary>
+                /// Guid for Content Picker as string
+                /// </summary>
+                public const string ContentPicker = "FD1E0DA5-5606-4862-B679-5D0CF3A52A59";
+
+                /// <summary>
+                /// Guid for Content Picker
+                /// </summary>
+                public static readonly Guid ContentPickerGuid = new Guid(ContentPicker);
+
+
+                /// <summary>
+                /// Guid for Member Picker as string
+                /// </summary>
+                public const string MemberPicker = "1EA2E01F-EBD8-4CE1-8D71-6B1149E63548";
+
+                /// <summary>
+                /// Guid for Member Picker
+                /// </summary>
+                public static readonly Guid MemberPickerGuid = new Guid(MemberPicker);
+
+
+                /// <summary>
+                /// Guid for Media Picker as string
+                /// </summary>
+                public const string MediaPicker = "135D60E0-64D9-49ED-AB08-893C9BA44AE5";
+
+                /// <summary>
+                /// Guid for Media Picker
+                /// </summary>
+                public static readonly Guid MediaPickerGuid = new Guid(MediaPicker);
+
+
+                /// <summary>
+                /// Guid for Multiple Media Picker as string
+                /// </summary>
+                public const string MultipleMediaPicker = "9DBBCBBB-2327-434A-B355-AF1B84E5010A";
+
+                /// <summary>
+                /// Guid for Multiple Media Picker
+                /// </summary>
+                public static readonly Guid MultipleMediaPickerGuid = new Guid(MultipleMediaPicker);
+
+
+                /// <summary>
+                /// Guid for Related Links as string
+                /// </summary>
+                public const string RelatedLinks = "B4E3535A-1753-47E2-8568-602CF8CFEE6F";
+
+                /// <summary>
+                /// Guid for Related Links
+                /// </summary>
+                public static readonly Guid RelatedLinksGuid = new Guid(RelatedLinks);
+
+
+                /// <summary>
+                /// Guid for Member as string
+                /// </summary>
+                public const string Member = "d59be02f-1df9-4228-aa1e-01917d806cda";
+
+                /// <summary>
+                /// Guid for Member
+                /// </summary>
+                public static readonly Guid MemberGuid = new Guid(Member);
+
+
+                /// <summary>
+                /// Guid for Image Cropper as string
+                /// </summary>
+                public const string ImageCropper = "1df9f033-e6d4-451f-b8d2-e0cbc50a836f";
+
+                /// <summary>
+                /// Guid for Image Cropper
+                /// </summary>
+                public static readonly Guid ImageCropperGuid = new Guid(ImageCropper);
+
+
+                /// <summary>
+                /// Guid for Tags as string
+                /// </summary>
+                public const string Tags = "b6b73142-b9c1-4bf8-a16d-e1c23320b549";
+
+                /// <summary>
+                /// Guid for Tags
+                /// </summary>
+                public static readonly Guid TagsGuid = new Guid(Tags);
+
+
+                /// <summary>
+                /// Guid for List View - Content as string
+                /// </summary>
+                public const string ListViewContent = "C0808DD3-8133-4E4B-8CE8-E2BEA84A96A4";
+
+                /// <summary>
+                /// Guid for List View - Content
+                /// </summary>
+                public static readonly Guid ListViewContentGuid = new Guid(ListViewContent);
+
+
+                /// <summary>
+                /// Guid for List View - Media as string
+                /// </summary>
+                public const string ListViewMedia = "3A0156C4-3B8C-4803-BDC1-6871FAA83FFF";
+
+                /// <summary>
+                /// Guid for List View - Media
+                /// </summary>
+                public static readonly Guid ListViewMediaGuid = new Guid(ListViewMedia);
+
+
+                /// <summary>
+                /// Guid for List View - Members as string
+                /// </summary>
+                public const string ListViewMembers = "AA2C52A0-CE87-4E65-A47C-7DF09358585D";
+
+                /// <summary>
+                /// Guid for List View - Members
+                /// </summary>
+                public static readonly Guid ListViewMembersGuid = new Guid(ListViewMembers);
+
+
+                /// <summary>
+                /// Guid for Date Picker with time as string
+                /// </summary>
+                public const string DatePickerWithTime = "e4d66c0f-b935-4200-81f0-025f7256b89a";
+
+                /// <summary>
+                /// Guid for Date Picker with time
+                /// </summary>
+                public static readonly Guid DatePickerWithTimeGuid = new Guid(DatePickerWithTime);
+
+
+                /// <summary>
+                /// Guid for Approved Color as string
+                /// </summary>
+                public const string ApprovedColor = "0225af17-b302-49cb-9176-b9f35cab9c17";
+
+                /// <summary>
+                /// Guid for Approved Color
+                /// </summary>
+                public static readonly Guid ApprovedColorGuid = new Guid(ApprovedColor);
+
+
+                /// <summary>
+                /// Guid for Dropdown multiple as string
+                /// </summary>
+                public const string DropdownMultiple = "f38f0ac7-1d27-439c-9f3f-089cd8825a53";
+
+                /// <summary>
+                /// Guid for Dropdown multiple
+                /// </summary>
+                public static readonly Guid DropdownMultipleGuid = new Guid(DropdownMultiple);
+
+
+                /// <summary>
+                /// Guid for Radiobox as string
+                /// </summary>
+                public const string Radiobox = "bb5f57c9-ce2b-4bb9-b697-4caca783a805";
+
+                /// <summary>
+                /// Guid for Radiobox
+                /// </summary>
+                public static readonly Guid RadioboxGuid = new Guid(Radiobox);
+
+
+                /// <summary>
+                /// Guid for Date Picker as string
+                /// </summary>
+                public const string DatePicker = "5046194e-4237-453c-a547-15db3a07c4e1";
+
+                /// <summary>
+                /// Guid for Date Picker
+                /// </summary>
+                public static readonly Guid DatePickerGuid = new Guid(DatePicker);
+
+
+                /// <summary>
+                /// Guid for Dropdown as string
+                /// </summary>
+                public const string Dropdown = "0b6a45e7-44ba-430d-9da5-4e46060b9e03";
+
+                /// <summary>
+                /// Guid for Dropdown
+                /// </summary>
+                public static readonly Guid DropdownGuid = new Guid(Dropdown);
+
+
+                /// <summary>
+                /// Guid for Checkbox list as string
+                /// </summary>
+                public const string CheckboxList = "fbaf13a8-4036-41f2-93a3-974f678c312a";
+
+                /// <summary>
+                /// Guid for Checkbox list
+                /// </summary>
+                public static readonly Guid CheckboxListGuid = new Guid(CheckboxList);
+
+
+                /// <summary>
+                /// Guid for Checkbox as string
+                /// </summary>
+                public const string Checkbox = "92897bc6-a5f3-4ffe-ae27-f2e7e33dda49";
+
+                /// <summary>
+                /// Guid for Checkbox
+                /// </summary>
+                public static readonly Guid CheckboxGuid = new Guid(Checkbox);
+
+
+                /// <summary>
+                /// Guid for Numeric as string
+                /// </summary>
+                public const string Numeric = "2e6d3631-066e-44b8-aec4-96f09099b2b5";
+
+                /// <summary>
+                /// Guid for Dropdown
+                /// </summary>
+                public static readonly Guid NumericGuid = new Guid(Numeric);
+
+
+                /// <summary>
+                /// Guid for Richtext editor as string
+                /// </summary>
+                public const string RichtextEditor = "ca90c950-0aff-4e72-b976-a30b1ac57dad";
+
+                /// <summary>
+                /// Guid for Richtext editor
+                /// </summary>
+                public static readonly Guid RichtextEditorGuid = new Guid(RichtextEditor);
+
+
+                /// <summary>
+                /// Guid for Textstring as string
+                /// </summary>
+                public const string Textstring = "0cc0eba1-9960-42c9-bf9b-60e150b429ae";
+
+                /// <summary>
+                /// Guid for Textstring
+                /// </summary>
+                public static readonly Guid TextstringGuid = new Guid(Textstring);
+
+
+                /// <summary>
+                /// Guid for Textarea as string
+                /// </summary>
+                public const string Textarea = "c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3";
+
+                /// <summary>
+                /// Guid for Dropdown
+                /// </summary>
+                public static readonly Guid TextareaGuid = new Guid(Textarea);
+
+
+                /// <summary>
+                /// Guid for Upload as string
+                /// </summary>
+                public const string Upload = "84c6b441-31df-4ffe-b67e-67d5bc3ae65a";
+
+                /// <summary>
+                /// Guid for Upload
+                /// </summary>
+                public static readonly Guid UploadGuid = new Guid(Upload);
+
+
+                /// <summary>
+                /// Guid for Label as string
+                /// </summary>
+                public const string LabelString = "f0bc4bfb-b499-40d6-ba86-058885a5178c";
+
+                /// <summary>
+                /// Guid for Label string
+                /// </summary>
+                public static readonly Guid LabelStringGuid = new Guid(LabelString);
+
+                /// <summary>
+                /// Guid for Label as int
+                /// </summary>
+                public const string LabelInt = "8e7f995c-bd81-4627-9932-c40e568ec788";
+
+                /// <summary>
+                /// Guid for Label int
+                /// </summary>
+                public static readonly Guid LabelIntGuid = new Guid(LabelInt);
+
+                /// <summary>
+                /// Guid for Label as big int
+                /// </summary>
+                public const string LabelBigInt = "930861bf-e262-4ead-a704-f99453565708";
+
+                /// <summary>
+                /// Guid for Label big int
+                /// </summary>
+                public static readonly Guid LabelBigIntGuid = new Guid(LabelBigInt);
+
+                /// <summary>
+                /// Guid for Label as date time
+                /// </summary>
+                public const string LabelDateTime = "0e9794eb-f9b5-4f20-a788-93acd233a7e4";
+
+                /// <summary>
+                /// Guid for Label date time
+                /// </summary>
+                public static readonly Guid LabelDateTimeGuid = new Guid(LabelDateTime);
+
+                /// <summary>
+                /// Guid for Label as time
+                /// </summary>
+                public const string LabelTime = "a97cec69-9b71-4c30-8b12-ec398860d7e8";
+
+                /// <summary>
+                /// Guid for Label time
+                /// </summary>
+                public static readonly Guid LabelTimeGuid = new Guid(LabelTime);
+
+                /// <summary>
+                /// Guid for Label as decimal
+                /// </summary>
+                public const string LabelDecimal = "8f1ef1e1-9de4-40d3-a072-6673f631ca64";
+
+                /// <summary>
+                /// Guid for Label decimal
+                /// </summary>
+                public static readonly Guid LabelDecimalGuid = new Guid(LabelDecimal);
+                
+                
+            }
        }
    }
 }
@@ -1,53 +1,93 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
    public static partial class Constants
    {
        public static class Icons
        {
-
-
            /// <summary>
-            /// System contenttype icon
+            /// System default icon
            /// </summary>
-            public const string ContentType = "icon-arrangement";
+            public const string DefaultIcon = Content;

            /// <summary>
-            /// System datatype icon
+            /// System content icon
+            /// </summary>
+            public const string Content = "icon-document";
+
+            /// <summary>
+            /// System content type icon
+            /// </summary>
+            public const string ContentType = "icon-item-arrangement";
+
+            /// <summary>
+            /// System data type icon
            /// </summary>
            public const string DataType = "icon-autofill";

            /// <summary>
-            /// System property editor icon
+            /// System list view icon
            /// </summary>
-            public const string PropertyEditor = "icon-autofill";
+            public const string ListView = "icon-thumbnail-list";

            /// <summary>
            /// System macro icon
            /// </summary>
            public const string Macro = "icon-settings-alt";

+            /// <summary>
+            /// System media file icon
+            /// </summary>
+            public const string MediaFile = "icon-document";
+
+            /// <summary>
+            /// System media folder icon
+            /// </summary>
+            public const string MediaFolder = "icon-folder";
+
+            /// <summary>
+            /// System media image icon
+            /// </summary>
+            public const string MediaImage = "icon-picture";
+
+            /// <summary>
+            /// System media type icon
+            /// </summary>
+            public const string MediaType = "icon-thumbnails";
+
            /// <summary>
            /// System member icon
            /// </summary>
            public const string Member = "icon-user";

            /// <summary>
-            /// System member icon
+            /// System member group icon
+            /// </summary>
+            public const string MemberGroup = "icon-users-alt";
+
+            /// <summary>
+            /// System member type icon
            /// </summary>
            public const string MemberType = "icon-users";

+            /// <summary>
+            /// System property editor icon
+            /// </summary>
+            public const string PropertyEditor = "icon-autofill";

            /// <summary>
            /// System member icon
            /// </summary>
            public const string Template = "icon-layout";

+            /// <summary>
+            /// System user icon
+            /// </summary>
+            public const string User = "icon-user";
+
+            /// <summary>
+            /// System user group icon
+            /// </summary>
+            public const string UserGroup = "icon-users";
        }
    }
 }
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
    public static partial class Constants
    {
@@ -123,7 +123,6 @@ namespace Umbraco.Core
            public static readonly Guid Template = new Guid(Strings.Template);

            public static readonly Guid ContentItem = new Guid(Strings.ContentItem);
-
        }
    }
 }
@@ -3,7 +3,7 @@
    public static partial class Constants
    {
        /// <summary>
-        ///     Defines the constants used for the Umbraco package repository
+        /// Defines the constants used for the Umbraco package repository
        /// </summary>
        public static class PackageRepository
        {
@@ -14,6 +14,23 @@ namespace Umbraco.Core
            /// </summary>
            public const string InternalGenericPropertiesPrefix = "_umb_";

+            public static class Legacy
+            {
+                public static class Aliases
+                {
+                    public const string Textbox = "Umbraco.Textbox";
+                    public const string Date = "Umbraco.Date";
+                    public const string ContentPicker2 = "Umbraco.ContentPicker2";
+                    public const string MediaPicker2 = "Umbraco.MediaPicker2";
+                    public const string MemberPicker2 = "Umbraco.MemberPicker2";
+                    public const string MultiNodeTreePicker2 = "Umbraco.MultiNodeTreePicker2";
+                    public const string TextboxMultiple = "Umbraco.TextboxMultiple";
+                    public const string RelatedLinks2 = "Umbraco.RelatedLinks2";
+                    public const string RelatedLinks = "Umbraco.RelatedLinks";
+
+                }
+            }
+
            /// <summary>
            /// Defines Umbraco built-in property editor aliases.
            /// </summary>
@@ -34,11 +51,6 @@ namespace Umbraco.Core
                /// </summary>
                public const string ContentPicker = "Umbraco.ContentPicker";

-                /// <summary>
-                /// Date.
-                /// </summary>
-                public const string Date = "Umbraco.Date";
-
                /// <summary>
                /// DateTime.
                /// </summary>
@@ -48,7 +60,7 @@ namespace Umbraco.Core
                /// DropDown List.
                /// </summary>
                public const string DropDownListFlexible = "Umbraco.DropDown.Flexible";
-                
+
                /// <summary>
                /// Grid.
                /// </summary>
@@ -105,9 +117,9 @@ namespace Umbraco.Core
                public const string MultipleTextstring = "Umbraco.MultipleTextstring";

                /// <summary>
-                /// NoEdit.
+                /// Label.
                /// </summary>
-                public const string NoEdit = "Umbraco.NoEdit";
+                public const string Label = "Umbraco.Label";

                /// <summary>
                /// Picker Relations.
@@ -118,7 +130,7 @@ namespace Umbraco.Core
                /// RadioButton list.
                /// </summary>
                public const string RadioButtonList = "Umbraco.RadioButtonList";
-                
+
                /// <summary>
                /// Slider.
                /// </summary>
@@ -142,7 +154,7 @@ namespace Umbraco.Core
                /// <summary>
                /// TinyMCE
                /// </summary>
-                public const string TinyMce = "Umbraco.TinyMCEv3";
+                public const string TinyMce = "Umbraco.TinyMCE";

                /// <summary>
                /// Boolean.
@@ -163,7 +175,7 @@ namespace Umbraco.Core
                /// Upload Field.
                /// </summary>
                public const string UploadField = "Umbraco.UploadField";
-                
+
                /// <summary>
                /// Email Address.
                /// </summary>
@@ -15,13 +15,18 @@ namespace Umbraco.Core
            public const int SuperUserId = -1;

            /// <summary>
-            /// The id for the 'unknown' user
+            /// The id for the 'unknown' user.
            /// </summary>
            /// <remarks>
            /// This is a user row that exists in the DB only for referential integrity but the user is never returned from any of the services
            /// </remarks>
            public const int UnknownUserId = 0;

+            /// <summary>
+            /// The name of the 'unknown' user.
+            /// </summary>
+            public const string UnknownUserName = "SYTEM";
+
            public const string AdminGroupAlias = "admin";
            public const string SensitiveDataGroupAlias = "sensitiveData";
            public const string TranslatorGroupAlias = "translator";
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
    public static partial class Constants
    {
@@ -22,7 +19,6 @@ namespace Umbraco.Core
            public const string PreviewCookieName = "UMB_PREVIEW";

            public const string InstallerCookieName = "umb_installId";
-
        }
    }
 }
@@ -7,6 +7,7 @@ using System.Web;
 using System.Xml.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NPoco.Expressions;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
@@ -52,8 +53,8 @@ namespace Umbraco.Core
            return ContentStatus.Unpublished;
        }

-        
-        
+
+
        #endregion

        /// <summary>
@@ -134,9 +135,14 @@ namespace Umbraco.Core
        /// <summary>
        /// Sets the posted file value of a property.
        /// </summary>
-        /// <remarks>This really is for FileUpload fields only, and should be obsoleted. For anything else,
-        /// you need to store the file by yourself using Store and then figure out
-        /// how to deal with auto-fill properties (if any) and thumbnails (if any) by yourself.</remarks>
+        public static void SetValue(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias, string filename, HttpPostedFileBase postedFile, string culture = null, string segment = null)
+        {
+            content.SetValue(contentTypeBaseServiceProvider, propertyTypeAlias, postedFile.FileName, postedFile.InputStream, culture, segment);
+        }
+
+        /// <summary>
+        /// Sets the posted file value of a property.
+        /// </summary>
        public static void SetValue(this IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias, string filename, Stream filestream, string culture = null, string segment = null)
        {
            if (filename == null || filestream == null) return;
@@ -66,44 +66,44 @@ namespace Umbraco.Core
        /// <summary>
        /// Determines whether the content type is invariant.
        /// </summary>
-        public static bool VariesByNothing(this PublishedContentType contentType) => contentType.Variations.VariesByNothing();
+        public static bool VariesByNothing(this IPublishedContentType contentType) => contentType.Variations.VariesByNothing();

        /// <summary>
        /// Determines whether the content type varies by culture.
        /// </summary>
        /// <remarks>And then it could also vary by segment.</remarks>
-        public static bool VariesByCulture(this PublishedContentType contentType) => contentType.Variations.VariesByCulture();
+        public static bool VariesByCulture(this IPublishedContentType contentType) => contentType.Variations.VariesByCulture();

        /// <summary>
        /// Determines whether the content type varies by segment.
        /// </summary>
        /// <remarks>And then it could also vary by culture.</remarks>
-        public static bool VariesBySegment(this PublishedContentType contentType) => contentType.Variations.VariesBySegment();
+        public static bool VariesBySegment(this IPublishedContentType contentType) => contentType.Variations.VariesBySegment();

        /// <summary>
        /// Determines whether the content type varies by culture and segment.
        /// </summary>
-        public static bool VariesByCultureAndSegment(this PublishedContentType contentType) => contentType.Variations.VariesByCultureAndSegment();
+        public static bool VariesByCultureAndSegment(this IPublishedContentType contentType) => contentType.Variations.VariesByCultureAndSegment();

        /// <summary>
        /// Determines whether the property type is invariant.
        /// </summary>
-        public static bool VariesByNothing(this PublishedPropertyType propertyType) => propertyType.Variations.VariesByNothing();
+        public static bool VariesByNothing(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesByNothing();

        /// <summary>
        /// Determines whether the property type varies by culture.
        /// </summary>
-        public static bool VariesByCulture(this PublishedPropertyType propertyType) => propertyType.Variations.VariesByCulture();
+        public static bool VariesByCulture(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesByCulture();

        /// <summary>
        /// Determines whether the property type varies by segment.
        /// </summary>
-        public static bool VariesBySegment(this PublishedPropertyType propertyType) => propertyType.Variations.VariesBySegment();
+        public static bool VariesBySegment(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesBySegment();

        /// <summary>
        /// Determines whether the property type varies by culture and segment.
        /// </summary>
-        public static bool VariesByCultureAndSegment(this PublishedPropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();
+        public static bool VariesByCultureAndSegment(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();

        /// <summary>
        /// Determines whether a variation is invariant.
@@ -1,64 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Abstract implementation of IDisposable.
-    /// </summary>
-    /// <remarks>
-    /// This is for objects that DO have unmanaged resources. Use <see cref="DisposableObjectSlim"/>
-    /// for objects that do NOT have unmanaged resources, and avoid creating a finalizer.
-    ///
-    /// Can also be used as a pattern for when inheriting is not possible.
-    ///
-    /// See also: https://msdn.microsoft.com/en-us/library/b1yfkh5e%28v=vs.110%29.aspx
-    /// See also: https://lostechies.com/chrispatterson/2012/11/29/idisposable-done-right/
-    ///
-    /// Note: if an object's ctor throws, it will never be disposed, and so if that ctor
-    /// has allocated disposable objects, it should take care of disposing them.
-    /// </remarks>
-    public abstract class DisposableObject : IDisposable
-    {
-        private readonly object _locko = new object();
-
-        // gets a value indicating whether this instance is disposed.
-        // for internal tests only (not thread safe)
-        public bool Disposed { get; private set; }
-
-        // implements IDisposable
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        // finalizer
-        ~DisposableObject()
-        {
-            Dispose(false);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            // can happen if the object construction failed
-            if (_locko == null)
-                return;
-
-            lock (_locko)
-            {
-                if (Disposed) return;
-                Disposed = true;
-            }
-
-            DisposeUnmanagedResources();
-
-            if (disposing)
-                DisposeResources();
-        }
-
-        protected abstract void DisposeResources();
-
-        protected virtual void DisposeUnmanagedResources()
-        { }
-    }
-}
@@ -10,6 +10,20 @@ namespace Umbraco.Core
    ///</summary>
    public static class EnumerableExtensions
    {
+        internal static bool IsCollectionEmpty<T>(this IReadOnlyCollection<T> list) => list == null || list.Count == 0;
+
+        internal static bool HasDuplicates<T>(this IEnumerable<T> items, bool includeNull)
+        {
+            var hs = new HashSet<T>();
+            foreach (var item in items)
+            {
+                if ((item != null || includeNull) && !hs.Add(item))
+                    return true;
+            }
+            return false;
+        }
+
+
        /// <summary>
        /// Wraps this object instance into an IEnumerable{T} consisting of a single item.
        /// </summary>
@@ -100,7 +114,6 @@ namespace Umbraco.Core
            }
        }

-        
        /// <summary>
        /// Returns true if all items in the other collection exist in this collection
        /// </summary>
@@ -1,8 +1,9 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using Umbraco.Core.Composing;

-namespace Umbraco.Core.Composing
+namespace Umbraco.Core
 {
    /// <summary>
    /// Provides extension methods to the <see cref="IFactory"/> class.
@@ -40,5 +40,72 @@ namespace Umbraco.Core

            public DecomposedGuid(Guid value) : this() => this.Value = value;
        }
+
+        private static readonly char[] Base32Table =
+        {
+            'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+            'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5'
+        };
+
+        /// <summary>
+        /// Converts a Guid into a base-32 string.
+        /// </summary>
+        /// <param name="guid">A Guid.</param>
+        /// <param name="length">The string length.</param>
+        /// <returns>A base-32 encoded string.</returns>
+        /// <remarks>
+        /// <para>A base-32 string representation of a Guid is the shortest, efficient, representation
+        /// that is case insensitive (base-64 is case sensitive).</para>
+        /// <para>Length must be 1-26, anything else becomes 26.</para>
+        /// </remarks>
+        public static string ToBase32String(Guid guid, int length = 26)
+        {
+            if (length <= 0 || length > 26)
+                length = 26;
+
+            var bytes = guid.ToByteArray(); // a Guid is 128 bits ie 16 bytes
+
+            // this could be optimized by making it unsafe,
+            // and fixing the table + bytes + chars (see Convert.ToBase64CharArray)
+
+            // each block of 5 bytes = 5*8 = 40 bits
+            // becomes 40 bits = 8*5 = 8 byte-32 chars
+            // a Guid is 3 blocks + 8 bits
+
+            // so it turns into a 3*8+2 = 26 chars string
+            var chars = new char[length];
+
+            var i = 0;
+            var j = 0;
+
+            while (i < 15)
+            {
+                if (j == length) break;
+                chars[j++] = Base32Table[(bytes[i] & 0b1111_1000) >> 3];
+                if (j == length) break;
+                chars[j++] = Base32Table[((bytes[i] & 0b0000_0111) << 2) | ((bytes[i + 1] & 0b1100_0000) >> 6)];
+                if (j == length) break;
+                chars[j++] = Base32Table[(bytes[i + 1] & 0b0011_1110) >> 1];
+                if (j == length) break;
+                chars[j++] = Base32Table[(bytes[i + 1] & 0b0000_0001) | ((bytes[i + 2] & 0b1111_0000) >> 4)];
+                if (j == length) break;
+                chars[j++] = Base32Table[((bytes[i + 2] & 0b0000_1111) << 1) | ((bytes[i + 3] & 0b1000_0000) >> 7)];
+                if (j == length) break;
+                chars[j++] = Base32Table[(bytes[i + 3] & 0b0111_1100) >> 2];
+                if (j == length) break;
+                chars[j++] = Base32Table[((bytes[i + 3] & 0b0000_0011) << 3) | ((bytes[i + 4] & 0b1110_0000) >> 5)];
+                if (j == length) break;
+                chars[j++] = Base32Table[bytes[i + 4] & 0b0001_1111];
+
+                i += 5;
+            }
+
+            if (j < length)
+                chars[j++] = Base32Table[(bytes[i] & 0b1111_1000) >> 3];
+            if (j < length)
+                chars[j] = Base32Table[(bytes[i] & 0b0000_0111) << 2];
+
+            return new string(chars);
+        }
    }
 }
@@ -29,7 +29,7 @@ namespace Umbraco.Core.IO
        // shadow support
        private readonly List<ShadowWrapper> _shadowWrappers = new List<ShadowWrapper>();
        private readonly object _shadowLocker = new object();
-        private static Guid _shadowCurrentId = Guid.Empty; // static - unique!!
+        private static string _shadowCurrentId; // static - unique!!
        #region Constructor

        // DI wants a public ctor
@@ -45,13 +45,13 @@ namespace Umbraco.Core.IO
            _shadowWrappers.Clear();
            _filesystems.Clear();
            Volatile.Write(ref _wkfsInitialized, false);
-            _shadowCurrentId = Guid.Empty;
+            _shadowCurrentId = null;
        }

        // for tests only, totally unsafe
        internal static void ResetShadowId()
        {
-            _shadowCurrentId = Guid.Empty;
+            _shadowCurrentId = null;
        }

        // set by the scope provider when taking control of filesystems
@@ -126,11 +126,11 @@ namespace Umbraco.Core.IO
            var scriptsFileSystem = new PhysicalFileSystem(SystemDirectories.Scripts);
            var mvcViewsFileSystem = new PhysicalFileSystem(SystemDirectories.MvcViews);

-            _macroPartialFileSystem = new ShadowWrapper(macroPartialFileSystem, "Views/MacroPartials", IsScoped);
-            _partialViewsFileSystem = new ShadowWrapper(partialViewsFileSystem, "Views/Partials", IsScoped);
+            _macroPartialFileSystem = new ShadowWrapper(macroPartialFileSystem, "macro-partials", IsScoped);
+            _partialViewsFileSystem = new ShadowWrapper(partialViewsFileSystem, "partials", IsScoped);
            _stylesheetsFileSystem = new ShadowWrapper(stylesheetsFileSystem, "css", IsScoped);
            _scriptsFileSystem = new ShadowWrapper(scriptsFileSystem, "scripts", IsScoped);
-            _mvcViewsFileSystem = new ShadowWrapper(mvcViewsFileSystem, "Views", IsScoped);
+            _mvcViewsFileSystem = new ShadowWrapper(mvcViewsFileSystem, "views", IsScoped);

            // TODO: do we need a lock here?
            _shadowWrappers.Add(_macroPartialFileSystem);
@@ -146,6 +146,11 @@ namespace Umbraco.Core.IO

        #region Providers

+        private readonly Dictionary<Type, string> _paths = new Dictionary<Type, string>();
+
+        // internal for tests
+        internal IReadOnlyDictionary<Type, string> Paths => _paths;
+
        /// <summary>
        /// Gets a strongly-typed filesystem.
        /// </summary>
@@ -162,10 +167,33 @@ namespace Umbraco.Core.IO

            return (TFileSystem) _filesystems.GetOrAdd(typeof(TFileSystem), _ => new Lazy<IFileSystem>(() =>
            {
-                var name = typeof(TFileSystem).FullName;
-                if (name == null) throw new Exception("panic!");
+                var typeofTFileSystem = typeof(TFileSystem);

-                var shadowWrapper = CreateShadowWrapper(supporting, "typed/" + name);
+                // path must be unique and not collide with paths used in CreateWellKnownFileSystems
+                // for our well-known 'media' filesystem we can use the short 'media' path
+                // for others, put them under 'x/' and use ... something
+                string path;
+                if (typeofTFileSystem == typeof(MediaFileSystem))
+                {
+                    path = "media";
+                }
+                else
+                {
+                    lock (_paths)
+                    {
+                        if (!_paths.TryGetValue(typeofTFileSystem, out path))
+                        {
+                            path = Guid.NewGuid().ToString("N").Substring(0, 6);
+                            while (_paths.ContainsValue(path)) // this can't loop forever, right?
+                                path = Guid.NewGuid().ToString("N").Substring(0, 6);
+                            _paths[typeofTFileSystem] = path;
+                        }
+                    }
+
+                    path = "x/" + path;
+                }
+
+                var shadowWrapper = CreateShadowWrapper(supporting, path);
                return _container.CreateInstance<TFileSystem>(shadowWrapper);
            })).Value;
        }
@@ -179,35 +207,37 @@ namespace Umbraco.Core.IO
        // 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.

-        internal ICompletable Shadow(Guid id)
+        internal ICompletable Shadow()
        {
            if (Volatile.Read(ref _wkfsInitialized) == false) EnsureWellKnownFileSystems();

+            var id = ShadowWrapper.CreateShadowId();
            return new ShadowFileSystems(this, id); // will invoke BeginShadow and EndShadow
        }

-        internal void BeginShadow(Guid id)
+        internal void BeginShadow(string id)
        {
            lock (_shadowLocker)
            {
                // if we throw here, it means that something very wrong happened.
-                if (_shadowCurrentId != Guid.Empty)
+                if (_shadowCurrentId != null)
                    throw new InvalidOperationException("Already shadowing.");
+
                _shadowCurrentId = id;

-                _logger.Debug<ShadowFileSystems>("Shadow '{ShadowId}'", id);
+                _logger.Debug<ShadowFileSystems>("Shadow '{ShadowId}'", _shadowCurrentId);

                foreach (var wrapper in _shadowWrappers)
-                    wrapper.Shadow(id);
+                    wrapper.Shadow(_shadowCurrentId);
            }
        }

-        internal void EndShadow(Guid id, bool completed)
+        internal void EndShadow(string id, bool completed)
        {
            lock (_shadowLocker)
            {
                // if we throw here, it means that something very wrong happened.
-                if (_shadowCurrentId == Guid.Empty)
+                if (_shadowCurrentId == null)
                    throw new InvalidOperationException("Not shadowing.");
                if (id != _shadowCurrentId)
                    throw new InvalidOperationException("Not the current shadow.");
@@ -228,7 +258,7 @@ namespace Umbraco.Core.IO
                    }
                }

-                _shadowCurrentId = Guid.Empty;
+                _shadowCurrentId = null;

                if (exceptions.Count > 0)
                    throw new AggregateException(completed ? "Failed to apply all changes (see exceptions)." : "Failed to abort (see exceptions).", exceptions);
@@ -240,7 +270,7 @@ namespace Umbraco.Core.IO
            lock (_shadowLocker)
            {
                var wrapper = new ShadowWrapper(filesystem, shadowPath, IsScoped);
-                if (_shadowCurrentId != Guid.Empty)
+                if (_shadowCurrentId != null)
                    wrapper.Shadow(_shadowCurrentId);
                _shadowWrappers.Add(wrapper);
                return wrapper;
@@ -7,7 +7,7 @@ namespace Umbraco.Core.IO.MediaPathSchemes
    /// Implements a combined-guids media path scheme.
    /// </summary>
    /// <remarks>
-    /// <para>Path is "{combinedGuid}/{filename>}" where combinedGuid is a combination of itemGuid and propertyGuid.</para>
+    /// <para>Path is "{combinedGuid}/{filename}" where combinedGuid is a combination of itemGuid and propertyGuid.</para>
    /// </remarks>
    public class CombinedGuidsMediaPathScheme : IMediaPathScheme
    {
@@ -16,7 +16,9 @@ namespace Umbraco.Core.IO.MediaPathSchemes
        {
            // 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
-            var directory = HexEncoder.Encode(GuidUtils.Combine(itemGuid, propertyGuid).ToByteArray()/*'/', 2, 4*/); // could use ext to fragment path eg 12/e4/f2/...
+
+            var combinedGuid = GuidUtils.Combine(itemGuid, propertyGuid);
+            var directory = HexEncoder.Encode(combinedGuid.ToByteArray()/*'/', 2, 4*/); // could use ext to fragment path eg 12/e4/f2/...
            return Path.Combine(directory, filename).Replace('\\', '/');
        }

@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+
+namespace Umbraco.Core.IO.MediaPathSchemes
+{
+    /// <summary>
+    /// Implements a unique directory media path scheme.
+    /// </summary>
+    /// <remarks>
+    /// <para>This scheme provides deterministic short paths, with potential collisions.</para>
+    /// </remarks>
+    public class UniqueMediaPathScheme : IMediaPathScheme
+    {
+        private const int DirectoryLength = 8;
+
+        /// <inheritdoc />
+        public string GetFilePath(IMediaFileSystem fileSystem, Guid itemGuid, Guid propertyGuid, string filename, string previous = null)
+        {
+            var combinedGuid = GuidUtils.Combine(itemGuid, propertyGuid);
+            var directory = GuidUtils.ToBase32String(combinedGuid, DirectoryLength);
+
+            return Path.Combine(directory, filename).Replace('\\', '/');
+        }
+
+        /// <inheritdoc />
+        /// <remarks>
+        /// <para>Returning null so that <see cref="MediaFileSystem.DeleteMediaFiles"/> does *not*
+        /// delete any directory. This is because the above shortening of the Guid to 8 chars
+        /// means we're increasing the risk of collision, and we don't want to delete files
+        /// belonging to other media items.</para>
+        /// <para>And, at the moment, we cannot delete directory "only if it is empty" because of
+        /// race conditions. We'd need to implement locks in <see cref="MediaFileSystem"/> for
+        /// this.</para>
+        /// </remarks>
+        public string GetDeleteDirectory(IMediaFileSystem fileSystem, string filepath) => null;
+    }
+}
@@ -304,7 +304,13 @@ namespace Umbraco.Core.IO
            // 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))
+            {
+                // this says that 4.7.2 supports long paths - but Windows does not
+                // https://docs.microsoft.com/en-us/dotnet/api/system.io.pathtoolongexception?view=netframework-4.7.2
+                if (path.Length > 260)
+                    throw new PathTooLongException($"Path {path} is too long.");
                return path;
+            }

            // nothing prevents us to reach the file, security-wise, yet it is outside
            // this filesystem's root - throw
@@ -10,7 +10,7 @@ namespace Umbraco.Core.IO
        private bool _completed;

        // invoked by the filesystems when shadowing
-        public ShadowFileSystems(FileSystems fileSystems, Guid id)
+        public ShadowFileSystems(FileSystems fileSystems, string id)
        {
            _fileSystems = fileSystems;
            Id = id;
@@ -19,7 +19,7 @@ namespace Umbraco.Core.IO
        }

        // for tests
-        public Guid Id { get; }
+        public string Id { get; }

        // invoked by the scope when exiting, if completed
        public void Complete()
@@ -22,7 +22,33 @@ namespace Umbraco.Core.IO
            _isScoped = isScoped;
        }

-        internal void Shadow(Guid id)
+        public static string CreateShadowId()
+        {
+            const int retries = 50; // avoid infinite loop
+            const int idLength = 8; // 6 chars
+
+            // shorten a Guid to idLength chars, and see whether it collides
+            // with an existing directory or not - if it does, try again, and
+            // we should end up with a unique identifier eventually - but just
+            // detect infinite loops (just in case)
+
+            for (var i = 0; i < retries; i++)
+            {
+                var id = GuidUtils.ToBase32String(Guid.NewGuid(), idLength);
+
+                var virt = ShadowFsPath + "/" + id;
+                var shadowDir = IOHelper.MapPath(virt);
+                if (Directory.Exists(shadowDir))
+                    continue;
+
+                Directory.CreateDirectory(shadowDir);
+                return id;
+            }
+
+            throw new Exception($"Could not get a shadow identifier (tried {retries} times)");
+        }
+
+        internal void Shadow(string 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
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using System.Web;
+using System.IO;
 using Umbraco.Core.Configuration;

 namespace Umbraco.Core.IO
@@ -12,23 +10,7 @@ namespace Umbraco.Core.IO
        // TODO: Kill this off we don't have umbraco.config XML cache we now have NuCache
        public static string GetContentCacheXml(IGlobalSettings globalSettings)
        {
-            switch (globalSettings.LocalTempStorageLocation)
-            {
-                case LocalTempStorage.AspNetTemp:
-                    return Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco.config");
-                case LocalTempStorage.EnvironmentTemp:
-                    var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
-                    var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
-                        //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
-                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
-                        // utilizing an old path
-                        appDomainHash);
-                    return Path.Combine(cachePath, "umbraco.config");
-                case LocalTempStorage.Default:
-                    return IOHelper.ReturnPath(Constants.AppSettings.ContentXML, "~/App_Data/umbraco.config");
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
+            return Path.Combine(globalSettings.LocalTempPath, "umbraco.config");
        }
    }
 }
--- a/Show More
+++ b/Show More