Fix StandaloneTests

Added missing nuget dependencies to the nuspec-file of UmbracoCms.Core
Fixed documentation mistake
2019-05-16 14:48:04 +02:00 · 2019-05-16 14:24:09 +02:00 · 2019-05-16 10:50:24 +02:00 · 2019-05-16 10:36:57 +02:00 · 2019-05-16 10:27:00 +02:00 · 2019-05-14 13:32:28 +02:00
758 changed files with 16820 additions and 11843 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.
-
@@ -161,3 +161,4 @@ build/temp/

 # eof
 /src/Umbraco.Web.UI.Client/TESTS-*.xml
+/src/ApiDocs/api/*
@@ -22,7 +22,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,6 +39,8 @@
                <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>
@@ -55,6 +56,5 @@

        <!-- 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" />
    </files>
 </package>
@@ -59,8 +59,6 @@

        <!-- 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" />
    </files>
 </package>
@@ -58,6 +58,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!

@@ -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"
+        -Symbols -SymbolPackageFormat snupkg -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"
+        -Symbols -SymbolPackageFormat snupkg -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" `
@@ -419,6 +429,53 @@
    Write-Host "Prepare Azure Gallery"
    $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",
  {
@@ -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.1")]
-[assembly: AssemblyInformationalVersion("8.0.1")]
+[assembly: AssemblyFileVersion("8.1.0")]
+[assembly: AssemblyInformationalVersion("8.1.0")]
@@ -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,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);
@@ -22,7 +22,7 @@ namespace Umbraco.Core.Compose

        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.Compose

        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;
@@ -70,7 +70,23 @@ namespace Umbraco.Core.Composing
            }
        }

-        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.Composing
            // 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.Composing
                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.Composing
                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.Composing
                // 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.Composing
                        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>();
@@ -133,7 +133,11 @@ namespace Umbraco.Core.Composing

            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,4 +1,4 @@
-using AutoMapper;
+using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.Identity;

 namespace Umbraco.Core.Composing.CompositionExtensions
@@ -8,7 +8,9 @@ namespace Umbraco.Core.Composing.CompositionExtensions
    {
        public static Composition ComposeCoreMappingProfiles(this Composition composition)
        {
-            composition.Register<Profile, IdentityMapperProfile>();
+            composition.RegisterUnique<UmbracoMapper>();
+            composition.WithCollectionBuilder<MapDefinitionCollectionBuilder>()
+                .Add<IdentityMapDefinition>();
            return composition;
        }
    }
@@ -46,6 +46,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
            composition.RegisterUnique<IPartialViewRepository, PartialViewRepository>();
            composition.RegisterUnique<IScriptRepository, ScriptRepository>();
            composition.RegisterUnique<IStylesheetRepository, StylesheetRepository>();
+            composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();

            return composition;
        }
@@ -98,7 +98,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                : 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
@@ -106,7 +105,6 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                ? 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())));
@@ -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;
+        }
+    }
+}
@@ -6,30 +6,50 @@ namespace Umbraco.Core.Composing
    /// <summary>
    /// Provides a base class for collections of types.
    /// </summary>
-    public abstract class TypeCollectionBuilderBase<TCollection, TConstraint> : ICollectionBuilder<TCollection, Type>
+    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>();

-        private Type Validate(Type type, string action)
+        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 void Add(Type type) => _types.Add(Validate(type, "add"));
-
-        public void Add<T>() => Add(typeof(T));
-
-        public void Add(IEnumerable<Type> types)
+        public TBuilder Add(Type type)
        {
-            foreach (var type in types) Add(type);
+            _types.Add(Validate(type, "add"));
+            return This;
        }

-        public void Remove(Type type) => _types.Remove(Validate(type, "remove"));
+        public TBuilder Add<T>()
+        {
+            Add(typeof(T));
+            return This;
+        }

-        public void Remove<T>() => Remove(typeof(T));
+        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)
        {
@@ -203,6 +203,28 @@ namespace Umbraco.Core
            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>
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net.Configuration;
 using System.Web;
 using System.Web.Configuration;
+using System.Web.Hosting;
 using System.Xml.Linq;
 using Umbraco.Core.IO;

@@ -17,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)
@@ -131,7 +131,7 @@ namespace Umbraco.Core.Configuration
                    : "~/App_Data/umbraco.config";
            }
        }
-        
+
        /// <summary>
        /// Gets the path to umbraco's root directory (/umbraco by default).
        /// </summary>
@@ -163,7 +163,7 @@ namespace Umbraco.Core.Configuration
                SaveSetting(Constants.AppSettings.ConfigurationStatus, value);
            }
        }
-        
+
        /// <summary>
        /// Saves a setting into the configuration file.
        /// </summary>
@@ -206,7 +206,7 @@ namespace Umbraco.Core.Configuration
                ConfigurationManager.RefreshSection("appSettings");
            }
        }
-              
+
        /// <summary>
        /// Gets a value indicating whether umbraco is running in [debug mode].
        /// </summary>
@@ -250,7 +250,7 @@ namespace Umbraco.Core.Configuration
                }
            }
        }
-        
+
        /// <summary>
        /// Returns the number of days that should take place between version checks.
        /// </summary>
@@ -269,7 +269,7 @@ namespace Umbraco.Core.Configuration
                }
            }
        }
-        
+
        /// <inheritdoc />
        public LocalTempStorage LocalTempStorageLocation
        {
@@ -288,25 +288,43 @@ namespace Umbraco.Core.Configuration
        {
            get
            {
+                if (_localTempPath != null)
+                    return _localTempPath;
+
                switch (LocalTempStorageLocation)
                {
                    case LocalTempStorage.AspNetTemp:
-                        return System.IO.Path.Combine(HttpRuntime.CodegenDir, "UmbracoData");
+                        return _localTempPath = System.IO.Path.Combine(HttpRuntime.CodegenDir, "UmbracoData");
+
                    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.GenerateHash();
-                        return System.IO.Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData", appDomainHash);
+
+                        // 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 IOHelper.MapPath("~/App_Data/TEMP");
+                        return _localTempPath = IOHelper.MapPath("~/App_Data/TEMP");
                }
            }
        }

-
        /// <summary>
        /// Gets the default UI language.
        /// </summary>
@@ -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>
@@ -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.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
-                                    }
+                                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,17 +1,9 @@
-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
            /// </summary>
@@ -42,12 +34,10 @@ namespace Umbraco.Core
            /// </summary>
            public const string MemberType = "icon-users";

-
            /// <summary>
            /// System member icon
            /// </summary>
            public const string Template = "icon-layout";
-
        }
    }
 }
@@ -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
        {
@@ -34,7 +34,6 @@ namespace Umbraco.Core
                /// </summary>
                public const string ContentPicker = "Umbraco.ContentPicker";

-   
                /// <summary>
                /// DateTime.
                /// </summary>
@@ -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;
@@ -10,6 +10,18 @@ namespace Umbraco.Core
    ///</summary>
    public static class EnumerableExtensions
    {
+        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 +112,7 @@ namespace Umbraco.Core
            }
        }

-        
+
        /// <summary>
        /// Returns true if all items in the other collection exist in this collection
        /// </summary>
@@ -8,12 +8,9 @@ namespace Umbraco.Core.IO.MediaPathSchemes
    /// </summary>
    /// <remarks>
    /// <para>Path is "{combinedGuid}/{filename}" where combinedGuid is a combination of itemGuid and propertyGuid.</para>
-    /// <para>This scheme is dangerous, as it does not prevent potential collisions.</para>
    /// </remarks>
    public class CombinedGuidsMediaPathScheme : IMediaPathScheme
    {
-        private const int DirectoryLength = 8;
-
        /// <inheritdoc />
        public string GetFilePath(IMediaFileSystem fileSystem, Guid itemGuid, Guid propertyGuid, string filename, string previous = null)
        {
@@ -21,7 +18,7 @@ namespace Umbraco.Core.IO.MediaPathSchemes
            // for a single content cannot store two different files with the same name

            var combinedGuid = GuidUtils.Combine(itemGuid, propertyGuid);
-            var directory = GuidUtils.ToBase32String(combinedGuid, DirectoryLength); // see also HexEncoder, we may want to fragment path eg 12/e4/f3...
+            var directory = HexEncoder.Encode(combinedGuid.ToByteArray()/*'/', 2, 4*/); // could use ext to fragment path eg 12/e4/f2/...
            return Path.Combine(directory, filename).Replace('\\', '/');
        }

@@ -7,7 +7,7 @@ namespace Umbraco.Core.IO.MediaPathSchemes
    /// Implements a unique directory media path scheme.
    /// </summary>
    /// <remarks>
-    /// <para>This scheme provides short paths, yet handle potential collisions.</para>
+    /// <para>This scheme provides deterministic short paths, with potential collisions.</para>
    /// </remarks>
    public class UniqueMediaPathScheme : IMediaPathScheme
    {
@@ -16,23 +16,22 @@ namespace Umbraco.Core.IO.MediaPathSchemes
        /// <inheritdoc />
        public string GetFilePath(IMediaFileSystem fileSystem, Guid itemGuid, Guid propertyGuid, string filename, string previous = null)
        {
-            string directory;
-
-            // no point "combining" guids if all we want is some random guid - just get a new one
-            // and then, because we don't want collisions, ensure that the directory does not already exist
-            // (should be quite rare, but eh...)
-
-            do
-            {
-                var combinedGuid = Guid.NewGuid();
-                directory = GuidUtils.ToBase32String(combinedGuid, DirectoryLength); // see also HexEncoder, we may want to fragment path eg 12/e4/f3...
-
-            } while (fileSystem.DirectoryExists(directory));
+            var combinedGuid = GuidUtils.Combine(itemGuid, propertyGuid);
+            var directory = GuidUtils.ToBase32String(combinedGuid, DirectoryLength);

            return Path.Combine(directory, filename).Replace('\\', '/');
        }

        /// <inheritdoc />
-        public string GetDeleteDirectory(IMediaFileSystem fileSystem, string filepath) => Path.GetDirectoryName(filepath);
+        /// <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;
    }
-}
+}
@@ -1,7 +1,11 @@
 using System;
+using System.Text;
 using System.Web;
 using Serilog;
+using Serilog.Configuration;
+using Serilog.Core;
 using Serilog.Events;
+using Serilog.Formatting;
 using Serilog.Formatting.Compact;
 using Umbraco.Core.Logging.Serilog.Enrichers;

@@ -9,6 +13,7 @@ namespace Umbraco.Core.Logging.Serilog
 {
    public static class LoggerConfigExtensions
    {
+        private const string AppDomainId = "AppDomainId";
        /// <summary>
        /// This configures Serilog with some defaults
        /// Such as adding ProcessID, Thread, AppDomain etc
@@ -28,14 +33,14 @@ namespace Umbraco.Core.Logging.Serilog
                .Enrich.WithProcessId()
                .Enrich.WithProcessName()
                .Enrich.WithThreadId()
-                .Enrich.WithProperty("AppDomainId", AppDomain.CurrentDomain.Id)
+                .Enrich.WithProperty(AppDomainId, AppDomain.CurrentDomain.Id)
                .Enrich.WithProperty("AppDomainAppId", HttpRuntime.AppDomainAppId.ReplaceNonAlphanumericChars(string.Empty))
                .Enrich.WithProperty("MachineName", Environment.MachineName)
                .Enrich.With<Log4NetLevelMapperEnricher>()
                .Enrich.With<HttpSessionIdEnricher>()
                .Enrich.With<HttpRequestNumberEnricher>()
                .Enrich.With<HttpRequestIdEnricher>();
-            
+
            return logConfig;
        }

@@ -50,15 +55,51 @@ namespace Umbraco.Core.Logging.Serilog
            //Main .txt logfile - in similar format to older Log4Net output
            //Ends with ..txt as Date is inserted before file extension substring
            logConfig.WriteTo.File($@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\Logs\UmbracoTraceLog.{Environment.MachineName}..txt",
-                    shared: true,
-                    rollingInterval: RollingInterval.Day,
-                    restrictedToMinimumLevel: minimumLevel,
-                    retainedFileCountLimit: null, //Setting to null means we keep all files - default is 31 days
-                    outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss,fff} [P{ProcessId}/D{AppDomainId}/T{ThreadId}] {Log4NetLevel}  {SourceContext} - {Message:lj}{NewLine}{Exception}");
+                shared: true,
+                rollingInterval: RollingInterval.Day,
+                restrictedToMinimumLevel: minimumLevel,
+                retainedFileCountLimit: null, //Setting to null means we keep all files - default is 31 days
+                outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss,fff} [P{ProcessId}/D{AppDomainId}/T{ThreadId}] {Log4NetLevel}  {SourceContext} - {Message:lj}{NewLine}{Exception}");

            return logConfig;
        }

+
+        /// <remarks>
+        ///    Used in config - If renamed or moved to other assembly the config file also has be updated.
+        /// </remarks>
+        public static LoggerConfiguration File(this LoggerSinkConfiguration configuration, ITextFormatter formatter,
+            string path,
+            LogEventLevel restrictedToMinimumLevel = LogEventLevel.Verbose,
+            LoggingLevelSwitch levelSwitch = null,
+            long? fileSizeLimitBytes = 1073741824,
+            TimeSpan? flushToDiskInterval = null,
+            RollingInterval rollingInterval = RollingInterval.Infinite,
+            bool rollOnFileSizeLimit = false,
+            int? retainedFileCountLimit = 31,
+            Encoding encoding = null
+   )
+        {
+            return configuration.Async(
+                asyncConfiguration => asyncConfiguration.Map(AppDomainId, (_,mapConfiguration) =>
+                        mapConfiguration.File(
+                            formatter,
+                            path,
+                            restrictedToMinimumLevel,
+                            fileSizeLimitBytes,
+                            levelSwitch,
+                            buffered:true,
+                            shared:false,
+                            flushToDiskInterval,
+                            rollingInterval,
+                            rollOnFileSizeLimit,
+                            retainedFileCountLimit,
+                            encoding),
+                    sinkMapCountLimit:0)
+                );
+        }
+
+
        /// <summary>
        /// Outputs a CLEF format JSON log at /App_Data/Logs/
        /// </summary>
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Logging.Serilog
    ///<summary>
    /// Implements <see cref="ILogger"/> on top of Serilog.
    ///</summary>
-    public class SerilogLogger : ILogger
+    public class SerilogLogger : ILogger, IDisposable
    {
        /// <summary>
        /// Initialize a new instance of the <see cref="SerilogLogger"/> class with a configuration file.
@@ -271,5 +271,10 @@ namespace Umbraco.Core.Logging.Serilog
        {
            LoggerFor(reporting).Verbose(messageTemplate, propertyValues);
        }
+
+        public void Dispose()
+        {
+            Log.CloseAndFlush();
+        }
    }
 }
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Newtonsoft.Json;
 using Serilog.Events;
 using Serilog.Formatting.Compact.Reader;

@@ -10,13 +11,15 @@ namespace Umbraco.Core.Logging.Viewer
    internal class JsonLogViewer : LogViewerSourceBase
    {
        private readonly string _logsPath;
+        private readonly ILogger _logger;

-        public JsonLogViewer(string logsPath = "", string searchPath = "") : base(searchPath)
+        public JsonLogViewer(ILogger logger, string logsPath = "", string searchPath = "") : base(searchPath)
        {
            if (string.IsNullOrEmpty(logsPath))
                logsPath = $@"{AppDomain.CurrentDomain.BaseDirectory}\App_Data\Logs\";

            _logsPath = logsPath;
+            _logger = logger;
        }

        private const int FileSizeCap = 100;
@@ -36,7 +39,7 @@ namespace Umbraco.Core.Logging.Viewer
            for (var day = startDate.Date; day.Date <= endDate.Date; day = day.AddDays(1))
            {
                //Filename ending to search for (As could be multiple)
-                var filesToFind = $"*{day:yyyyMMdd}.json";
+                var filesToFind = GetSearchPattern(day);

                var filesForCurrentDay = Directory.GetFiles(logDirectory, filesToFind);

@@ -49,6 +52,11 @@ namespace Umbraco.Core.Logging.Viewer
            return logSizeAsMegabytes <= FileSizeCap;
        }

+        private string GetSearchPattern(DateTime day)
+        {
+            return $"*{day:yyyyMMdd}*.json";
+        }
+
        protected override IReadOnlyList<LogEvent> GetLogs(DateTimeOffset startDate, DateTimeOffset endDate, ILogFilter filter, int skip, int take)
        {
            var logs = new List<LogEvent>();
@@ -63,7 +71,7 @@ namespace Umbraco.Core.Logging.Viewer
            for (var day = startDate.Date; day.Date <= endDate.Date; day = day.AddDays(1))
            {
                //Filename ending to search for (As could be multiple)
-                var filesToFind = $"*{day:yyyyMMdd}.json";
+                var filesToFind = GetSearchPattern(day);

                var filesForCurrentDay = Directory.GetFiles(logDirectory, filesToFind);

@@ -77,8 +85,14 @@ namespace Umbraco.Core.Logging.Viewer
                        using (var stream = new StreamReader(fs))
                        {
                            var reader = new LogEventReader(stream);
-                            while (reader.TryRead(out var evt))
+                            while (TryRead(reader, out var evt))
                            {
+                                //We may get a null if log line is malformed
+                                if (evt == null)
+                                {
+                                    continue;
+                                }
+
                                if (count > skip + take)
                                {
                                    break;
@@ -105,5 +119,21 @@ namespace Umbraco.Core.Logging.Viewer
            return logs;
        }

+        private bool TryRead(LogEventReader reader, out LogEvent evt)
+        {
+            try
+            {
+                return reader.TryRead(out evt);
+            }
+            catch (JsonReaderException ex)
+            {
+                // As we are reading/streaming one line at a time in the JSON file
+                // Thus we can not report the line number, as it will always be 1
+                _logger.Error<JsonLogViewer>(ex, "Unable to parse a line in the JSON log file");
+
+                evt = null;
+                return true;
+            }
+        }
    }
 }
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Logging.Viewer
    {
        public void Compose(Composition composition)
        {
-            composition.SetLogViewer(_ => new JsonLogViewer());
+            composition.SetLogViewer(_ => new JsonLogViewer(composition.Logger));
        }
    }
 }
@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Mapping
+{
+    /// <summary>
+    /// Defines maps for <see cref="UmbracoMapper"/>.
+    /// </summary>
+    public interface IMapDefinition
+    {
+        /// <summary>
+        /// Defines maps.
+        /// </summary>
+        void DefineMaps(UmbracoMapper mapper);
+    }
+}
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Mapping
+{
+    public class MapDefinitionCollection : BuilderCollectionBase<IMapDefinition>
+    {
+        public MapDefinitionCollection(IEnumerable<IMapDefinition> items)
+            : base(items)
+        { }
+    }
+}
@@ -0,0 +1,11 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Mapping
+{
+    public class MapDefinitionCollectionBuilder : SetCollectionBuilderBase<MapDefinitionCollectionBuilder, MapDefinitionCollection, IMapDefinition>
+    {
+        protected override MapDefinitionCollectionBuilder This => this;
+
+        protected override Lifetime CollectionLifetime => Lifetime.Transient;
+    }
+}
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Mapping
+{
+    /// <summary>
+    /// Represents a mapper context.
+    /// </summary>
+    public class MapperContext
+    {
+        private readonly UmbracoMapper _mapper;
+        private IDictionary<string, object> _items;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MapperContext"/> class.
+        /// </summary>
+        public MapperContext(UmbracoMapper mapper)
+        {
+            _mapper = mapper;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the context has items.
+        /// </summary>
+        public bool HasItems => _items != null;
+
+        /// <summary>
+        /// Gets the context items.
+        /// </summary>
+        public IDictionary<string, object> Items => _items ?? (_items = new Dictionary<string, object>());
+
+        #region Map
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TTarget>(object source)
+            => _mapper.Map<TTarget>(source, this);
+
+        // let's say this is a bad (dangerous) idea, and leave it out for now
+        /*
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TTarget>(object source, Action<MapperContext> f)
+        {
+            f(this);
+            return _mapper.Map<TTarget>(source, this);
+        }
+        */
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source)
+            => _mapper.Map<TSource, TTarget>(source, this);
+
+        // let's say this is a bad (dangerous) idea, and leave it out for now
+        /*
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, Action<MapperContext> f)
+        {
+            f(this);
+            return _mapper.Map<TSource, TTarget>(source, this);
+        }
+        */
+
+        /// <summary>
+        /// Maps a source object to an existing target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="target">The target object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, TTarget target)
+            => _mapper.Map(source, target, this);
+
+        // let's say this is a bad (dangerous) idea, and leave it out for now
+        /*
+        /// <summary>
+        /// Maps a source object to an existing target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="target">The target object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, TTarget target, Action<MapperContext> f)
+        {
+            f(this);
+            return _mapper.Map(source, target, this);
+        }
+        */
+
+        /// <summary>
+        /// Maps an enumerable of source objects to a new list of target objects.
+        /// </summary>
+        /// <typeparam name="TSourceElement">The type of the source objects.</typeparam>
+        /// <typeparam name="TTargetElement">The type of the target objects.</typeparam>
+        /// <param name="source">The source objects.</param>
+        /// <returns>A list containing the target objects.</returns>
+        public List<TTargetElement> MapEnumerable<TSourceElement, TTargetElement>(IEnumerable<TSourceElement> source)
+        {
+            return source.Select(Map<TSourceElement, TTargetElement>).ToList();
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,430 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Mapping
+{
+    // notes:
+    // AutoMapper maps null to empty arrays, lists, etc
+
+    // TODO:
+    // when mapping from TSource, and no map is found, consider the actual source.GetType()?
+    // when mapping to TTarget, and no map is found, consider the actual target.GetType()?
+    // not sure we want to add magic to this simple mapper class, though
+
+    /// <summary>
+    /// Umbraco Mapper.
+    /// </summary>
+    /// <remarks>
+    /// <para>When a map is defined from TSource to TTarget, the mapper automatically knows how to map
+    /// from IEnumerable{TSource} to IEnumerable{TTarget} (using a List{TTarget}) and to TTarget[].</para>
+    /// <para>When a map is defined from TSource to TTarget, the mapper automatically uses that map
+    /// for any source type that inherits from, or implements, TSource.</para>
+    /// <para>When a map is defined from TSource to TTarget, the mapper can map to TTarget exclusively
+    /// and cannot re-use that map for types that would inherit from, or implement, TTarget.</para>
+    /// <para>When using the Map{TSource, TTarget}(TSource source, ...) overloads, TSource is explicit. When
+    /// using the Map{TTarget}(object source, ...) TSource is defined as source.GetType().</para>
+    /// <para>In both cases, TTarget is explicit and not typeof(target).</para>
+    /// </remarks>
+    public class UmbracoMapper
+    {
+        // note
+        //
+        // the outer dictionary *can* be modified, see GetCtor and GetMap, hence have to be ConcurrentDictionary
+        // the inner dictionaries are never modified and therefore can be simple Dictionary
+
+        private readonly ConcurrentDictionary<Type, Dictionary<Type, Func<object, MapperContext, object>>> _ctors
+            = new ConcurrentDictionary<Type, Dictionary<Type, Func<object, MapperContext, object>>>();
+
+        private readonly ConcurrentDictionary<Type, Dictionary<Type, Action<object, object, MapperContext>>> _maps
+            = new ConcurrentDictionary<Type, Dictionary<Type, Action<object, object, MapperContext>>>();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoMapper"/> class.
+        /// </summary>
+        /// <param name="profiles"></param>
+        public UmbracoMapper(MapDefinitionCollection profiles)
+        {
+            foreach (var profile in profiles)
+                profile.DefineMaps(this);
+        }
+
+        #region Define
+
+        private static TTarget ThrowCtor<TSource, TTarget>(TSource source, MapperContext context)
+            => throw new InvalidOperationException($"Don't know how to create {typeof(TTarget).FullName} instances.");
+
+        private static void Identity<TSource, TTarget>(TSource source, TTarget target, MapperContext context)
+        { }
+
+        /// <summary>
+        /// Defines a mapping.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        public void Define<TSource, TTarget>()
+            => Define<TSource, TTarget>(ThrowCtor<TSource, TTarget>, Identity);
+
+        /// <summary>
+        /// Defines a mapping.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="map">A mapping method.</param>
+        public void Define<TSource, TTarget>(Action<TSource, TTarget, MapperContext> map)
+            => Define(ThrowCtor<TSource, TTarget>, map);
+
+        /// <summary>
+        /// Defines a mapping.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="ctor">A constructor method.</param>
+        public void Define<TSource, TTarget>(Func<TSource, MapperContext, TTarget> ctor)
+            => Define(ctor, Identity);
+
+        /// <summary>
+        /// Defines a mapping.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="ctor">A constructor method.</param>
+        /// <param name="map">A mapping method.</param>
+        public void Define<TSource, TTarget>(Func<TSource, MapperContext, TTarget> ctor, Action<TSource, TTarget, MapperContext> map)
+        {
+            var sourceType = typeof(TSource);
+            var targetType = typeof(TTarget);
+
+            var sourceCtors = DefineCtors(sourceType);
+            if (ctor != null)
+                sourceCtors[targetType] = (source, context) => ctor((TSource)source, context);
+
+            var sourceMaps = DefineMaps(sourceType);
+            sourceMaps[targetType] = (source, target, context) => map((TSource)source, (TTarget)target, context);
+        }
+
+        private Dictionary<Type, Func<object, MapperContext, object>> DefineCtors(Type sourceType)
+        {
+            return _ctors.GetOrAdd(sourceType, _ => new Dictionary<Type, Func<object, MapperContext, object>>());
+        }
+
+        private Dictionary<Type, Action<object, object, MapperContext>> DefineMaps(Type sourceType)
+        {
+            return _maps.GetOrAdd(sourceType, _ => new Dictionary<Type, Action<object, object, MapperContext>>());
+        }
+
+        #endregion
+
+        #region Map
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TTarget>(object source)
+            => Map<TTarget>(source, new MapperContext(this));
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TTarget>(object source, Action<MapperContext> f)
+        {
+            var context = new MapperContext(this);
+            f(context);
+            return Map<TTarget>(source, context);
+        }
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="context">A mapper context.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TTarget>(object source, MapperContext context)
+            => Map<TTarget>(source, source?.GetType(), context);
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source)
+            => Map<TSource, TTarget>(source, new MapperContext(this));
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, Action<MapperContext> f)
+        {
+            var context = new MapperContext(this);
+            f(context);
+            return Map<TSource, TTarget>(source, context);
+        }
+
+        /// <summary>
+        /// Maps a source object to a new target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="context">A mapper context.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, MapperContext context)
+            => Map<TTarget>(source, typeof(TSource), context);
+
+        private TTarget Map<TTarget>(object source, Type sourceType, MapperContext context)
+        {
+            if (source == null)
+                throw new ArgumentNullException(nameof(source));
+
+            var targetType = typeof(TTarget);
+
+            var ctor = GetCtor(sourceType, targetType);
+            var map = GetMap(sourceType, targetType);
+
+            // if there is a direct constructor, map
+            if (ctor != null && map != null)
+            {
+                var target = ctor(source, context);
+                map(source, target, context);
+                return (TTarget)target;
+            }
+
+            // otherwise, see if we can deal with enumerable
+
+            var ienumerableOfT = typeof(IEnumerable<>);
+
+            bool IsIEnumerableOfT(Type type) =>
+                type.IsGenericType &&
+                type.GenericTypeArguments.Length == 1 &&
+                type.GetGenericTypeDefinition() == ienumerableOfT;
+
+            // try to get source as an IEnumerable<T>
+            var sourceIEnumerable = IsIEnumerableOfT(sourceType) ? sourceType : sourceType.GetInterfaces().FirstOrDefault(IsIEnumerableOfT);
+
+            // if source is an IEnumerable<T> and target is T[] or IEnumerable<T>, we can create a map
+            if (sourceIEnumerable != null && IsEnumerableOrArrayOfType(targetType))
+            {
+                var sourceGenericArg = sourceIEnumerable.GenericTypeArguments[0];
+                var targetGenericArg = GetEnumerableOrArrayTypeArgument(targetType);
+
+                ctor = GetCtor(sourceGenericArg, targetGenericArg);
+                map = GetMap(sourceGenericArg, targetGenericArg);
+
+                // if there is a constructor for the underlying type, create & invoke the map
+                if (ctor != null && map != null)
+                {
+                    // register (for next time) and do it now (for this time)
+                    object NCtor(object s, MapperContext c) => MapEnumerableInternal<TTarget>((IEnumerable) s, targetGenericArg, ctor, map, c);
+                    DefineCtors(sourceType)[targetType] = NCtor;
+                    DefineMaps(sourceType)[targetType] = Identity;
+                    return (TTarget) NCtor(source, context);
+                }
+
+                throw new InvalidOperationException($"Don't know how to map {sourceGenericArg.FullName} to {targetGenericArg.FullName}, so don't know how to map {sourceType.FullName} to {targetType.FullName}.");
+            }
+
+            throw new InvalidOperationException($"Don't know how to map {sourceType.FullName} to {targetType.FullName}.");
+        }
+
+        private TTarget MapEnumerableInternal<TTarget>(IEnumerable source, Type targetGenericArg, Func<object, MapperContext, object> ctor, Action<object, object, MapperContext> map, MapperContext context)
+        {
+            var targetList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(targetGenericArg));
+
+            foreach (var sourceItem in source)
+            {
+                var targetItem = ctor(sourceItem, context);
+                map(sourceItem, targetItem, context);
+                targetList.Add(targetItem);
+            }
+
+            object target = targetList;
+
+            if (typeof(TTarget).IsArray)
+            {
+                var elementType = typeof(TTarget).GetElementType();
+                if (elementType == null) throw new Exception("panic");
+                var targetArray = Array.CreateInstance(elementType, targetList.Count);
+                targetList.CopyTo(targetArray, 0);
+                target = targetArray;
+            }
+
+            return (TTarget) target;
+        }
+
+        /// <summary>
+        /// Maps a source object to an existing target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="target">The target object.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, TTarget target)
+            => Map(source, target, new MapperContext(this));
+
+        /// <summary>
+        /// Maps a source object to an existing target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="target">The target object.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, TTarget target, Action<MapperContext> f)
+        {
+            var context = new MapperContext(this);
+            f(context);
+            return Map(source, target, context);
+        }
+
+        /// <summary>
+        /// Maps a source object to an existing target object.
+        /// </summary>
+        /// <typeparam name="TSource">The source type.</typeparam>
+        /// <typeparam name="TTarget">The target type.</typeparam>
+        /// <param name="source">The source object.</param>
+        /// <param name="target">The target object.</param>
+        /// <param name="context">A mapper context.</param>
+        /// <returns>The target object.</returns>
+        public TTarget Map<TSource, TTarget>(TSource source, TTarget target, MapperContext context)
+        {
+            var sourceType = typeof(TSource);
+            var targetType = typeof(TTarget);
+
+            var map = GetMap(sourceType, targetType);
+
+            // if there is a direct map, map
+            if (map != null)
+            {
+                map(source, target, context);
+                return target;
+            }
+
+            // we cannot really map to an existing enumerable - give up
+
+            throw new InvalidOperationException($"Don't know how to map {typeof(TSource).FullName} to {typeof(TTarget).FullName}.");
+        }
+
+        private Func<object, MapperContext, object> GetCtor(Type sourceType, Type targetType)
+        {
+            if (_ctors.TryGetValue(sourceType, out var sourceCtor) && sourceCtor.TryGetValue(targetType, out var ctor))
+                return ctor;
+
+            // we *may* run this more than once but it does not matter
+
+            ctor = null;
+            foreach (var (stype, sctors) in _ctors)
+            {
+                if (!stype.IsAssignableFrom(sourceType)) continue;
+                if (!sctors.TryGetValue(targetType, out ctor)) continue;
+
+                sourceCtor = sctors;
+                break;
+            }
+
+            if (ctor == null) return null;
+
+            _ctors[sourceType] = sourceCtor;
+            return ctor;
+        }
+
+        private Action<object, object, MapperContext> GetMap(Type sourceType, Type targetType)
+        {
+            if (_maps.TryGetValue(sourceType, out var sourceMap) && sourceMap.TryGetValue(targetType, out var map))
+                return map;
+
+            // we *may* run this more than once but it does not matter
+
+            map = null;
+            foreach (var (stype, smap) in _maps)
+            {
+                if (!stype.IsAssignableFrom(sourceType)) continue;
+
+                // TODO: consider looking for assignable types for target too?
+                if (!smap.TryGetValue(targetType, out map)) continue;
+
+                sourceMap = smap;
+                break;
+            }
+
+            if (map == null) return null;
+
+            _maps[sourceType] = sourceMap;
+            return map;
+        }
+
+        private static bool IsEnumerableOrArrayOfType(Type type)
+        {
+            if (type.IsArray && type.GetArrayRank() == 1) return true;
+            if (type.IsGenericType && type.GenericTypeArguments.Length == 1) return true;
+            return false;
+        }
+
+        private static Type GetEnumerableOrArrayTypeArgument(Type type)
+        {
+            if (type.IsArray) return type.GetElementType();
+            if (type.IsGenericType) return type.GenericTypeArguments[0];
+            throw new Exception("panic");
+        }
+
+        /// <summary>
+        /// Maps an enumerable of source objects to a new list of target objects.
+        /// </summary>
+        /// <typeparam name="TSourceElement">The type of the source objects.</typeparam>
+        /// <typeparam name="TTargetElement">The type of the target objects.</typeparam>
+        /// <param name="source">The source objects.</param>
+        /// <returns>A list containing the target objects.</returns>
+        public List<TTargetElement> MapEnumerable<TSourceElement, TTargetElement>(IEnumerable<TSourceElement> source)
+        {
+            return source.Select(Map<TSourceElement, TTargetElement>).ToList();
+        }
+
+        /// <summary>
+        /// Maps an enumerable of source objects to a new list of target objects.
+        /// </summary>
+        /// <typeparam name="TSourceElement">The type of the source objects.</typeparam>
+        /// <typeparam name="TTargetElement">The type of the target objects.</typeparam>
+        /// <param name="source">The source objects.</param>
+        /// <param name="f">A mapper context preparation method.</param>
+        /// <returns>A list containing the target objects.</returns>
+        public List<TTargetElement> MapEnumerable<TSourceElement, TTargetElement>(IEnumerable<TSourceElement> source, Action<MapperContext> f)
+        {
+            var context = new MapperContext(this);
+            f(context);
+            return source.Select(x => Map<TSourceElement, TTargetElement>(x, context)).ToList();
+        }
+
+        /// <summary>
+        /// Maps an enumerable of source objects to a new list of target objects.
+        /// </summary>
+        /// <typeparam name="TSourceElement">The type of the source objects.</typeparam>
+        /// <typeparam name="TTargetElement">The type of the target objects.</typeparam>
+        /// <param name="source">The source objects.</param>
+        /// <param name="context">A mapper context.</param>
+        /// <returns>A list containing the target objects.</returns>
+        public List<TTargetElement> MapEnumerable<TSourceElement, TTargetElement>(IEnumerable<TSourceElement> source, MapperContext context)
+        {
+            return source.Select(x => Map<TSourceElement, TTargetElement>(x, context)).ToList();
+        }
+
+        #endregion
+    }
+}
@@ -83,17 +83,25 @@ namespace Umbraco.Core.Migrations.Expressions.Create
        }

        /// <inheritdoc />
-        public ICreateConstraintOnTableBuilder PrimaryKey()
+        public ICreateConstraintOnTableBuilder PrimaryKey() => PrimaryKey(true);
+
+        /// <inheritdoc />
+        public ICreateConstraintOnTableBuilder PrimaryKey(bool clustered)
        {
            var expression = new CreateConstraintExpression(_context, ConstraintType.PrimaryKey);
+            expression.Constraint.IsPrimaryKeyClustered = clustered;
            return new CreateConstraintBuilder(expression);
        }

        /// <inheritdoc />
-        public ICreateConstraintOnTableBuilder PrimaryKey(string primaryKeyName)
+        public ICreateConstraintOnTableBuilder PrimaryKey(string primaryKeyName) => PrimaryKey(primaryKeyName, true);
+
+        /// <inheritdoc />
+        public ICreateConstraintOnTableBuilder PrimaryKey(string primaryKeyName, bool clustered)
        {
            var expression = new CreateConstraintExpression(_context, ConstraintType.PrimaryKey);
            expression.Constraint.ConstraintName = primaryKeyName;
+            expression.Constraint.IsPrimaryKeyClustered = clustered;
            return new CreateConstraintBuilder(expression);
        }

@@ -19,7 +19,7 @@ namespace Umbraco.Core.Migrations.Expressions.Create.Expressions
            var constraintType = (Constraint.IsPrimaryKeyConstraint) ? "PRIMARY KEY" : "UNIQUE";

            if (Constraint.IsPrimaryKeyConstraint && SqlSyntax.SupportsClustered())
-                constraintType += " CLUSTERED";
+                constraintType += Constraint.IsPrimaryKeyClustered ? " CLUSTERED" : " NONCLUSTERED";

            if (Constraint.IsNonUniqueConstraint)
                constraintType = string.Empty;
@@ -68,6 +68,16 @@ namespace Umbraco.Core.Migrations.Expressions.Create
        /// </summary>
        ICreateConstraintOnTableBuilder PrimaryKey(string primaryKeyName);

+        /// <summary>
+        /// Builds a Create Primary Key expression.
+        /// </summary>
+        ICreateConstraintOnTableBuilder PrimaryKey(bool clustered);
+
+        /// <summary>
+        /// Builds a Create Primary Key expression.
+        /// </summary>
+        ICreateConstraintOnTableBuilder PrimaryKey(string primaryKeyName, bool clustered);
+
        /// <summary>
        /// Builds a Create Unique Constraint expression.
        /// </summary>
@@ -226,6 +226,8 @@ namespace Umbraco.Core.Migrations.Install
            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 32, UniqueId = 32.ToGuid(), DataTypeId = Constants.DataTypes.LabelDateTime, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastLockoutDate, Name = Constants.Conventions.Member.LastLockoutDateLabel, SortOrder = 4, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 33, UniqueId = 33.ToGuid(), DataTypeId = Constants.DataTypes.LabelDateTime, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastLoginDate, Name = Constants.Conventions.Member.LastLoginDateLabel, SortOrder = 5, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 34, UniqueId = 34.ToGuid(), DataTypeId = Constants.DataTypes.LabelDateTime, ContentTypeId = 1044, PropertyTypeGroupId = 11, Alias = Constants.Conventions.Member.LastPasswordChangeDate, Name = Constants.Conventions.Member.LastPasswordChangeDateLabel, SortOrder = 6, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte) ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 35, UniqueId = 35.ToGuid(), DataTypeId = Constants.DataTypes.LabelDateTime, ContentTypeId = 1044, PropertyTypeGroupId = null, Alias = Constants.Conventions.Member.PasswordQuestion, Name = Constants.Conventions.Member.PasswordQuestionLabel, SortOrder = 7, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte)ContentVariation.Nothing });
+            _database.Insert(Constants.DatabaseSchema.Tables.PropertyType, "id", false, new PropertyTypeDto { Id = 36, UniqueId = 36.ToGuid(), DataTypeId = Constants.DataTypes.LabelDateTime, ContentTypeId = 1044, PropertyTypeGroupId = null, Alias = Constants.Conventions.Member.PasswordAnswer, Name = Constants.Conventions.Member.PasswordAnswerLabel, SortOrder = 8, Mandatory = false, ValidationRegExp = null, Description = null, Variations = (byte)ContentVariation.Nothing });

        }

@@ -47,7 +47,7 @@ namespace Umbraco.Core.Migrations.Install
            typeof (LogDto),
            typeof (MacroDto),
            typeof (MacroPropertyDto),
-            typeof (MemberTypeDto),
+            typeof (MemberPropertyTypeDto),
            typeof (MemberDto),
            typeof (Member2MemberGroupDto),
            typeof (PropertyTypeGroupDto),
@@ -6,6 +6,7 @@ using Umbraco.Core.Migrations.Upgrade.V_7_12_0;
 using Umbraco.Core.Migrations.Upgrade.V_7_14_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_0_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_0_1;
+using Umbraco.Core.Migrations.Upgrade.V_8_1_0;

 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -139,6 +140,7 @@ namespace Umbraco.Core.Migrations.Upgrade
            To<RenameLabelAndRichTextPropertyEditorAliases>("{E0CBE54D-A84F-4A8F-9B13-900945FD7ED9}");
            To<MergeDateAndDateTimePropertyEditor>("{78BAF571-90D0-4D28-8175-EF96316DA789}");
            To<ChangeNuCacheJsonFormat>("{80C0A0CB-0DD5-4573-B000-C4B7C313C70D}");
+            To<ConvertTinyMceAndGridMediaUrlsToLocalLink>("{B69B6E8C-A769-4044-A27E-4A4E18D1645A}");

            //FINAL

@@ -13,8 +13,8 @@ namespace Umbraco.Core.Migrations.Upgrade.V_7_9_0
        {
            var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();

-            if (columns.Any(x => x.TableName.InvariantEquals(Constants.DatabaseSchema.Tables.MemberType) && x.ColumnName.InvariantEquals("isSensitive")) == false)
-                AddColumn<MemberTypeDto>("isSensitive");
+            if (columns.Any(x => x.TableName.InvariantEquals(Constants.DatabaseSchema.Tables.MemberPropertyType) && x.ColumnName.InvariantEquals("isSensitive")) == false)
+                AddColumn<MemberPropertyTypeDto>("isSensitive");
        }
    }
 }
@@ -79,7 +79,8 @@ HAVING COUNT(v2.id) <> 1").Any())
            // transform column versionId from guid to integer (contentVersion.id)
            if (ColumnType(PreTables.PropertyData, "versionId") == "uniqueidentifier")
            {
-                Database.Execute($"ALTER TABLE {PreTables.PropertyData} ADD COLUMN versionId2 INT NULL;");
+                Alter.Table(PreTables.PropertyData).AddColumn("versionId2").AsInt32().Nullable().Do();
+
                // SQLCE does not support UPDATE...FROM
                var temp = Database.Fetch<dynamic>($"SELECT id, versionId FROM {PreTables.ContentVersion}");
                foreach (var t in temp)
@@ -0,0 +1,16 @@
+using Umbraco.Core.Migrations.PostMigrations;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
+{
+    public class ChangeNuCacheJsonFormat : MigrationBase
+    {
+        public ChangeNuCacheJsonFormat(IMigrationContext context) : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            // nothing - just adding the post-migration
+            Context.AddPostMigration<RebuildPublishedSnapshot>();
+        }
+    }
+}
@@ -0,0 +1,89 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Migrations.PostMigrations;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
+{
+    public class ConvertTinyMceAndGridMediaUrlsToLocalLink : MigrationBase
+    {
+        private readonly IMediaService _mediaService;
+
+        public ConvertTinyMceAndGridMediaUrlsToLocalLink(IMigrationContext context, IMediaService mediaService) : base(context)
+        {
+            _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService));
+        }
+
+        public override void Migrate()
+        {
+            var mediaLinkPattern = new Regex(
+                @"(<a[^>]*href="")(\/ media[^""\?]*)([^>]*>)",
+                RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+
+            var sqlPropertyData = Sql()
+                .Select<PropertyDataDto>(x => x.Id, x => x.TextValue)
+                    .AndSelect<DataTypeDto>(x => x.EditorAlias)
+                .From<PropertyDataDto>()
+                    .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
+                    .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((left, right) => left.DataTypeId == right.NodeId)
+                .Where<DataTypeDto>(x =>
+                    x.EditorAlias == Constants.PropertyEditors.Aliases.TinyMce ||
+                    x.EditorAlias == Constants.PropertyEditors.Aliases.Grid);
+
+            var properties = Database.Fetch<PropertyDataDto>(sqlPropertyData);
+
+            foreach (var property in properties)
+            {
+                var value = property.TextValue;
+                if (string.IsNullOrWhiteSpace(value)) continue;
+
+                if (property.PropertyTypeDto.DataTypeDto.EditorAlias == Constants.PropertyEditors.Aliases.Grid)
+                {
+                    var obj = JsonConvert.DeserializeObject<JObject>(value);
+                    var allControls = obj.SelectTokens("$.sections..rows..areas..controls");
+
+                    foreach (var control in allControls.SelectMany(c => c))
+                    {
+                        var controlValue = control["value"];
+                        if (controlValue.Type == JTokenType.String)
+                        {
+                            control["value"] = UpdateMediaUrls(mediaLinkPattern, controlValue.Value<string>());
+                        }
+                    }
+
+                    property.TextValue = JsonConvert.SerializeObject(obj);
+                }
+                else
+                {
+                    property.TextValue = UpdateMediaUrls(mediaLinkPattern, value);
+                }
+
+                Database.Update(property, x => x.TextValue);
+            }
+
+            Context.AddPostMigration<RebuildPublishedSnapshot>();
+        }
+
+        private string UpdateMediaUrls(Regex mediaLinkPattern, string value)
+        {
+            return mediaLinkPattern.Replace(value, match =>
+            {
+                // match groups:
+                // - 1 = from the beginning of the a tag until href attribute value begins
+                // - 2 = the href attribute value excluding the querystring (if present)
+                // - 3 = anything after group 2 until the a tag is closed
+                var href = match.Groups[2].Value;
+
+                var media = _mediaService.GetMediaByPath(href);
+                return media == null
+                    ? match.Value
+                    : $"{match.Groups[1].Value}/{{localLink:{media.GetUdi()}}}{match.Groups[3].Value}";
+            });
+        }
+    }
+}
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Collections;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;

 namespace Umbraco.Core.Models
 {
@@ -170,23 +166,23 @@ namespace Umbraco.Core.Models
        /// Sets the publishing values for names and properties.
        /// </summary>
        /// <param name="content"></param>
-        /// <param name="culture"></param>
+        /// <param name="impact"></param>
        /// <returns>A value indicating whether it was possible to publish the names and values for the specified
        /// culture(s). The method may fail if required names are not set, but it does NOT validate property data</returns>
-        public static bool PublishCulture(this IContent content, string culture = "*")
+        public static bool PublishCulture(this IContent content, CultureImpact impact)
        {
-            culture = culture.NullOrWhiteSpaceAsNull();
+            if (impact == null) throw new ArgumentNullException(nameof(impact));

            // the variation should be supported by the content type properties
            //  if the content type is invariant, only '*' and 'null' is ok
            //  if the content type varies, everything is ok because some properties may be invariant
-            if (!content.ContentType.SupportsPropertyVariation(culture, "*", true))
-                throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{content.ContentType.Alias}\" with variation \"{content.ContentType.Variations}\".");
+            if (!content.ContentType.SupportsPropertyVariation(impact.Culture, "*", true))
+                throw new NotSupportedException($"Culture \"{impact.Culture}\" is not supported by content type \"{content.ContentType.Alias}\" with variation \"{content.ContentType.Variations}\".");

-            var alsoInvariant = false;
-            if (culture == "*") // all cultures
+            // set names
+            if (impact.ImpactsAllCultures)
            {
-                foreach (var c in content.AvailableCultures)
+                foreach (var c in content.AvailableCultures) // does NOT contain the invariant culture
                {
                    var name = content.GetCultureName(c);
                    if (string.IsNullOrWhiteSpace(name))
@@ -194,26 +190,31 @@ namespace Umbraco.Core.Models
                    content.SetPublishInfo(c, name, DateTime.Now);
                }
            }
-            else if (culture == null) // invariant culture
+            else if (impact.ImpactsOnlyInvariantCulture)
            {
                if (string.IsNullOrWhiteSpace(content.Name))
                    return false;
                // PublishName set by repository - nothing to do here
            }
-            else // one single culture
+            else if (impact.ImpactsExplicitCulture)
            {
-                var name = content.GetCultureName(culture);
+                var name = content.GetCultureName(impact.Culture);
                if (string.IsNullOrWhiteSpace(name))
                    return false;
-                content.SetPublishInfo(culture, name, DateTime.Now);
-                alsoInvariant = true; // we also want to publish invariant values
+                content.SetPublishInfo(impact.Culture, name, DateTime.Now);
            }

-            // property.PublishValues only publishes what is valid, variation-wise
+            // set values
+            // property.PublishValues only publishes what is valid, variation-wise,
+            // but accepts any culture arg: null, all, specific
            foreach (var property in content.Properties)
            {
-                property.PublishValues(culture);
-                if (alsoInvariant)
+                // for the specified culture (null or all or specific)
+                property.PublishValues(impact.Culture);
+
+                // maybe the specified culture did not impact the invariant culture, so PublishValues
+                // above would skip it, yet it *also* impacts invariant properties
+                if (impact.ImpactsAlsoInvariantProperties)
                    property.PublishValues(null);
            }

@@ -95,6 +95,21 @@ namespace Umbraco.Core.Models

        protected void PropertyTypesChanged(object sender, NotifyCollectionChangedEventArgs e)
        {
+            //enable this to detect duplicate property aliases. We do want this, however making this change in a
+            //patch release might be a little dangerous
+
+            ////detect if there are any duplicate aliases - this cannot be allowed
+            //if (e.Action == NotifyCollectionChangedAction.Add
+            //    || e.Action == NotifyCollectionChangedAction.Replace)
+            //{
+            //    var allAliases = _noGroupPropertyTypes.Concat(PropertyGroups.SelectMany(x => x.PropertyTypes)).Select(x => x.Alias);
+            //    if (allAliases.HasDuplicates(false))
+            //    {
+            //        var newAliases = string.Join(", ", e.NewItems.Cast<PropertyType>().Select(x => x.Alias));
+            //        throw new InvalidOperationException($"Other property types already exist with the aliases: {newAliases}");
+            //    }   
+            //}
+
            OnPropertyChanged(nameof(PropertyTypes));
        }

@@ -210,9 +225,7 @@ namespace Umbraco.Core.Models
            return Variations.ValidateVariation(culture, segment, false, true, false);
        }

-        /// <summary>
-        /// List of PropertyGroups available on this ContentType
-        /// </summary>
+        /// <inheritdoc />
        /// <remarks>
        /// <para>A PropertyGroup corresponds to a Tab in the UI</para>
        /// <para>Marked DoNotClone because we will manually deal with cloning and the event handlers</para>
@@ -230,9 +243,7 @@ namespace Umbraco.Core.Models
            }
        }

-        /// <summary>
-        /// Gets all property types, across all property groups.
-        /// </summary>
+        /// <inheritdoc />
        [IgnoreDataMember]
        [DoNotClone]
        public IEnumerable<PropertyType> PropertyTypes
@@ -243,12 +254,7 @@ namespace Umbraco.Core.Models
            }
        }

-        /// <summary>
-        /// Gets or sets the property types that are not in a group.
-        /// </summary>
-        /// <remarks>
-        /// Marked DoNotClone because we will manually deal with cloning and the event handlers
-        /// </remarks>
+        /// <inheritdoc />
        [DoNotClone]
        public IEnumerable<PropertyType> NoGroupPropertyTypes
        {
@@ -397,15 +403,16 @@ namespace Umbraco.Core.Models
            var group = PropertyGroups[propertyGroupName];
            if (group == null) return;

-            // re-assign the group's properties to no group
+            // first remove the group
+            PropertyGroups.RemoveItem(propertyGroupName);
+
+            // Then re-assign the group's properties to no group
            foreach (var property in group.PropertyTypes)
            {
                property.PropertyGroupId = null;
                _noGroupPropertyTypes.Add(property);
            }

-            // actually remove the group
-            PropertyGroups.RemoveItem(propertyGroupName);
            OnPropertyChanged(nameof(PropertyGroups));
        }

@@ -43,9 +43,7 @@ namespace Umbraco.Core.Models
            }
        }

-        /// <summary>
-        /// Gets the property groups for the entire composition.
-        /// </summary>
+        /// <inheritdoc />
        [IgnoreDataMember]
        public IEnumerable<PropertyGroup> CompositionPropertyGroups
        {
@@ -76,9 +74,7 @@ namespace Umbraco.Core.Models
            }
        }

-        /// <summary>
-        /// Gets the property types for the entire composition.
-        /// </summary>
+        /// <inheritdoc />
        [IgnoreDataMember]
        public IEnumerable<PropertyType> CompositionPropertyTypes
        {
@@ -0,0 +1,257 @@
+using System;
+using System.Linq;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents the impact of a culture set.
+    /// </summary>
+    /// <remarks>
+    /// <para>A set of cultures can be either all cultures (including the invariant culture), or
+    /// the invariant culture, or a specific culture.</para>
+    /// </remarks>
+    internal class CultureImpact
+    {
+        /// <summary>
+        /// Utility method to return the culture used for invariant property errors based on what cultures are being actively saved,
+        /// the default culture and the state of the current content item
+        /// </summary>
+        /// <param name="content"></param>
+        /// <param name="savingCultures"></param>
+        /// <param name="defaultCulture"></param>
+        /// <returns></returns>
+        public static string GetCultureForInvariantErrors(IContent content, string[] savingCultures, string defaultCulture)
+        {
+            if (content == null) throw new ArgumentNullException(nameof(content));
+            if (savingCultures == null) throw new ArgumentNullException(nameof(savingCultures));
+            if (savingCultures.Length == 0) throw new ArgumentException(nameof(savingCultures));
+
+            var cultureForInvariantErrors = savingCultures.Any(x => x.InvariantEquals(defaultCulture))
+                //the default culture is being flagged for saving so use it
+                ? defaultCulture
+                //If the content has no published version, we need to affiliate validation with the first variant being saved.
+                //If the content has a published version we will not affiliate the validation with any culture (null)
+                : !content.Published ? savingCultures[0] : null;
+
+            return cultureForInvariantErrors;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CultureImpact"/> class.
+        /// </summary>
+        /// <param name="culture">The culture code.</param>
+        /// <param name="isDefault">A value indicating whether the culture is the default culture.</param>
+        private CultureImpact(string culture, bool isDefault = false)
+        {
+            if (culture != null && culture.IsNullOrWhiteSpace())
+                throw new ArgumentException("Culture \"\" is not valid here.");
+
+            Culture = culture;
+
+            if ((culture == null || culture == "*") && isDefault)
+                throw new ArgumentException("The invariant or 'all' culture can not be the default culture.");
+
+            ImpactsOnlyDefaultCulture = isDefault;
+        }
+
+        /// <summary>
+        /// Gets the impact of 'all' cultures (including the invariant culture).
+        /// </summary>
+        public static CultureImpact All { get; } = new CultureImpact("*");
+
+        /// <summary>
+        /// Gets the impact of the invariant culture.
+        /// </summary>
+        public static CultureImpact Invariant { get; } = new CultureImpact(null);
+
+        /// <summary>
+        /// Creates an impact instance representing the impact of a specific culture.
+        /// </summary>
+        /// <param name="culture">The culture code.</param>
+        /// <param name="isDefault">A value indicating whether the culture is the default culture.</param>
+        public static CultureImpact Explicit(string culture, bool isDefault)
+        {
+            if (culture == null)
+                throw new ArgumentException("Culture <null> is not explicit.");
+            if (culture.IsNullOrWhiteSpace())
+                throw new ArgumentException("Culture \"\" is not explicit.");
+            if (culture == "*")
+                throw new ArgumentException("Culture \"*\" is not explicit.");
+
+            return new CultureImpact(culture, isDefault);
+        }
+
+        /// <summary>
+        /// Creates an impact instance representing the impact of a culture set,
+        /// in the context of a content item variation.
+        /// </summary>
+        /// <param name="culture">The culture code.</param>
+        /// <param name="isDefault">A value indicating whether the culture is the default culture.</param>
+        /// <param name="content">The content item.</param>
+        /// <remarks>
+        /// <para>Validates that the culture is compatible with the variation.</para>
+        /// </remarks>
+        public static CultureImpact Create(string culture, bool isDefault, IContent content)
+        {
+            // throws if not successful
+            TryCreate(culture, isDefault, content.ContentType.Variations, true, out var impact);
+            return impact;
+        }
+
+        /// <summary>
+        /// Tries to create an impact instance representing the impact of a culture set,
+        /// in the context of a content item variation.
+        /// </summary>
+        /// <param name="culture">The culture code.</param>
+        /// <param name="isDefault">A value indicating whether the culture is the default culture.</param>
+        /// <param name="variation">A content variation.</param>
+        /// <param name="throwOnFail">A value indicating whether to throw if the impact cannot be created.</param>
+        /// <param name="impact">The impact if it could be created, otherwise null.</param>
+        /// <returns>A value indicating whether the impact could be created.</returns>
+        /// <remarks>
+        /// <para>Validates that the culture is compatible with the variation.</para>
+        /// </remarks>
+        internal static bool TryCreate(string culture, bool isDefault, ContentVariation variation, bool throwOnFail, out CultureImpact impact)
+        {
+            impact = null;
+
+            // if culture is invariant...
+            if (culture == null)
+            {
+                // ... then variation must not vary by culture ...
+                if (variation.VariesByCulture())
+                {
+                    if (throwOnFail)
+                        throw new InvalidOperationException("The invariant culture is not compatible with a varying variation.");
+                    return false;
+                }
+
+                // ... and it cannot be default
+                if (isDefault)
+                {
+                    if (throwOnFail)
+                        throw new InvalidOperationException("The invariant culture can not be the default culture.");
+                    return false;
+                }
+
+                impact = Invariant;
+                return true;
+            }
+
+            // if culture is 'all'...
+            if (culture == "*")
+            {
+                // ... it cannot be default
+                if (isDefault)
+                {
+                    if (throwOnFail)
+                        throw new InvalidOperationException("The 'all' culture can not be the default culture.");
+                    return false;
+                }
+
+                // if variation does not vary by culture, then impact is invariant
+                impact = variation.VariesByCulture() ? All : Invariant;
+                return true;
+            }
+
+            // neither null nor "*" - cannot be the empty string
+            if (culture.IsNullOrWhiteSpace())
+            {
+                if (throwOnFail)
+                    throw new ArgumentException("Cannot be the empty string.", nameof(culture));
+                return false;
+            }
+
+            // if culture is specific, then variation must vary
+            if (!variation.VariesByCulture())
+            {
+                if (throwOnFail)
+                    throw new InvalidOperationException($"The variant culture {culture} is not compatible with an invariant variation.");
+                return false;
+            }
+
+            // return specific impact
+            impact = new CultureImpact(culture, isDefault);
+            return true;
+        }
+
+        /// <summary>
+        /// Gets the culture code.
+        /// </summary>
+        /// <remarks>
+        /// <para>Can be null (invariant) or * (all cultures) or a specific culture code.</para>
+        /// </remarks>
+        public string Culture { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this impact impacts all cultures, including,
+        /// indirectly, the invariant culture.
+        /// </summary>
+        public bool ImpactsAllCultures => Culture == "*";
+
+        /// <summary>
+        /// Gets a value indicating whether this impact impacts only the invariant culture,
+        /// directly, not because all cultures are impacted.
+        /// </summary>
+        public bool ImpactsOnlyInvariantCulture => Culture == null;
+
+        /// <summary>
+        /// Gets a value indicating whether this impact impacts an implicit culture.
+        /// </summary>
+        /// <remarks>And then it does not impact the invariant culture. The impacted
+        /// explicit culture could be the default culture.</remarks>
+        public bool ImpactsExplicitCulture => Culture != null && Culture != "*";
+
+        /// <summary>
+        /// Gets a value indicating whether this impact impacts the default culture, directly,
+        /// not because all cultures are impacted.
+        /// </summary>
+        public bool ImpactsOnlyDefaultCulture {get; }
+
+        /// <summary>
+        /// Gets a value indicating whether this impact impacts the invariant properties, either
+        /// directly, or because all cultures are impacted, or because the default culture is impacted.
+        /// </summary>
+        public bool ImpactsInvariantProperties => Culture == null || Culture == "*" || ImpactsOnlyDefaultCulture;
+
+        /// <summary>
+        /// Gets a value indicating whether this also impact impacts the invariant properties,
+        /// even though it does not impact the invariant culture, neither directly (ImpactsInvariantCulture)
+        /// nor indirectly (ImpactsAllCultures).
+        /// </summary>
+        public bool ImpactsAlsoInvariantProperties => !ImpactsOnlyInvariantCulture &&
+                                                      !ImpactsAllCultures &&
+                                                      ImpactsOnlyDefaultCulture;
+
+        public Behavior CultureBehavior
+        {
+            get
+            {
+                //null can only be invariant
+                if (Culture == null) return Behavior.InvariantCulture | Behavior.InvariantProperties;
+
+                // * is All which means its also invariant properties since this will include the default language
+                if (Culture == "*") return (Behavior.AllCultures | Behavior.InvariantProperties);
+
+                //else it's explicit
+                var result = Behavior.ExplicitCulture;
+
+                //if the explicit culture is the default, then the behavior is also InvariantProperties
+                if (ImpactsOnlyDefaultCulture)
+                    result |= Behavior.InvariantProperties;
+
+                return result;
+            }
+        }
+
+
+        [Flags]
+        public enum Behavior : byte
+        {
+            AllCultures = 1,
+            InvariantCulture = 2,
+            ExplicitCulture = 4,
+            InvariantProperties = 8
+        }
+    }
+}
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Models
    /// * when the setter performs additional required logic other than just setting the underlying field
    ///
    /// </remarks>
-    internal class DoNotCloneAttribute : Attribute
+    public class DoNotCloneAttribute : Attribute
    {

    }
@@ -96,17 +96,17 @@ namespace Umbraco.Core.Models
        IEnumerable<ContentTypeSort> AllowedContentTypes { get; set; }

        /// <summary>
-        /// Gets or Sets a collection of Property Groups
+        /// Gets or sets the local property groups.
        /// </summary>
        PropertyGroupCollection PropertyGroups { get; set; }

        /// <summary>
-        /// Gets all property types, across all property groups.
+        /// Gets all local property types belonging to a group, across all local property groups.
        /// </summary>
        IEnumerable<PropertyType> PropertyTypes { get; }

        /// <summary>
-        /// Gets or sets the property types that are not in a group.
+        /// Gets or sets the local property types that do not belong to a group.
        /// </summary>
        IEnumerable<PropertyType> NoGroupPropertyTypes { get; set; }

@@ -41,7 +41,7 @@ namespace Umbraco.Core.Models.Identity
            if (string.IsNullOrWhiteSpace(username)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(username));
            if (string.IsNullOrWhiteSpace(culture)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(culture));

-            var user = new BackOfficeIdentityUser();
+            var user = new BackOfficeIdentityUser(Array.Empty<IReadOnlyUserGroup>());
            user.DisableChangeTracking();
            user._userName = username;
            user._email = email;
@@ -54,16 +54,19 @@ namespace Umbraco.Core.Models.Identity
            return user;
        }

-        private BackOfficeIdentityUser()
+        private BackOfficeIdentityUser(IReadOnlyUserGroup[] groups)
        {
-            _startMediaIds = new int[] { };
-            _startContentIds = new int[] { };
-            _groups = new IReadOnlyUserGroup[] { };
-            _allowedSections = new string[] { };
+            _startMediaIds = Array.Empty<int>();
+            _startContentIds = Array.Empty<int>();
+            _allowedSections = Array.Empty<string>();
            _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject
-            _groups = new IReadOnlyUserGroup[0];
+
+            // must initialize before setting groups
            _roles = new ObservableCollection<IdentityUserRole<string>>();
            _roles.CollectionChanged += _roles_CollectionChanged;
+
+            // use the property setters - they do more than just setting a field
+            Groups = groups;
        }

        /// <summary>
@@ -72,19 +75,10 @@ namespace Umbraco.Core.Models.Identity
        /// <param name="userId"></param>
        /// <param name="groups"></param>
        public BackOfficeIdentityUser(int userId, IEnumerable<IReadOnlyUserGroup> groups)
+            : this(groups.ToArray())
        {
-            _startMediaIds = new int[] { };
-            _startContentIds = new int[] { };
-            _groups = new IReadOnlyUserGroup[] { };
-            _allowedSections = new string[] { };
-            _culture = Current.Configs.Global().DefaultUILanguage; // TODO: inject
-            _groups = groups.ToArray();
-            _roles = new ObservableCollection<IdentityUserRole<string>>(_groups.Select(x => new IdentityUserRole<string>
-            {
-                RoleId = x.Alias,
-                UserId = userId.ToString()
-            }));
-            _roles.CollectionChanged += _roles_CollectionChanged;
+            // use the property setters - they do more than just setting a field
+            Id = userId;
        }

        /// <summary>
@@ -226,6 +220,8 @@ namespace Umbraco.Core.Models.Identity
                //so they recalculate
                _allowedSections = null;

+                _groups = value;
+
                //now clear all roles and re-add them
                _roles.CollectionChanged -= _roles_CollectionChanged;
                _roles.Clear();
@@ -0,0 +1,80 @@
+using System;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Mapping;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Models.Identity
+{
+    public class IdentityMapDefinition : IMapDefinition
+    {
+        private readonly ILocalizedTextService _textService;
+        private readonly IEntityService _entityService;
+        private readonly IGlobalSettings _globalSettings;
+
+        public IdentityMapDefinition(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings)
+        {
+            _textService = textService;
+            _entityService = entityService;
+            _globalSettings = globalSettings;
+        }
+
+        public void DefineMaps(UmbracoMapper mapper)
+        {
+            mapper.Define<IUser, BackOfficeIdentityUser>(
+                (source, context) =>
+                {
+                    var target = new BackOfficeIdentityUser(source.Id, source.Groups);
+                    target.DisableChangeTracking();
+                    return target;
+                },
+                (source, target, context) =>
+                {
+                    Map(source, target);
+                    target.ResetDirtyProperties(true);
+                    target.EnableChangeTracking();
+                });
+        }
+
+        // Umbraco.Code.MapAll -Id -Groups -LockoutEnabled -PhoneNumber -PhoneNumberConfirmed -TwoFactorEnabled
+        private void Map(IUser source, BackOfficeIdentityUser target)
+        {
+            // well, the ctor has been fixed
+            /*
+            // these two are already set in ctor but BackOfficeIdentityUser ctor is CompletelyBroken
+            target.Id = source.Id;
+            target.Groups = source.Groups.ToArray();
+            */
+
+            target.CalculatedMediaStartNodeIds = source.CalculateMediaStartNodeIds(_entityService);
+            target.CalculatedContentStartNodeIds = source.CalculateContentStartNodeIds(_entityService);
+            target.Email = source.Email;
+            target.UserName = source.Username;
+            target.LastPasswordChangeDateUtc = source.LastPasswordChangeDate.ToUniversalTime();
+            target.LastLoginDateUtc = source.LastLoginDate.ToUniversalTime();
+            target.EmailConfirmed = source.EmailConfirmedDate.HasValue;
+            target.Name = source.Name;
+            target.AccessFailedCount = source.FailedPasswordAttempts;
+            target.PasswordHash = GetPasswordHash(source.RawPasswordValue);
+            target.StartContentIds = source.StartContentIds;
+            target.StartMediaIds = source.StartMediaIds;
+            target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString(); // project CultureInfo to string
+            target.IsApproved = source.IsApproved;
+            target.SecurityStamp = source.SecurityStamp;
+            target.LockoutEndDateUtc = source.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?) null;
+
+            // this was in AutoMapper but does not have a setter anyways
+            //target.AllowedSections = source.AllowedSections.ToArray(),
+
+            // these were marked as ignored for AutoMapper but don't have a setter anyways
+            //target.Logins =;
+            //target.Claims =;
+            //target.Roles =;
+        }
+
+        private static string GetPasswordHash(string storedPass)
+        {
+            return storedPass.StartsWith(Constants.Security.EmptyPasswordPrefix) ? null : storedPass;
+        }
+    }
+}
@@ -1,58 +0,0 @@
-using System;
-using System.Linq;
-using AutoMapper;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Security;
-using Umbraco.Core.Services;
-
-namespace Umbraco.Core.Models.Identity
-{
-    public class IdentityMapperProfile : Profile
-    {
-        public IdentityMapperProfile(ILocalizedTextService textService, IEntityService entityService, IGlobalSettings globalSettings)
-        {
-            CreateMap<IUser, BackOfficeIdentityUser>()
-                .BeforeMap((src, dest) =>
-                {
-                    dest.DisableChangeTracking();
-                })
-                .ConstructUsing(src => new BackOfficeIdentityUser(src.Id, src.Groups))
-                .ForMember(dest => dest.LastLoginDateUtc, opt => opt.MapFrom(src => src.LastLoginDate.ToUniversalTime()))
-                .ForMember(user => user.LastPasswordChangeDateUtc, expression => expression.MapFrom(user => user.LastPasswordChangeDate.ToUniversalTime()))
-                .ForMember(dest => dest.Email, opt => opt.MapFrom(src => src.Email))
-                .ForMember(dest => dest.EmailConfirmed, opt => opt.MapFrom(src => src.EmailConfirmedDate.HasValue))
-                .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Id))
-                .ForMember(dest => dest.LockoutEndDateUtc, opt => opt.MapFrom(src => src.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?) null))
-                .ForMember(dest => dest.IsApproved, opt => opt.MapFrom(src => src.IsApproved))
-                .ForMember(dest => dest.UserName, opt => opt.MapFrom(src => src.Username))
-                .ForMember(dest => dest.PasswordHash, opt => opt.MapFrom(user => GetPasswordHash(user.RawPasswordValue)))
-                .ForMember(dest => dest.Culture, opt => opt.MapFrom(src => src.GetUserCulture(textService, globalSettings)))
-                .ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Name))
-                .ForMember(dest => dest.StartMediaIds, opt => opt.MapFrom(src => src.StartMediaIds))
-                .ForMember(dest => dest.StartContentIds, opt => opt.MapFrom(src => src.StartContentIds))
-                .ForMember(dest => dest.AccessFailedCount, opt => opt.MapFrom(src => src.FailedPasswordAttempts))
-                .ForMember(dest => dest.CalculatedContentStartNodeIds, opt => opt.MapFrom(src => src.CalculateContentStartNodeIds(entityService)))
-                .ForMember(dest => dest.CalculatedMediaStartNodeIds, opt => opt.MapFrom(src => src.CalculateMediaStartNodeIds(entityService)))
-                .ForMember(dest => dest.AllowedSections, opt => opt.MapFrom(src => src.AllowedSections.ToArray()))
-                .ForMember(dest => dest.LockoutEnabled, opt => opt.Ignore())
-                .ForMember(dest => dest.Logins, opt => opt.Ignore())
-                .ForMember(dest => dest.EmailConfirmed, opt => opt.Ignore())
-                .ForMember(dest => dest.PhoneNumber, opt => opt.Ignore())
-                .ForMember(dest => dest.PhoneNumberConfirmed, opt => opt.Ignore())
-                .ForMember(dest => dest.TwoFactorEnabled, opt => opt.Ignore())
-                .ForMember(dest => dest.Roles, opt => opt.Ignore())
-                .ForMember(dest => dest.Claims, opt => opt.Ignore())
-                .AfterMap((src, dest) =>
-                {
-                    dest.ResetDirtyProperties(true);
-                    dest.EnableChangeTracking();
-                });
-        }
-
-        private static string GetPasswordHash(string storedPass)
-        {
-            return storedPass.StartsWith(Constants.Security.EmptyPasswordPrefix) ? null : storedPass;
-        }
-    }
-}
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Models
    public class PropertyCollection : KeyedCollection<string, Property>, INotifyCollectionChanged, IDeepCloneable
    {
        private readonly object _addLocker = new object();
-        internal Action OnAdd;
+        
        internal Func<Property, bool> AdditionValidator { get; set; }

        /// <summary>
@@ -49,10 +49,12 @@ namespace Umbraco.Core.Models
        /// </summary>
        internal void Reset(IEnumerable<Property> properties)
        {
+            //collection events will be raised in each of these calls
            Clear();
+
+            //collection events will be raised in each of these calls
            foreach (var property in properties)
                Add(property);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
        }

        /// <summary>
@@ -60,8 +62,9 @@ namespace Umbraco.Core.Models
        /// </summary>
        protected override void SetItem(int index, Property property)
        {
+            var oldItem = index >= 0 ? this[index] : property;
            base.SetItem(index, property);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, property, index));
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, property, oldItem));
        }

        /// <summary>
@@ -120,10 +123,8 @@ namespace Umbraco.Core.Models
                    }
                }

+                //collection events will be raised in InsertItem with Add
                base.Add(property);
-
-                OnAdd?.Invoke();
-                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, property));
            }
        }

@@ -19,9 +19,6 @@ namespace Umbraco.Core.Models
    {
        private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();

-        // TODO: this doesn't seem to be used anywhere
-        internal Action OnAdd;
-
        internal PropertyGroupCollection()
        { }

@@ -37,16 +34,19 @@ namespace Umbraco.Core.Models
        /// <remarks></remarks>
        internal void Reset(IEnumerable<PropertyGroup> groups)
        {
+            //collection events will be raised in each of these calls
            Clear();
+
+            //collection events will be raised in each of these calls
            foreach (var group in groups)
                Add(group);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
        }

        protected override void SetItem(int index, PropertyGroup item)
        {
+            var oldItem = index >= 0 ? this[index] : item;
            base.SetItem(index, item);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item, index));
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, item, oldItem));
        }

        protected override void RemoveItem(int index)
@@ -84,6 +84,7 @@ namespace Umbraco.Core.Models
                        if (keyExists)
                            throw new Exception($"Naming conflict: Changing the name of PropertyGroup '{item.Name}' would result in duplicates");

+                        //collection events will be raised in SetItem
                        SetItem(IndexOfKey(item.Id), item);
                        return;
                    }
@@ -96,16 +97,14 @@ namespace Umbraco.Core.Models
                        var exists = Contains(key);
                        if (exists)
                        {
+                            //collection events will be raised in SetItem
                            SetItem(IndexOfKey(key), item);
                            return;
                        }
                    }
                }
-
+                //collection events will be raised in InsertItem
                base.Add(item);
-                OnAdd?.Invoke();
-
-                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item));
            }
            finally
            {
@@ -19,9 +19,6 @@ namespace Umbraco.Core.Models
        [IgnoreDataMember]
        private readonly ReaderWriterLockSlim _addLocker = new ReaderWriterLockSlim();

-        // TODO: This doesn't seem to be used
-        [IgnoreDataMember]
-        internal Action OnAdd;

        internal PropertyTypeCollection(bool supportsPublishing)
        {
@@ -43,36 +40,44 @@ namespace Umbraco.Core.Models
        /// <remarks></remarks>
        internal void Reset(IEnumerable<PropertyType> properties)
        {
+            //collection events will be raised in each of these calls
            Clear();
+
+            //collection events will be raised in each of these calls
            foreach (var property in properties)
-                Add(property);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+                Add(property);            
        }

        protected override void SetItem(int index, PropertyType item)
        {
            item.SupportsPublishing = SupportsPublishing;
-            base.SetItem(index, item);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item, index));
+            var oldItem = index >= 0 ? this[index] : item;
+            base.SetItem(index, item);            
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, item, oldItem));
+            item.PropertyChanged += Item_PropertyChanged;
        }

        protected override void RemoveItem(int index)
        {
            var removed = this[index];
            base.RemoveItem(index);
+            removed.PropertyChanged -= Item_PropertyChanged;
            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, removed));
        }

        protected override void InsertItem(int index, PropertyType item)
        {
            item.SupportsPublishing = SupportsPublishing;
-            base.InsertItem(index, item);
+            base.InsertItem(index, item);            
            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item));
+            item.PropertyChanged += Item_PropertyChanged;
        }

        protected override void ClearItems()
        {
            base.ClearItems();
+            foreach (var item in this)
+                item.PropertyChanged -= Item_PropertyChanged;
            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
        }

@@ -91,6 +96,7 @@ namespace Umbraco.Core.Models
                    var exists = Contains(key);
                    if (exists)
                    {
+                        //collection events will be raised in SetItem
                        SetItem(IndexOfKey(key), item);
                        return;
                    }
@@ -103,10 +109,8 @@ namespace Umbraco.Core.Models
                    item.SortOrder = this.Max(x => x.SortOrder) + 1;
                }

+                //collection events will be raised in InsertItem
                base.Add(item);
-                OnAdd?.Invoke();
-
-                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item));
            }
            finally
            {
@@ -115,6 +119,17 @@ namespace Umbraco.Core.Models
            }
        }

+        /// <summary>
+        /// Occurs when a property changes on a PropertyType that exists in this collection
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Item_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            var propType = (PropertyType)sender;
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, propType, propType));
+        }
+
        /// <summary>
        /// Determines whether this collection contains a <see cref="Property"/> whose alias matches the specified PropertyType.
        /// </summary>
@@ -151,22 +151,22 @@ namespace Umbraco.Core.Models

        internal static bool HasContentRootAccess(this IUser user, IEntityService entityService)
        {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.Root.ToInvariantString(), user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
        }

        internal static bool HasContentBinAccess(this IUser user, IEntityService entityService)
        {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinContent.ToInvariantString(), user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinContentString, user.CalculateContentStartNodeIds(entityService), Constants.System.RecycleBinContent);
        }

        internal static bool HasMediaRootAccess(this IUser user, IEntityService entityService)
        {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.Root.ToInvariantString(), user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RootString, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
        }

        internal static bool HasMediaBinAccess(this IUser user, IEntityService entityService)
        {
-            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinMedia.ToInvariantString(), user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
+            return ContentPermissionsHelper.HasPathAccess(Constants.System.RecycleBinMediaString, user.CalculateMediaStartNodeIds(entityService), Constants.System.RecycleBinMedia);
        }

        internal static bool HasPathAccess(this IUser user, IContent content, IEntityService entityService)
@@ -327,7 +327,7 @@ namespace Umbraco.Core.Models
                ? entityService.GetAllPaths(objectType, asn).ToDictionary(x => x.Id, x => x.Path)
                : new Dictionary<int, string>();

-            paths[Constants.System.Root] = Constants.System.Root.ToString(); // entityService does not get that one
+            paths[Constants.System.Root] = Constants.System.RootString; // entityService does not get that one

            var binPath = GetBinPath(objectType);

@@ -57,7 +57,7 @@ namespace Umbraco.Core
                public const string MacroProperty = /*TableNamePrefix*/ "cms" + "MacroProperty";

                public const string Member = /*TableNamePrefix*/ "cms" + "Member";
-                public const string MemberType = /*TableNamePrefix*/ "cms" + "MemberType";
+                public const string MemberPropertyType = /*TableNamePrefix*/ "cms" + "MemberType";
                public const string Member2MemberGroup = /*TableNamePrefix*/ "cms" + "Member2MemberGroup";

                public const string Access = TableNamePrefix + "Access";
@@ -69,7 +69,7 @@ namespace Umbraco.Core

                public const string Tag = /*TableNamePrefix*/ "cms" + "Tags";
                public const string TagRelationship = /*TableNamePrefix*/ "cms" + "TagRelationship";
-                
+
                public const string KeyValue = TableNamePrefix + "KeyValue";

                public const string AuditEntry = TableNamePrefix + "Audit";
@@ -18,5 +18,6 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
        public string ConstraintName { get; set; }
        public string TableName { get; set; }
        public ICollection<string> Columns = new HashSet<string>();
+        public bool IsPrimaryKeyClustered { get; set; }
    }
 }
@@ -54,6 +54,7 @@ namespace Umbraco.Core.Persistence.Dtos
        public byte Variations { get; set; }

        [ResultColumn]
+        [Reference(ReferenceType.OneToOne, ColumnName = "NodeId")]
        public NodeDto NodeDto { get; set; }
    }
 }
@@ -26,7 +26,7 @@ namespace Umbraco.Core.Persistence.Dtos
        public string Configuration { get; set; }

        [ResultColumn]
-        [Reference(ReferenceType.OneToOne, ColumnName = "DataTypeId")]
+        [Reference(ReferenceType.OneToOne, ColumnName = "NodeId")]
        public NodeDto NodeDto { get; set; }
    }
 }
@@ -3,10 +3,10 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;

 namespace Umbraco.Core.Persistence.Dtos
 {
-    [TableName(Constants.DatabaseSchema.Tables.MemberType)]
+    [TableName(Constants.DatabaseSchema.Tables.MemberPropertyType)]
    [PrimaryKey("pk")]
    [ExplicitColumns]
-    internal class MemberTypeDto
+    internal class MemberPropertyTypeDto
    {
        [Column("pk")]
        [PrimaryKeyColumn]
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NPoco;
-
-namespace Umbraco.Core.Persistence.Dtos
-{
-    [TableName(Constants.DatabaseSchema.Tables.Node)]
-    [PrimaryKey("id")]
-    [ExplicitColumns]
-    internal class MemberTypeReadOnlyDto
-    {
-        /* from umbracoNode */
-        [Column("id")]
-        public int NodeId { get; set; }
-
-        [Column("trashed")]
-        public bool Trashed { get; set; }
-
-        [Column("parentID")]
-        public int ParentId { get; set; }
-
-        [Column("nodeUser")]
-        public int? UserId { get; set; }
-
-        [Column("level")]
-        public short Level { get; set; }
-
-        [Column("path")]
-        public string Path { get; set; }
-
-        [Column("sortOrder")]
-        public int SortOrder { get; set; }
-
-        [Column("uniqueID")]
-        public Guid? UniqueId { get; set; }
-
-        [Column("text")]
-        public string Text { get; set; }
-
-        [Column("nodeObjectType")]
-        public Guid? NodeObjectType { get; set; }
-
-        [Column("createDate")]
-        public DateTime CreateDate { get; set; }
-
-        /* cmsContentType */
-        [Column("pk")]
-        public int PrimaryKey { get; set; }
-
-        [Column("alias")]
-        public string Alias { get; set; }
-
-        [Column("icon")]
-        public string Icon { get; set; }
-
-        [Column("thumbnail")]
-        public string Thumbnail { get; set; }
-
-        [Column("description")]
-        public string Description { get; set; }
-
-        [Column("isContainer")]
-        public bool IsContainer { get; set; }
-
-        [Column("allowAtRoot")]
-        public bool AllowAtRoot { get; set; }
-
-        /* PropertyTypes */
-        // TODO: Add PropertyTypeDto (+MemberTypeDto and DataTypeDto as one) ReadOnly list
-        [ResultColumn]
-        [Reference(ReferenceType.Many, ReferenceMemberName = "ContentTypeId")]
-        public List<PropertyTypeReadOnlyDto> PropertyTypes { get; set; }
-
-        /* PropertyTypeGroups */
-        // TODO: Add PropertyTypeGroupDto ReadOnly list
-        [ResultColumn]
-        [Reference(ReferenceType.Many, ReferenceMemberName = "ContentTypeNodeId")]
-        public List<PropertyTypeGroupReadOnlyDto> PropertyTypeGroups { get; set; }
-    }
-}
@@ -0,0 +1,18 @@
+using NPoco;
+
+namespace Umbraco.Core.Persistence.Dtos
+{
+    // this is PropertyTypeDto + the special property type fields for members
+    // it is used for querying everything needed for a property type, at once
+    internal class PropertyTypeCommonDto : PropertyTypeDto
+    {
+        [Column("memberCanEdit")]
+        public bool CanEdit { get; set; }
+
+        [Column("viewOnProfile")]
+        public bool ViewOnProfile { get; set; }
+
+        [Column("isSensitive")]
+        public bool IsSensitive { get; set; }
+    }
+}
@@ -67,16 +67,28 @@ namespace Umbraco.Core.Persistence.Factories

        public static IMemberType BuildMemberTypeEntity(ContentTypeDto dto)
        {
-            throw new NotImplementedException();
+            var contentType = new MemberType(dto.NodeDto.ParentId);
+            try
+            {
+                contentType.DisableChangeTracking();
+                BuildCommonEntity(contentType, dto, false);
+                contentType.ResetDirtyProperties(false);
+            }
+            finally
+            {
+                contentType.EnableChangeTracking();
+            }
+
+            return contentType;
        }

-        public static IEnumerable<MemberTypeDto> BuildMemberTypeDtos(IMemberType entity)
+        public static IEnumerable<MemberPropertyTypeDto> BuildMemberPropertyTypeDtos(IMemberType entity)
        {
            var memberType = entity as MemberType;
            if (memberType == null || memberType.PropertyTypes.Any() == false)
-                return Enumerable.Empty<MemberTypeDto>();
+                return Enumerable.Empty<MemberPropertyTypeDto>();

-            var dtos = memberType.PropertyTypes.Select(x => new MemberTypeDto
+            var dtos = memberType.PropertyTypes.Select(x => new MemberPropertyTypeDto
            {
                NodeId = entity.Id,
                PropertyTypeId = x.Id,
@@ -91,7 +103,7 @@ namespace Umbraco.Core.Persistence.Factories

        #region Common

-        private static void BuildCommonEntity(ContentTypeBase entity, ContentTypeDto dto)
+        private static void BuildCommonEntity(ContentTypeBase entity, ContentTypeDto dto, bool setVariations = true)
        {
            entity.Id = dto.NodeDto.NodeId;
            entity.Key = dto.NodeDto.UniqueId;
@@ -102,6 +114,7 @@ namespace Umbraco.Core.Persistence.Factories
            entity.SortOrder = dto.NodeDto.SortOrder;
            entity.Description = dto.Description;
            entity.CreateDate = dto.NodeDto.CreateDate;
+            entity.UpdateDate = dto.NodeDto.CreateDate;
            entity.Path = dto.NodeDto.Path;
            entity.Level = dto.NodeDto.Level;
            entity.CreatorId = dto.NodeDto.UserId ?? Constants.Security.UnknownUserId;
@@ -109,7 +122,9 @@ namespace Umbraco.Core.Persistence.Factories
            entity.IsContainer = dto.IsContainer;
            entity.IsElement = dto.IsElement;
            entity.Trashed = dto.NodeDto.Trashed;
-            entity.Variations = (ContentVariation) dto.Variations;
+
+            if (setVariations)
+                entity.Variations = (ContentVariation) dto.Variations;
        }

        public static ContentTypeDto BuildContentTypeDto(IContentTypeBase entity)
@@ -1,194 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Dtos;
-using Umbraco.Core.Persistence.Repositories.Implement;
-
-namespace Umbraco.Core.Persistence.Factories
-{
-    internal static class MemberTypeReadOnlyFactory
-    {
-        public static IMemberType BuildEntity(MemberTypeReadOnlyDto dto, out bool needsSaving)
-        {
-            var standardPropertyTypes = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
-            needsSaving = false;
-
-            var memberType = new MemberType(dto.ParentId);
-
-            try
-            {
-                memberType.DisableChangeTracking();
-
-                memberType.Alias = dto.Alias;
-                memberType.AllowedAsRoot = dto.AllowAtRoot;
-                memberType.CreateDate = dto.CreateDate;
-                memberType.CreatorId = dto.UserId.HasValue ? dto.UserId.Value : 0;
-                memberType.Description = dto.Description;
-                memberType.Icon = dto.Icon;
-                memberType.Id = dto.NodeId;
-                memberType.IsContainer = dto.IsContainer;
-                memberType.Key = dto.UniqueId.Value;
-                memberType.Level = dto.Level;
-                memberType.Name = dto.Text;
-                memberType.Path = dto.Path;
-                memberType.SortOrder = dto.SortOrder;
-                memberType.Thumbnail = dto.Thumbnail;
-                memberType.Trashed = dto.Trashed;
-                memberType.UpdateDate = dto.CreateDate;
-                memberType.AllowedContentTypes = Enumerable.Empty<ContentTypeSort>();
-
-                var propertyTypeGroupCollection = GetPropertyTypeGroupCollection(dto, memberType, standardPropertyTypes);
-                memberType.PropertyGroups = propertyTypeGroupCollection;
-
-                var propertyTypes = GetPropertyTypes(dto, memberType, standardPropertyTypes);
-
-                //By Convention we add 9 standard PropertyTypes - This is only here to support loading of types that didn't have these conventions before.
-                foreach (var standardPropertyType in standardPropertyTypes)
-                {
-                    if (dto.PropertyTypes.Any(x => x.Alias.Equals(standardPropertyType.Key))) continue;
-
-                    // beware!
-                    // means that we can return a memberType "from database" that has some property types
-                    // that do *not* come from the database and therefore are incomplete eg have no key,
-                    // no id, no dataTypeDefinitionId - ouch! - better notify caller of the situation
-                    needsSaving = true;
-
-                    //Add the standard PropertyType to the current list
-                    propertyTypes.Add(standardPropertyType.Value);
-                    
-                    //Internal dictionary for adding "MemberCanEdit", "VisibleOnProfile", "IsSensitive" properties to each PropertyType
-                    memberType.MemberTypePropertyTypes.Add(standardPropertyType.Key,
-                        new MemberTypePropertyProfileAccess(false, false, false));
-                }
-                memberType.NoGroupPropertyTypes = propertyTypes;
-
-                return memberType;
-            }
-            finally
-            {
-                memberType.EnableChangeTracking();
-            }
-        }
-
-        private static PropertyGroupCollection GetPropertyTypeGroupCollection(MemberTypeReadOnlyDto dto, MemberType memberType, Dictionary<string, PropertyType> standardProps)
-        {
-            // see PropertyGroupFactory, repeating code here...
-
-            var propertyGroups = new PropertyGroupCollection();
-            foreach (var groupDto in dto.PropertyTypeGroups.Where(x => x.Id.HasValue))
-            {
-                var group = new PropertyGroup(MemberType.SupportsPublishingConst);
-
-                // if the group is defined on the current member type,
-                // assign its identifier, else it will be zero
-                if (groupDto.ContentTypeNodeId == memberType.Id)
-                {
-                    // note: no idea why Id is nullable here, but better check
-                    if (groupDto.Id.HasValue == false)
-                        throw new Exception("GroupDto.Id has no value.");
-                    group.Id = groupDto.Id.Value;
-                }
-
-                group.Key = groupDto.UniqueId;
-                group.Name = groupDto.Text;
-                group.SortOrder = groupDto.SortOrder;
-                group.PropertyTypes = new PropertyTypeCollection(MemberType.SupportsPublishingConst);
-
-                //Because we are likely to have a group with no PropertyTypes we need to ensure that these are excluded
-                var localGroupDto = groupDto;
-                var typeDtos = dto.PropertyTypes.Where(x => x.Id.HasValue && x.Id > 0 && x.PropertyTypeGroupId.HasValue && x.PropertyTypeGroupId.Value == localGroupDto.Id.Value);
-                foreach (var typeDto in typeDtos)
-                {
-                    //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType
-                    memberType.MemberTypePropertyTypes.Add(typeDto.Alias,
-                        new MemberTypePropertyProfileAccess(typeDto.ViewOnProfile, typeDto.CanEdit, typeDto.IsSensitive));
-
-                    var tempGroupDto = groupDto;
-
-                    //ensures that any built-in membership properties have their correct dbtype assigned no matter
-                    //what the underlying data type is
-                    var propDbType = MemberTypeRepository.GetDbTypeForBuiltInProperty(
-                        typeDto.Alias,
-                        typeDto.DbType.EnumParse<ValueStorageType>(true),
-                        standardProps);
-
-                    var propertyType = new PropertyType(
-                        typeDto.PropertyEditorAlias,
-                        propDbType.Result,
-                        //This flag tells the property type that it has an explicit dbtype and that it cannot be changed
-                        // which is what we want for the built-in properties.
-                        propDbType.Success,
-                        typeDto.Alias)
-                    {
-                        DataTypeId = typeDto.DataTypeId,
-                        Description = typeDto.Description,
-                        Id = typeDto.Id.Value,
-                        Name = typeDto.Name,
-                        Mandatory = typeDto.Mandatory,
-                        SortOrder = typeDto.SortOrder,
-                        ValidationRegExp = typeDto.ValidationRegExp,
-                        PropertyGroupId = new Lazy<int>(() => tempGroupDto.Id.Value),
-                        CreateDate = memberType.CreateDate,
-                        UpdateDate = memberType.UpdateDate,
-                        Key = typeDto.UniqueId
-                    };
-
-                    // reset dirty initial properties (U4-1946)
-                    propertyType.ResetDirtyProperties(false);
-                    group.PropertyTypes.Add(propertyType);
-                }
-
-                // reset dirty initial properties (U4-1946)
-                group.ResetDirtyProperties(false);
-                propertyGroups.Add(group);
-            }
-
-            return propertyGroups;
-        }
-
-        private static List<PropertyType> GetPropertyTypes(MemberTypeReadOnlyDto dto, MemberType memberType, Dictionary<string, PropertyType> standardProps)
-        {
-            //Find PropertyTypes that does not belong to a PropertyTypeGroup
-            var propertyTypes = new List<PropertyType>();
-            foreach (var typeDto in dto.PropertyTypes.Where(x => (x.PropertyTypeGroupId.HasValue == false || x.PropertyTypeGroupId.Value == 0) && x.Id.HasValue))
-            {
-                //Internal dictionary for adding "MemberCanEdit" and "VisibleOnProfile" properties to each PropertyType
-                memberType.MemberTypePropertyTypes.Add(typeDto.Alias,
-                    new MemberTypePropertyProfileAccess(typeDto.ViewOnProfile, typeDto.CanEdit, typeDto.IsSensitive));
-
-                //ensures that any built-in membership properties have their correct dbtype assigned no matter
-                //what the underlying data type is
-                var propDbType = MemberTypeRepository.GetDbTypeForBuiltInProperty(
-                    typeDto.Alias,
-                    typeDto.DbType.EnumParse<ValueStorageType>(true),
-                    standardProps);
-
-                var propertyType = new PropertyType(
-                    typeDto.PropertyEditorAlias,
-                    propDbType.Result,
-                    //This flag tells the property type that it has an explicit dbtype and that it cannot be changed
-                    // which is what we want for the built-in properties.
-                    propDbType.Success,
-                    typeDto.Alias)
-                {
-                    DataTypeId = typeDto.DataTypeId,
-                    Description = typeDto.Description,
-                    Id = typeDto.Id.Value,
-                    Mandatory = typeDto.Mandatory,
-                    Name = typeDto.Name,
-                    SortOrder = typeDto.SortOrder,
-                    ValidationRegExp = typeDto.ValidationRegExp,
-                    PropertyGroupId = null,
-                    CreateDate = dto.CreateDate,
-                    UpdateDate = dto.CreateDate,
-                    Key = typeDto.UniqueId
-                };
-
-                propertyTypes.Add(propertyType);
-            }
-            return propertyTypes;
-        }
-
-    }
-}
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -7,18 +8,18 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(PublicAccessEntry))]
    public sealed class AccessMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public AccessMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            CacheMap<PublicAccessEntry, AccessDto>(src => src.Key, dto => dto.Id);
-            CacheMap<PublicAccessEntry, AccessDto>(src => src.LoginNodeId, dto => dto.LoginNodeId);
-            CacheMap<PublicAccessEntry, AccessDto>(src => src.NoAccessNodeId, dto => dto.NoAccessNodeId);
-            CacheMap<PublicAccessEntry, AccessDto>(src => src.ProtectedNodeId, dto => dto.NodeId);
-            CacheMap<PublicAccessEntry, AccessDto>(src => src.CreateDate, dto => dto.CreateDate);
-            CacheMap<PublicAccessEntry, AccessDto>(src => src.UpdateDate, dto => dto.UpdateDate);
+            DefineMap<PublicAccessEntry, AccessDto>(nameof(PublicAccessEntry.Key), nameof(AccessDto.Id));
+            DefineMap<PublicAccessEntry, AccessDto>(nameof(PublicAccessEntry.LoginNodeId), nameof(AccessDto.LoginNodeId));
+            DefineMap<PublicAccessEntry, AccessDto>(nameof(PublicAccessEntry.NoAccessNodeId), nameof(AccessDto.NoAccessNodeId));
+            DefineMap<PublicAccessEntry, AccessDto>(nameof(PublicAccessEntry.ProtectedNodeId), nameof(AccessDto.NodeId));
+            DefineMap<PublicAccessEntry, AccessDto>(nameof(PublicAccessEntry.CreateDate), nameof(AccessDto.CreateDate));
+            DefineMap<PublicAccessEntry, AccessDto>(nameof(PublicAccessEntry.UpdateDate), nameof(AccessDto.UpdateDate));
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -11,21 +12,21 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(AuditEntry))]
    public sealed class AuditEntryMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public AuditEntryMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.Id, dto => dto.Id);
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.PerformingUserId, dto => dto.PerformingUserId);
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.PerformingDetails, dto => dto.PerformingDetails);
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.PerformingIp, dto => dto.PerformingIp);
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.EventDateUtc, dto => dto.EventDateUtc);
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.AffectedUserId, dto => dto.AffectedUserId);
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.AffectedDetails, dto => dto.AffectedDetails);
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.EventType, dto => dto.EventType);
-            CacheMap<AuditEntry, AuditEntryDto>(entity => entity.EventDetails, dto => dto.EventDetails);
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.Id), nameof(AuditEntryDto.Id));
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.PerformingUserId), nameof(AuditEntryDto.PerformingUserId));
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.PerformingDetails), nameof(AuditEntryDto.PerformingDetails));
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.PerformingIp), nameof(AuditEntryDto.PerformingIp));
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.EventDateUtc), nameof(AuditEntryDto.EventDateUtc));
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.AffectedUserId), nameof(AuditEntryDto.AffectedUserId));
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.AffectedDetails), nameof(AuditEntryDto.AffectedDetails));
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.EventType), nameof(AuditEntryDto.EventType));
+            DefineMap<AuditEntry, AuditEntryDto>(nameof(AuditEntry.EventDetails), nameof(AuditEntryDto.EventDetails));
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -8,17 +9,17 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IAuditItem))]
    public sealed class AuditItemMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public AuditItemMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            CacheMap<AuditItem, LogDto>(src => src.Id, dto => dto.NodeId);
-            CacheMap<AuditItem, LogDto>(src => src.CreateDate, dto => dto.Datestamp);
-            CacheMap<AuditItem, LogDto>(src => src.UserId, dto => dto.UserId);
-            CacheMap<AuditItem, LogDto>(src => src.AuditType, dto => dto.Header);
-            CacheMap<AuditItem, LogDto>(src => src.Comment, dto => dto.Comment);
+            DefineMap<AuditItem, LogDto>(nameof(AuditItem.Id), nameof(LogDto.NodeId));
+            DefineMap<AuditItem, LogDto>(nameof(AuditItem.CreateDate), nameof(LogDto.Datestamp));
+            DefineMap<AuditItem, LogDto>(nameof(AuditItem.UserId), nameof(LogDto.UserId));
+            DefineMap<AuditItem, LogDto>(nameof(AuditItem.AuditType), nameof(LogDto.Header));
+            DefineMap<AuditItem, LogDto>(nameof(AuditItem.Comment), nameof(LogDto.Comment));
        }
    }
 }
@@ -1,69 +1,81 @@
 using System;
 using System.Collections.Concurrent;
-using System.Linq.Expressions;
-using System.Reflection;
 using NPoco;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Composing;

 namespace Umbraco.Core.Persistence.Mappers
 {
-    public abstract class BaseMapper : IDiscoverable
+    public abstract class BaseMapper
    {
-        protected BaseMapper()
+        // note: using a Lazy<ISqlContext> here because during installs, we are resolving the
+        // mappers way before we have a configured IUmbracoDatabaseFactory, ie way before we
+        // have an ISqlContext - this is some nasty temporal coupling which we might want to
+        // cleanup eventually.
+
+        private readonly Lazy<ISqlContext> _sqlContext;
+        private readonly object _definedLock = new object();
+        private readonly ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> _maps;
+
+        private ISqlSyntaxProvider _sqlSyntax;
+        private bool _defined;
+
+        protected BaseMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
        {
-            Build();
+            _sqlContext = sqlContext;
+            _maps = maps;
        }

-        internal abstract ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache { get; }
+        protected abstract void DefineMaps();

-        private void Build()
+        internal string Map(string propertyName)
        {
-            BuildMap();
-        }
-
-        protected abstract void BuildMap();
-
-        internal string Map(ISqlSyntaxProvider sqlSyntax, string propertyName, bool throws = false)
-        {
-            if (PropertyInfoCache.TryGetValue(propertyName, out var dtoTypeProperty))
-                return GetColumnName(sqlSyntax, dtoTypeProperty.Type, dtoTypeProperty.PropertyInfo);
-
-            if (throws)
-                throw new InvalidOperationException("Could not get the value with the key " + propertyName + " from the property info cache, keys available: " + string.Join(", ", PropertyInfoCache.Keys));
-
-            return string.Empty;
-        }
-
-        internal void CacheMap<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var property = ResolveMapping(sourceMember, destinationMember);
-            PropertyInfoCache.AddOrUpdate(property.SourcePropertyName, property, (x, y) => property);
-        }
-
-        internal DtoMapModel ResolveMapping<TSource, TDestination>(Expression<Func<TSource, object>> sourceMember, Expression<Func<TDestination, object>> destinationMember)
-        {
-            var source = ExpressionHelper.FindProperty(sourceMember);
-            var destination = (PropertyInfo) ExpressionHelper.FindProperty(destinationMember).Item1;
-
-            if (destination == null)
+            lock (_definedLock)
            {
-                throw new InvalidOperationException("The 'destination' returned was null, cannot resolve the mapping");
+                if (!_defined)
+                {
+                    var sqlContext = _sqlContext.Value;
+                    if (sqlContext == null)
+                        throw new InvalidOperationException("Could not get an ISqlContext.");
+                    _sqlSyntax = sqlContext.SqlSyntax;
+
+                    DefineMaps();
+
+                    _defined = true;
+                }
            }

-            return new DtoMapModel(typeof(TDestination), destination, source.Item1.Name);
+            if (!_maps.TryGetValue(GetType(), out var mapperMaps))
+                throw new InvalidOperationException($"No maps defined for mapper {GetType().FullName}.");
+            if (!mapperMaps.TryGetValue(propertyName, out var mappedName))
+                throw new InvalidOperationException($"No map defined by mapper {GetType().FullName} for property {propertyName}.");
+            return mappedName;
        }

-        internal virtual string GetColumnName(ISqlSyntaxProvider sqlSyntax, Type dtoType, PropertyInfo dtoProperty)
+        protected void DefineMap<TSource, TTarget>(string sourceName, string targetName)
        {
-            var tableNameAttribute = dtoType.FirstAttribute<TableNameAttribute>();
+            if (_sqlSyntax == null)
+                throw new InvalidOperationException("Do not define maps outside of DefineMaps.");
+
+            var targetType = typeof(TTarget);
+
+            // TODO ensure that sourceName is a valid sourceType property (but, slow?)
+
+            var tableNameAttribute = targetType.FirstAttribute<TableNameAttribute>();
+            if (tableNameAttribute == null) throw new InvalidOperationException($"Type {targetType.FullName} is not marked with a TableName attribute.");
            var tableName = tableNameAttribute.Value;

-            var columnAttribute = dtoProperty.FirstAttribute<ColumnAttribute>();
-            var columnName = columnAttribute.Name;
+            // TODO maybe get all properties once and then index them
+            var targetProperty = targetType.GetProperty(targetName);
+            if (targetProperty == null) throw new InvalidOperationException($"Type {targetType.FullName} does not have a property named {targetName}.");
+            var columnAttribute = targetProperty.FirstAttribute<ColumnAttribute>();
+            if (columnAttribute == null) throw new InvalidOperationException($"Property {targetType.FullName}.{targetName} is not marked with a Column attribute.");

-            var columnMap = sqlSyntax.GetQuotedTableName(tableName) + "." + sqlSyntax.GetQuotedColumnName(columnName);
-            return columnMap;
+            var columnName = columnAttribute.Name;
+            var columnMap = _sqlSyntax.GetQuotedTableName(tableName) + "." + _sqlSyntax.GetQuotedColumnName(columnName);
+
+            var mapperMaps = _maps.GetOrAdd(GetType(), type => new ConcurrentDictionary<string, string>());
+            mapperMaps[sourceName] = columnMap;
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -11,20 +12,20 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(Consent))]
    public sealed class ConsentMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public ConsentMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            CacheMap<Consent, ConsentDto>(entity => entity.Id, dto => dto.Id);
-            CacheMap<Consent, ConsentDto>(entity => entity.Current, dto => dto.Current);
-            CacheMap<Consent, ConsentDto>(entity => entity.CreateDate, dto => dto.CreateDate);
-            CacheMap<Consent, ConsentDto>(entity => entity.Source, dto => dto.Source);
-            CacheMap<Consent, ConsentDto>(entity => entity.Context, dto => dto.Context);
-            CacheMap<Consent, ConsentDto>(entity => entity.Action, dto => dto.Action);
-            CacheMap<Consent, ConsentDto>(entity => entity.State, dto => dto.State);
-            CacheMap<Consent, ConsentDto>(entity => entity.Comment, dto => dto.Comment);
+            DefineMap<Consent, ConsentDto>(nameof(Consent.Id), nameof(ConsentDto.Id));
+            DefineMap<Consent, ConsentDto>(nameof(Consent.Current), nameof(ConsentDto.Current));
+            DefineMap<Consent, ConsentDto>(nameof(Consent.CreateDate), nameof(ConsentDto.CreateDate));
+            DefineMap<Consent, ConsentDto>(nameof(Consent.Source), nameof(ConsentDto.Source));
+            DefineMap<Consent, ConsentDto>(nameof(Consent.Context), nameof(ConsentDto.Context));
+            DefineMap<Consent, ConsentDto>(nameof(Consent.Action), nameof(ConsentDto.Action));
+            DefineMap<Consent, ConsentDto>(nameof(Consent.State), nameof(ConsentDto.State));
+            DefineMap<Consent, ConsentDto>(nameof(Consent.Comment), nameof(ConsentDto.Comment));
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -12,36 +13,34 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IContent))]
    public sealed class ContentMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public ContentMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            if (PropertyInfoCache.IsEmpty == false) return;
+            DefineMap<Content, NodeDto>(nameof(Content.Id), nameof(NodeDto.NodeId));
+            DefineMap<Content, NodeDto>(nameof(Content.Key), nameof(NodeDto.UniqueId));

-            CacheMap<Content, NodeDto>(src => src.Id, dto => dto.NodeId);
-            CacheMap<Content, NodeDto>(src => src.Key, dto => dto.UniqueId);
+            DefineMap<Content, ContentVersionDto>(nameof(Content.VersionId), nameof(ContentVersionDto.Id));
+            DefineMap<Content, ContentVersionDto>(nameof(Content.Name), nameof(ContentVersionDto.Text));

-            CacheMap<Content, ContentVersionDto>(src => src.VersionId, dto => dto.Id);
-            CacheMap<Content, ContentVersionDto>(src => src.Name, dto => dto.Text);
+            DefineMap<Content, NodeDto>(nameof(Content.ParentId), nameof(NodeDto.ParentId));
+            DefineMap<Content, NodeDto>(nameof(Content.Level), nameof(NodeDto.Level));
+            DefineMap<Content, NodeDto>(nameof(Content.Path), nameof(NodeDto.Path));
+            DefineMap<Content, NodeDto>(nameof(Content.SortOrder), nameof(NodeDto.SortOrder));
+            DefineMap<Content, NodeDto>(nameof(Content.Trashed), nameof(NodeDto.Trashed));

-            CacheMap<Content, NodeDto>(src => src.ParentId, dto => dto.ParentId);
-            CacheMap<Content, NodeDto>(src => src.Level, dto => dto.Level);
-            CacheMap<Content, NodeDto>(src => src.Path, dto => dto.Path);
-            CacheMap<Content, NodeDto>(src => src.SortOrder, dto => dto.SortOrder);
-            CacheMap<Content, NodeDto>(src => src.Trashed, dto => dto.Trashed);
+            DefineMap<Content, NodeDto>(nameof(Content.CreateDate), nameof(NodeDto.CreateDate));
+            DefineMap<Content, NodeDto>(nameof(Content.CreatorId), nameof(NodeDto.UserId));
+            DefineMap<Content, ContentDto>(nameof(Content.ContentTypeId), nameof(ContentDto.ContentTypeId));

-            CacheMap<Content, NodeDto>(src => src.CreateDate, dto => dto.CreateDate);
-            CacheMap<Content, NodeDto>(src => src.CreatorId, dto => dto.UserId);
-            CacheMap<Content, ContentDto>(src => src.ContentTypeId, dto => dto.ContentTypeId);
+            DefineMap<Content, ContentVersionDto>(nameof(Content.UpdateDate), nameof(ContentVersionDto.VersionDate));
+            DefineMap<Content, DocumentDto>(nameof(Content.Published), nameof(DocumentDto.Published));

-            CacheMap<Content, ContentVersionDto>(src => src.UpdateDate, dto => dto.VersionDate);
-            CacheMap<Content, DocumentDto>(src => src.Published, dto => dto.Published);
-
-            //CacheMap<Content, DocumentDto>(src => src.Name, dto => dto.Alias);
+            //DefineMap<Content, DocumentDto>(nameof(Content.Name), nameof(DocumentDto.Alias));
            //CacheMap<Content, DocumentDto>(src => src, dto => dto.Newest);
-            //CacheMap<Content, DocumentDto>(src => src.Template, dto => dto.TemplateId);
+            //DefineMap<Content, DocumentDto>(nameof(Content.Template), nameof(DocumentDto.TemplateId));
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -12,31 +13,29 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IContentType))]
    public sealed class ContentTypeMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public ContentTypeMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            if (PropertyInfoCache.IsEmpty == false) return;
-
-            CacheMap<ContentType, NodeDto>(src => src.Id, dto => dto.NodeId);
-            CacheMap<ContentType, NodeDto>(src => src.CreateDate, dto => dto.CreateDate);
-            CacheMap<ContentType, NodeDto>(src => src.Level, dto => dto.Level);
-            CacheMap<ContentType, NodeDto>(src => src.ParentId, dto => dto.ParentId);
-            CacheMap<ContentType, NodeDto>(src => src.Path, dto => dto.Path);
-            CacheMap<ContentType, NodeDto>(src => src.SortOrder, dto => dto.SortOrder);
-            CacheMap<ContentType, NodeDto>(src => src.Name, dto => dto.Text);
-            CacheMap<ContentType, NodeDto>(src => src.Trashed, dto => dto.Trashed);
-            CacheMap<ContentType, NodeDto>(src => src.Key, dto => dto.UniqueId);
-            CacheMap<ContentType, NodeDto>(src => src.CreatorId, dto => dto.UserId);
-            CacheMap<ContentType, ContentTypeDto>(src => src.Alias, dto => dto.Alias);
-            CacheMap<ContentType, ContentTypeDto>(src => src.AllowedAsRoot, dto => dto.AllowAtRoot);
-            CacheMap<ContentType, ContentTypeDto>(src => src.Description, dto => dto.Description);
-            CacheMap<ContentType, ContentTypeDto>(src => src.Icon, dto => dto.Icon);
-            CacheMap<ContentType, ContentTypeDto>(src => src.IsContainer, dto => dto.IsContainer);
-            CacheMap<ContentType, ContentTypeDto>(src => src.IsElement, dto => dto.IsElement);
-            CacheMap<ContentType, ContentTypeDto>(src => src.Thumbnail, dto => dto.Thumbnail);
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.Id), nameof(NodeDto.NodeId));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.CreateDate), nameof(NodeDto.CreateDate));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.Level), nameof(NodeDto.Level));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.ParentId), nameof(NodeDto.ParentId));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.Path), nameof(NodeDto.Path));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.SortOrder), nameof(NodeDto.SortOrder));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.Name), nameof(NodeDto.Text));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.Trashed), nameof(NodeDto.Trashed));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.Key), nameof(NodeDto.UniqueId));
+            DefineMap<ContentType, NodeDto>(nameof(ContentType.CreatorId), nameof(NodeDto.UserId));
+            DefineMap<ContentType, ContentTypeDto>(nameof(ContentType.Alias), nameof(ContentTypeDto.Alias));
+            DefineMap<ContentType, ContentTypeDto>(nameof(ContentType.AllowedAsRoot), nameof(ContentTypeDto.AllowAtRoot));
+            DefineMap<ContentType, ContentTypeDto>(nameof(ContentType.Description), nameof(ContentTypeDto.Description));
+            DefineMap<ContentType, ContentTypeDto>(nameof(ContentType.Icon), nameof(ContentTypeDto.Icon));
+            DefineMap<ContentType, ContentTypeDto>(nameof(ContentType.IsContainer), nameof(ContentTypeDto.IsContainer));
+            DefineMap<ContentType, ContentTypeDto>(nameof(ContentType.IsElement), nameof(ContentTypeDto.IsElement));
+            DefineMap<ContentType, ContentTypeDto>(nameof(ContentType.Thumbnail), nameof(ContentTypeDto.Thumbnail));
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -12,25 +13,24 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IDataType))]
    public sealed class DataTypeMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public DataTypeMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            CacheMap<DataType, NodeDto>(src => src.Id, dto => dto.NodeId);
-            CacheMap<DataType, NodeDto>(src => src.CreateDate, dto => dto.CreateDate);
-            CacheMap<DataType, NodeDto>(src => src.Level, dto => dto.Level);
-            CacheMap<DataType, NodeDto>(src => src.ParentId, dto => dto.ParentId);
-            CacheMap<DataType, NodeDto>(src => src.Path, dto => dto.Path);
-            CacheMap<DataType, NodeDto>(src => src.SortOrder, dto => dto.SortOrder);
-            CacheMap<DataType, NodeDto>(src => src.Name, dto => dto.Text);
-            CacheMap<DataType, NodeDto>(src => src.Trashed, dto => dto.Trashed);
-            CacheMap<DataType, NodeDto>(src => src.Key, dto => dto.UniqueId);
-            CacheMap<DataType, NodeDto>(src => src.CreatorId, dto => dto.UserId);
-            CacheMap<DataType, DataTypeDto>(src => src.EditorAlias, dto => dto.EditorAlias);
-            CacheMap<DataType, DataTypeDto>(src => src.DatabaseType, dto => dto.DbType);
-
+            DefineMap<DataType, NodeDto>(nameof(DataType.Id), nameof(NodeDto.NodeId));
+            DefineMap<DataType, NodeDto>(nameof(DataType.CreateDate), nameof(NodeDto.CreateDate));
+            DefineMap<DataType, NodeDto>(nameof(DataType.Level), nameof(NodeDto.Level));
+            DefineMap<DataType, NodeDto>(nameof(DataType.ParentId), nameof(NodeDto.ParentId));
+            DefineMap<DataType, NodeDto>(nameof(DataType.Path), nameof(NodeDto.Path));
+            DefineMap<DataType, NodeDto>(nameof(DataType.SortOrder), nameof(NodeDto.SortOrder));
+            DefineMap<DataType, NodeDto>(nameof(DataType.Name), nameof(NodeDto.Text));
+            DefineMap<DataType, NodeDto>(nameof(DataType.Trashed), nameof(NodeDto.Trashed));
+            DefineMap<DataType, NodeDto>(nameof(DataType.Key), nameof(NodeDto.UniqueId));
+            DefineMap<DataType, NodeDto>(nameof(DataType.CreatorId), nameof(NodeDto.UserId));
+            DefineMap<DataType, DataTypeDto>(nameof(DataType.EditorAlias), nameof(DataTypeDto.EditorAlias));
+            DefineMap<DataType, DataTypeDto>(nameof(DataType.DatabaseType), nameof(DataTypeDto.DbType));
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -12,16 +13,16 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IDictionaryItem))]
    public sealed class DictionaryMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public DictionaryMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            CacheMap<DictionaryItem, DictionaryDto>(src => src.Id, dto => dto.PrimaryKey);
-            CacheMap<DictionaryItem, DictionaryDto>(src => src.Key, dto => dto.UniqueId);
-            CacheMap<DictionaryItem, DictionaryDto>(src => src.ItemKey, dto => dto.Key);
-            CacheMap<DictionaryItem, DictionaryDto>(src => src.ParentId, dto => dto.Parent);
+            DefineMap<DictionaryItem, DictionaryDto>(nameof(DictionaryItem.Id), nameof(DictionaryDto.PrimaryKey));
+            DefineMap<DictionaryItem, DictionaryDto>(nameof(DictionaryItem.Key), nameof(DictionaryDto.UniqueId));
+            DefineMap<DictionaryItem, DictionaryDto>(nameof(DictionaryItem.ItemKey), nameof(DictionaryDto.Key));
+            DefineMap<DictionaryItem, DictionaryDto>(nameof(DictionaryItem.ParentId), nameof(DictionaryDto.Parent));
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -12,16 +13,16 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(IDictionaryTranslation))]
    public sealed class DictionaryTranslationMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public DictionaryTranslationMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            CacheMap<DictionaryTranslation, LanguageTextDto>(src => src.Id, dto => dto.PrimaryKey);
-            CacheMap<DictionaryTranslation, LanguageTextDto>(src => src.Key, dto => dto.UniqueId);
-            CacheMap<DictionaryTranslation, LanguageTextDto>(src => src.Language, dto => dto.LanguageId);
-            CacheMap<DictionaryTranslation, LanguageTextDto>(src => src.Value, dto => dto.Value);
+            DefineMap<DictionaryTranslation, LanguageTextDto>(nameof(DictionaryTranslation.Id), nameof(LanguageTextDto.PrimaryKey));
+            DefineMap<DictionaryTranslation, LanguageTextDto>(nameof(DictionaryTranslation.Key), nameof(LanguageTextDto.UniqueId));
+            DefineMap<DictionaryTranslation, LanguageTextDto>(nameof(DictionaryTranslation.Language), nameof(LanguageTextDto.LanguageId));
+            DefineMap<DictionaryTranslation, LanguageTextDto>(nameof(DictionaryTranslation.Value), nameof(LanguageTextDto.Value));
        }
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Concurrent;
+using System;
+using System.Collections.Concurrent;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;

@@ -8,16 +9,16 @@ namespace Umbraco.Core.Persistence.Mappers
    [MapperFor(typeof(UmbracoDomain))]
    public sealed class DomainMapper : BaseMapper
    {
-        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+        public DomainMapper(Lazy<ISqlContext> sqlContext, ConcurrentDictionary<Type, ConcurrentDictionary<string, string>> maps)
+            : base(sqlContext, maps)
+        { }

-        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache => PropertyInfoCacheInstance;
-
-        protected override void BuildMap()
+        protected override void DefineMaps()
        {
-            CacheMap<UmbracoDomain, DomainDto>(src => src.Id, dto => dto.Id);
-            CacheMap<UmbracoDomain, DomainDto>(src => src.RootContentId, dto => dto.RootStructureId);
-            CacheMap<UmbracoDomain, DomainDto>(src => src.LanguageId, dto => dto.DefaultLanguage);
-            CacheMap<UmbracoDomain, DomainDto>(src => src.DomainName, dto => dto.DomainName);
+            DefineMap<UmbracoDomain, DomainDto>(nameof(UmbracoDomain.Id), nameof(DomainDto.Id));
+            DefineMap<UmbracoDomain, DomainDto>(nameof(UmbracoDomain.RootContentId), nameof(DomainDto.RootStructureId));
+            DefineMap<UmbracoDomain, DomainDto>(nameof(UmbracoDomain.LanguageId), nameof(DomainDto.DefaultLanguage));
+            DefineMap<UmbracoDomain, DomainDto>(nameof(UmbracoDomain.DomainName), nameof(DomainDto.DomainName));
        }
    }
 }
--- a/Show More
+++ b/Show More