Grid 2: All current tests pass! \o/

Merge branch 'temp8-grid2-extended' into temp8-grid2
Grid 2: UniqueIDs on rows and items for events.
2018-05-22 10:47:33 +02:00 · 2018-05-21 18:31:57 +02:00 · 2018-05-21 18:30:03 +02:00 · 2018-05-21 16:50:23 +02:00 · 2018-05-21 16:32:13 +02:00 · 2018-05-21 15:55:15 +02:00
3902 changed files with 405806 additions and 306156 deletions
@@ -8,7 +8,7 @@ root = true
 # Use 4 spaces as indentation
 [*]
 insert_final_newline = true
-end_of_line = crlf
+end_of_line = lf
 indent_style = space
 indent_size = 4

@@ -27,11 +27,4 @@ dotnet_naming_symbols.private_fields.applicable_kinds           = field
 dotnet_naming_symbols.private_fields.applicable_accessibilities = private

 dotnet_naming_style.prefix_underscore.capitalization = camel_case
-dotnet_naming_style.prefix_underscore.required_prefix = _
-
-# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md
-[*.cs]
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
-csharp_prefer_braces = false : none
+dotnet_naming_style.prefix_underscore.required_prefix = _
@@ -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,32 +0,0 @@
-# Code Of Conduct
- 
-Our informal code of conduct concentrates on the values we, as Umbraco HQ, have set for ourselves and for our community. We expect you to be a friend. 
-Instead of listing out all the exact "do's" and "don't's" we want to challenge you to think about our values and apply them:
-
-If there's a need to talk to Umbraco HQ about anything, please make sure to send a mail to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
-
-## Be a Friend
-
-We welcome and thank you for registering at Our Umbraco. Find below the values that govern Umbraco and which you accept by using Our Umbraco.
-
-## Trust
-
-Assume positive intent and try to understand before being understood.
-
-## Respect
-
-Treat others as you would like to be treated.
-
-This also goes for treating the HQ with respect. For example: don’t promote products on [our.umbraco.com](https://our.umbraco.com) that directly compete with our commercial offerings which enables us to work for a sustainable Umbraco.
-
-## Open
-
-Be honest and straightforward. Tell it as it is. Share thoughts and knowledge and engage in collaboration.
-
-## Hungry
-
-Don't rest on your laurels and never accept the status quo. Contribute and give back to fellow Umbracians.
-
-## Friendly
-
-Don’t judge upon mistakes made but rather upon the speed and quality with which mistakes are corrected. Friendly posts and contributions generate smiles and builds long lasting relationships.
@@ -1,97 +0,0 @@
-_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!
@@ -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.  
@@ -1,66 +0,0 @@
---
-name: 🐛 Bug Report
-about: File a bug report, if you've discovered a problem in Umbraco.
---
-
-A brief description of the issue goes here.
-
-<!--
-
-If you haven't yet done so, please read the "contributing guidelines"
-thoroughly. Then, proceed by filling out the rest of the details in the issue
-template below. The more details you can give us, the easier it will be for us
-to determine the cause of a problem.
-
-See: https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md
-
-->
-
-
-
-Reproduction
------------
-
-If you're filing a bug, please describe how to reproduce it. Include as much
-relevant information as possible, such as:
-
-### Bug summary
-
-<!--
-    * Write a short summary of the bug
-    * Try to pinpoint it as much as possible
-    * Try to state the _actual problem_, and not just what you _think_ the
-      solution might be.
-->
-
-### Specifics
-
-<!--
-    * Mention the URL where this bug occurs, if applicable
-    * What version of Umbraco are you using (down to the very last digit!)
-    * What browser and version you are using
-    * Please mention if you've checked it in other browsers as well
-    * Please include *full error messages* and *screenshots* if possible
-->
-
-### Steps to reproduce
-
-<!--
-    * Clearly mention the steps to reproduce the bug
-->
-
-### Expected result
-
-<!--
-    * What did you _expect_ that would happen on your Umbraco site?
-    * Describe the intended/desired outcome after you did the steps mentioned.
-->
-
-### Actual result
-
-<!--
-    * What is the actual result of the above steps?
-    * Describe the behaviour of the bug
-    * Please, please include **error messages** and screenshots. They might mean
-      nothing to you, but they are _very_ helpful to us.
-->
@@ -1,31 +0,0 @@
---
-name:  📮 Feature Request
-about: Open a feature request, if you want to propose a new feature.
---
-
-A brief description of your feature request goes here.
-
-
-<!--
-If you want to discuss the feature you're imagining, please make sure to keep
-those discussions on the forum at https://our.umbraco.com/ (choose the
-category "Contributing to Umbraco", Umbraco HQ follows all new topics there).
-
-Once you've come to a conclusion in the discussion, feel free to propose the
-new feature here. 
-->
-
-How can you help?
-------------------------------
-
-<!--
-The resources (read: available time and effort) of Umbraco's core team are
-limited.
-
-If we can not work on your suggestion, please don't take it personally. Most
-likely, it's either:
-
- - We think your idea is valid, but we can't find the time to work on it.
- - Your idea might be better suited as a package, if it's not suitable for
-   the majority of users.
-->
@@ -1,9 +0,0 @@
---
-name: ⁉️ Support Question
-about: Having trouble with Umbraco? -> https://our.umbraco.com
---
-
-This issue tracker is NOT meant for support questions. If you have a question,
-please join us on the forum at https://our.umbraco.com.
-
-Thanks!
@@ -1,9 +0,0 @@
---
-name: 📖 Documentation Issue
-about: See https://github.com/umbraco/UmbracoDocs/issues for documentation issues
---
-
-The Umbraco documentation has its own dedicated repository. Please open your
-documentation-related issue at https://github.com/umbraco/UmbracoDocs/issues
-
-Thanks!
@@ -1,31 +0,0 @@
---
-name: 🔐 Security Issue
-about: Discovered a Security Issue in Umbraco?
---
-
-⚠️ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
-
-If you have found a security issue in Umbraco, please send the details to
-security@umbraco.com and don't disclose it publicly until we can provide a fix for
-it. If you wish, we'll credit you for finding verified issues, when we release
-the patched version.
-
-❗ Please read more about how to report security issues on https://umbraco.com/security
-
-A note on "Self XSS"
--------------------
-
-Umbraco is a CMS, that allows users to edit content on a website. As such,
-all _authenticated users_ can:
-
- - Edit content, and (depending on the field types) insert HTML and CSS in that
-   content, with a variety of allowed attributes.
- - Depending on the user level: Edit template files, and insert C#, HTML, CSS and
-   javascript in so on.
- - Upload files to the site, which will become publicly available.
-
-We see these functionalities as _features_, and not as security issues. Please
-report the mentioned items only if they can be performed by non-authorized
-users, or other exploitable vulnerabilities.
-
-Thanks!
@@ -1,12 +0,0 @@
-### Prerequisites
-
- [ ] 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! -->
-
-### Description
-<!-- A description of the changes proposed in the pull-request and how to test these changes -->
-
-
-
-<!-- Thanks for contributing to Umbraco CMS! -->
@@ -1,61 +0,0 @@
-_You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
-
-_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 seperate 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).
@@ -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, npm and bower 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.
-
@@ -13,6 +13,7 @@
 *.suo
 *.vs10x
 *.ndproj
+*.log

 # common directories
 .DS_Store
@@ -70,7 +71,7 @@ umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
 src/Umbraco.Tests/config/applications.config
 src/Umbraco.Tests/config/trees.config
 src/Umbraco.Web.UI/web.config
-src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config
+src/Umbraco.Web.UI/Config/ClientDependency.config
 src/Umbraco.Tests/config/404handlers.config
 src/Umbraco.Web.UI/[Vv]iews/*.cshtml
 src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
@@ -87,15 +88,18 @@ lib-bower

 src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/*.loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
 src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js

 src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
 src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
@@ -107,23 +111,28 @@ src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
 src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/

 src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-src/Umbraco.Web.UI.Client/vwd.webinfo

 src/Umbraco.Web.UI/App_Plugins/*
 src/*.psess
 src/*.vspx
-
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
 NDependOut/*
 QueryResult.htm

+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
+
 src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
 src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
-src/Umbraco.Web.UI/[Uu]mbraco/plugins/*
+src/Umbraco.Web.UI/umbraco/plugins/*
+src/Umbraco.Web.UI/umbraco/js/init.js
 build/ApiDocs/*
 build/ApiDocs/Output/*
 src/Umbraco.Web.UI.Client/bower_components/*
-/src/Umbraco.Web.UI/[Uu]mbraco/preview
-/src/Umbraco.Web.UI/[Uu]mbraco/preview.old
+/src/Umbraco.Web.UI/Umbraco/preview
+/src/Umbraco.Web.UI/Umbraco/preview.old

 # ignore rule for clearing out Belle (avoid rebuilding all the time)
 preserve.belle
@@ -131,11 +140,16 @@ preserve.belle
 #Ignore Rule for output of generated documentation files from Grunt docserve
 src/Umbraco.Web.UI.Client/docs/api
 src/*.boltdata/
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
+/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
 src/umbraco.sln.ide/*
 src/.vs/
-
-src/Umbraco.Web.UI/[Jj]s/*
-src/Umbraco.Tests/[Mm]edia
+src/Umbraco.Web.UI/umbraco/js/install.loader.js
+src/Umbraco.Web.UI/js/*
+src/Umbraco.Tests/media
 tools/docfx/*
 apidocs/_site/*
 src/*/project.lock.json
@@ -156,4 +170,4 @@ build/temp/



-# eof
+# eof
@@ -0,0 +1,80 @@
+# Code of Conduct
+
+## 1. Purpose
+
+A primary goal of Umbraco CMS is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+
+This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+We invite all those who participate in Umbraco CMS to help us create safe and positive experiences for everyone.
+
+## 2. Open Source Citizenship
+
+A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
+
+Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
+
+If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
+
+## 3. Expected Behavior
+
+The following behaviors are expected and requested of all community members:
+
+*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+*   Exercise consideration and respect in your speech and actions.
+*   Attempt collaboration before conflict.
+*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
+*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
+*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
+
+## 4. Unacceptable Behavior
+
+The following behaviors are considered harassment and are unacceptable within our community:
+
+*   Violence, threats of violence or violent language directed against another person.
+*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
+*   Posting or displaying sexually explicit or violent material.
+*   Posting or threatening to post other people’s personally identifying information ("doxing").
+*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+*   Inappropriate photography or recording.
+*   Inappropriate physical contact. You should have someone’s consent before touching them.
+*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
+*   Deliberate intimidation, stalking or following (online or in person).
+*   Advocating for, or encouraging, any of the above behavior.
+*   Sustained disruption of community events, including talks and presentations.
+
+## 5. Consequences of Unacceptable Behavior
+
+Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
+
+Anyone asked to stop unacceptable behavior is expected to comply immediately.
+
+If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
+
+## 6. Reporting Guidelines
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. Please contact Sebastiaan Janssen - [sj@umbraco.dk](mailto:sj@umbraco.dk).
+
+Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
+
+## 7. Addressing Grievances
+
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Umbraco with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
+
+## 8. Scope
+
+We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
+
+This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
+
+## 9. Contact info
+
+Sebastiaan Janssen - [sj@umbraco.dk](mailto:sj@umbraco.dk)
+
+## 10. License and attribution
+
+This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
+
+Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
+
+Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)
@@ -1,11 +1,19 @@
-# Contributing in detail
+# Contributing to Umbraco CMS

-There's more than one way to contribute to Umbraco, there's some more suggestions below.
+👍🎉 First off, thanks for taking the time to contribute! 🎉👍

-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.
+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 💖. 

 #### Table Of Contents

+__[Quick start guide for Umbraco v8](https://github.com/umbraco/Umbraco-CMS/blob/temp8/V8_GETTING_STARTED.md)__
+
+[Code of Conduct](#code-of-conduct)
+
 [How Can I Contribute?](#how-can-i-contribute)
  * [Reporting Bugs](#reporting-bugs)
  * [Suggesting Enhancements](#suggesting-enhancements)
@@ -19,24 +27,34 @@ When contributing code to Umbraco there's plenty of things you'll want to know,
  * [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 do I even begin?](#how-do-i-even-begin)
+
+[Problems?](#problems)
+
+[Credits](#credits)
+
+## 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).

 ## 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.
+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](http://issues.umbraco.org/issues#newissue=61-30118), 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.
+  * Most importantly, check **if you can reproduce the problem** in the [latest version of Umbraco](https://our.umbraco.org/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:
+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 question 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.
@@ -52,24 +70,26 @@ Provide more context by answering these questions:

 Include details about your configuration and environment:

-  * **Which version of Umbraco are you using?**
+  * **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 🔎.
+This section guides you through submitting an enhancement suggestion for Atom, 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/).
+  * **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.org/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).
+Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` and issues](http://issues.umbraco.org/issues/U4?q=%28project%3A+%7BU4%7D+Difficulty%3A+%7BVery+Easy%7D+%23Easy+%23Unresolved+Priority%3A+Normal+%23Major+%23Show-stopper+State%3A+-%7BIn+Progress%7D+sort+by%3A+votes+Affected+versions%3A+-6.*+Affected+versions%3A+-4.*%29+OR+%28tag%3A+%7BUp+For+Grabs%7D+%23Unresolved+%29).
+
+The issue list is sorted by total number of upvotes. While not perfect, number of upvotes is a reasonable proxy for impact a given change will have.

 ### Pull Requests

@@ -78,19 +98,15 @@ 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
+  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.org/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!
+Again, these are guidelines, not strict requirements. 

 ## 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.
+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?

@@ -114,28 +130,22 @@ There's two big areas that you should know about:

 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/)
+  * [The AngularJS based backoffice files](https://our.umbraco.org/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
+  * [The rest](https://our.umbraco.org/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)
+![What branch do you want me to target?](tools/contributing/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.
+Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 ([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)
+![Gulp build in Visual Studio](tools/contributing/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.

@@ -161,3 +171,39 @@ 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))
+
+## How do I even 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](tools/contributing/forkrepository.png)
+
+  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
+  
+  ![Clone the fork](tools/contributing/clonefork.png)
+
+  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](#building-umbraco-from-source-code)
+  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will happily give feedback
+  * **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-U4-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `U4-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](tools/contributing/createpullrequest.png)
+
+The Umbraco development 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.
+
+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!
+
+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 at this and we'll be nice about it, thanking you for spending your valueable time.
+
+Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you send us a PR, your PR will not be closed as unwanted.
+
+## Problems?
+
+Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.org/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely!
+
+## 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!
@@ -1,6 +1,6 @@
 # The MIT License (MIT) #

-Copyright (c) 2013-present Umbraco
+Copyright (c) 2013 Umbraco

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

@@ -0,0 +1,11 @@
+### Prerequisites
+
+- [ ] I have written a descriptive pull-request title
+- [ ] I have linked this PR to an issue on the tracker at http://issues.umbraco.org
+
+### Description
+<!-- A description of the changes proposed in the pull-request -->
+
+
+
+<!-- Thanks for contributing to Umbraco CMS! -->
@@ -0,0 +1,49 @@
+_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](https://github.com/umbraco/Umbraco-CMS/blob/temp8/V8_GETTING_STARTED.md).__
+
+Umbraco CMS
+===========
+The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
+
+[![ScreenShot](vimeo.png)](https://vimeo.com/172382998/)
+
+## Umbraco CMS
+Umbraco is a free open source Content Management System built on the ASP.NET platform. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
+
+## Watch an introduction video
+
+[![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
+
+## Umbraco - The Friendly CMS
+
+For the first time on the Microsoft platform, there is a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. 
+
+Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
+
+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 scales. 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/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
+
+## Why Open Source?
+As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible and community contributions and packages are available for all to use.
+
+## Trying out Umbraco CMS
+
+[Umbraco Cloud](https://umbraco.com) is the easiest and fastest way to use Umbraco yet with full support for all your custom .NET code and intergrations. 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.org/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 yourself and handling deployments and upgrades is all down to you.
+
+## Community
+
+Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.org). Our Umbraco feature 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](https://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+
+To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).
@@ -0,0 +1,30 @@
+## 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... 
+* .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 and ensure you have the `temp8` branch checked out
+
+### 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, npm and bower 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
+* Your all set!
+
+### Making code changes
+
+* _The process for making code changes in v8 is the same as v7_
+* 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
+
+### 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](http://issues.umbraco.org/issues/U4?q=Due+in+version%3A+8.0.0+%23Unresolved+). 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.
+
@@ -0,0 +1,63 @@
+@ECHO OFF
+SETLOCAL
+REM SETLOCAL is on, so changes to the path not persist to the actual user's path
+
+git.exe --version
+IF %ERRORLEVEL%==9009 GOTO :trydefaultpath
+REM OK, DONE
+GOTO :EOF
+
+:trydefaultpath
+PATH=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
+git.exe --version
+IF %ERRORLEVEL%==9009 GOTO :showerror
+REM OK, DONE
+GOTO :EOF
+
+:showerror
+ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\cmd nor in C:\Program Files\Git\cmd
+SET /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
+IF %install%==y (
+	:: Create a temporary batch file to execute either after elevating to admin or as-is when the user is already admin
+	ECHO @ECHO OFF > "%temp%\ChocoInstallGit.cmd"
+	ECHO SETLOCAL >> "%temp%\ChocoInstallGit.cmd"
+	ECHO ECHO Installing Chocolatey first >> "%temp%\ChocoInstallGit.cmd"
+	ECHO @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" >> "%temp%\ChocoInstallGit.cmd"
+	ECHO SET PATH=%%PATH%%;%%ALLUSERSPROFILE%%\chocolatey\bin >> "%temp%\ChocoInstallGit.cmd"
+	ECHO choco install git -y >> "%temp%\ChocoInstallGit.cmd"
+	
+	GOTO :installgit
+) ELSE (
+	GOTO :cantcontinue
+)
+
+:cantcontinue
+ECHO Can't complete the build without Git being in the path. Please add it to be able to continue.
+GOTO :EOF
+
+:installgit
+pushd %~dp0
+    :: Running prompt elevated
+
+:: --> Check for permissions
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+
+:: --> If error flag set, we do not have admin.
+IF '%errorlevel%' NEQ '0' (
+    GOTO UACPrompt
+) ELSE ( GOTO gotAdmin )
+
+:UACPrompt
+    ECHO You're not currently running this with admin privileges, we'll now try to execute the install of Git through Chocolatey after elevating to admin privileges
+    ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    ECHO UAC.ShellExecute "%temp%\ChocoInstallGit.cmd", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+	
+    "%temp%\getadmin.vbs"
+    EXIT /B
+	
+:gotAdmin
+    IF EXIST "%temp%\getadmin.vbs" ( DEL "%temp%\getadmin.vbs" )
+    pushd "%CD%"
+    CD /D "%~dp0"
+	
+    CALL "%temp%\ChocoInstallGit.cmd"
@@ -1,56 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="3.4.4">
-        <id>UmbracoCms.Core</id>
-        <version>8.0.0</version>
-        <title>Umbraco Cms Core Binaries</title>
-        <authors>Umbraco HQ</authors>
-        <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
-        <language>en-US</language>
-        <tags>umbraco</tags>
-        <dependencies>
-            <!--
-              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-              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="[7.0.1,7.999999)" />
-            <dependency id="LightInject" version="[5.1.2,5.999999)" />
-            <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
-            <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
-            <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
-            <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.6,5.999999)" />
-            <dependency id="Microsoft.Owin" version="[4.0.0,4.999999)" />
-            <dependency id="MiniProfiler" version="[3.2.0.157,3.999999)" />
-            <dependency id="MySql.Data" version="[6.10.7,6.999999)" />
-            <dependency id="Newtonsoft.Json" version="[11.0.2,11.999999)" />
-            <dependency id="Semver" version="[2.0.4,2.999999)" />
-            <dependency id="Serilog" version="[2.7.1,2.999999)" />
-            <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
-            <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
-            <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
-            <dependency id="Serilog.Formatting.Compact" version="[1.0.0,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="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
-            <dependency id="NPoco" version="[3.9.4,3.999999)" />
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />
+  <metadata minClientVersion="3.4.4">
+    <id>UmbracoCms.Core</id>
+    <version>8.0.0</version>
+    <title>Umbraco Cms Core Binaries</title>
+    <authors>Umbraco HQ</authors>
+    <owners>Umbraco HQ</owners>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>http://umbraco.com/</projectUrl>
+    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms-package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
+    <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
+    <language>en-US</language>
+    <tags>umbraco</tags>
+    <dependencies>
+      <dependency id="AutoMapper" version="[6.2.2,6.666666)" />
+      <dependency id="ClientDependency" version="[1.9.6,1.666666)" />
+      <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.666666)" />
+      <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.666666)" />
+      <dependency id="Examine" version="[1.0.0-beta025,1.666666)" />
+      <dependency id="HtmlAgilityPack" version="[1.7.2,1.666666)" />
+      <dependency id="ImageProcessor" version="[2.6.1.19,2.666666)" />
+      <dependency id="ImageProcessor.Web" version="[4.9.2.19,4.666666)" />
+      <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.666666)" />
+      <dependency id="LightInject" version="[5.1.2,5.666666)" />
+      <dependency id="LightInject.Annotation" version="[1.1.0,1.666666)" />
+      <dependency id="LightInject.Mvc" version="[2.0.0,2.666666)" />
+      <dependency id="LightInject.WebApi" version="[2.0.0,2.666666)" />
+      <dependency id="log4net" version="[2.0.8,2.666666)" />
+      <dependency id="Log4Net.Async" version="[2.0.4,2.666666)" />
+      <dependency id="Lucene.Net.Contrib" version="[3.0.3,3.666666)" />
+      <dependency id="Markdown" version="[2.2.1,2.666666)" />
+      <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.1,2.666666)" />
+      <dependency id="Microsoft.AspNet.Mvc" version="[5.2.6,5.666666)" />
+      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3,2.666666)" />
+      <dependency id="Microsoft.AspNet.WebApi" version="[5.2.6,5.666666)" />
+      <dependency id="Microsoft.CodeAnalysis.CSharp" version="[2.8.0,2.666666)" />
+      <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[1.0.8,1.666666)" />
+      <dependency id="Microsoft.Net.Compilers" version="[2.8.0,2.666666)" />
+      <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0,4.666666)" />
+      <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0,4.666666)" />
+      <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0,4.666666)" />
+      <dependency id="Microsoft.Web.Xdt" version="[2.1.2,2.666666)" />
+      <dependency id="MiniProfiler" version="[3.2.0.157,3.666666)" />
+      <dependency id="MySql.Data" version="[6.10.7,6.666666)" />
+      <dependency id="Newtonsoft.Json" version="[11.0.2,11.666666)" />
+      <dependency id="NPoco" version="[3.9.3,3.666666)" />
+      <dependency id="Semver" version="[2.0.4,2.666666)" />
+      <dependency id="System.Reflection.Metadata" version="[1.5.0,1.666666)" />
+      <dependency id="System.Reflection.Primitives" version="[4.3.0,4.666666)" />
+      <dependency id="System.Runtime.Handles" version="[4.3.0,4.666666)" />
+      <dependency id="System.Security.Cryptography.Algorithms" version="[4.3.1,4.666666)" />
+      <dependency id="System.Security.Cryptography.X509Certificates" version="[4.3.2,4.666666)" />
+      <dependency id="System.Text.Encoding.CodePages" version="[4.4.0,4.666666)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.666666)" />
+      <dependency id="System.ValueTuple" version="[4.4.0,4.666666)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.18,8.666666)" />
+      <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.666666)" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />

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

-        <!-- 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>
+    <file src="tools\install.core.ps1" target="tools\install.ps1" />
+
+    <!-- symbols -->
+    <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
+    <file src="$BuildTmp$\..\src\Umbraco.Core\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
+    <file src="$BuildTmp$\bin\Umbraco.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.Web.UI.pdb" target="lib" />
+    <file src="$BuildTmp$\..\src\Umbraco.Web.UI\**\*.cs" exclude="$BuildTmp$\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web.UI" />
+    <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>
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="3.4.4">
-        <id>UmbracoCms.Web</id>
-        <version>8.0.0</version>
-        <title>Umbraco Cms Core Binaries</title>
-        <authors>Umbraco HQ</authors>
-        <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
-        <language>en-US</language>
-        <tags>umbraco</tags>
-        <dependencies> 
-            <!--
-              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-              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="UmbracoCms.Core" version="[$version$]" />
-            <dependency id="AutoMapper" version="[7.0.1,7.999999)" />
-            <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
-            <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
-            <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-            <dependency id="Examine" version="[1.0.0-beta067,1.999999)" />
-            <dependency id="HtmlAgilityPack" version="[1.8.9,1.999999)" />
-            <dependency id="ImageProcessor" version="[2.6.2.25,2.999999)" />
-            <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
-            <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
-            <dependency id="Markdown" version="[2.2.1,2.999999)" />
-            <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
-            <dependency id="Microsoft.AspNet.Mvc" version="[5.2.6,5.999999)" />
-            <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3,2.999999)" />
-            <dependency id="Microsoft.AspNet.WebApi" version="[5.2.6,5.999999)" />
-            <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.0,4.999999)" />
-            <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.0,4.999999)" />
-            <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.0,4.999999)" />
-            <dependency id="System.Threading.Tasks.Dataflow" version="[4.8.0,4.999999)" />
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
-
-        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\Umbraco.Web.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\Umbraco.Examine.xml" />
-
-        <!-- 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>
@@ -1,65 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="3.4.4">
-        <id>UmbracoCms</id>
-        <version>8.0.0</version>
-        <title>Umbraco Cms</title>
-        <authors>Umbraco HQ</authors>
-        <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
-        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
-        <language>en-US</language>
-        <tags>umbraco</tags>
-        <dependencies>
-            <dependency id="UmbracoCms.Web" version="[$version$]" />
-            <!--
-              note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-              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="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 2.999999)" />
-            <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.0-alpha.29]" />
-            <dependency id="ImageProcessor.Web" version="[4.9.3.25,4.999999)" />
-            <dependency id="ImageProcessor.Web.Config" version="[2.4.1.19,2.999999)" />
-            <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
-            <dependency id="Microsoft.Net.Compilers" version="[2.10.0,2.999999)" />
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- files -->
-        <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
-        <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
-        <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
-        <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
-        <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
-        <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
+  <metadata minClientVersion="3.4.4">
+    <id>UmbracoCms</id>
+    <version>8.0.0</version>
+    <title>Umbraco Cms</title>
+    <authors>Umbraco HQ</authors>
+    <owners>Umbraco HQ</owners>
+    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <projectUrl>http://umbraco.com/</projectUrl>
+    <iconUrl>http://umbraco.com/media/357769/100px_transparent.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
+    <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
+    <language>en-US</language>
+    <tags>umbraco</tags>
+    <dependencies>
+      <dependency id="UmbracoCms.Core" version="[$version$]" />
+      <dependency id="Umbraco.ModelsBuilder" version="[8.0.0-alpha.18, 9.0.0)" />
+      <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.3, 3.0.0)" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
+    <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
+    <file src="$BuildTmp$\WebApp\default.aspx" target="Content\default.aspx" />
+    <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
+    <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
+    <file src="$BuildTmp$\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
+    <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+    <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
+    <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
+    <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
+    <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />

-        <!-- these files are copied by install.ps1 -->
-        <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-        <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-        <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+    <file src="tools\install.ps1" target="tools\install.ps1" />
+    <file src="tools\Readme.txt" target="tools\Readme.txt" />
+    <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
+    <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
+    <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
+    <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
+    <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
+    <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
+    <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
+    <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />

-        <!-- tools -->
-        <!-- beware! install.ps1 not supported by PackageReference -->
-        <file src="tools\install.ps1" target="tools\install.ps1" />
-        <file src="tools\Readme.txt" target="tools\Readme.txt" />
-        <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
-
-        <!-- 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\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
-        <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
-        <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />
-        <file src="tools\trees.config.install.xdt" target="Content\config\trees.config.install.xdt" />
-        <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
-        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME Content\ !! and then... transform?! -->
-
-        <!-- UmbracoCms props and targets -->
-        <file src="build\**" target="build" />
-    </files>
+    <file src="build\**" target="build" />
+  </files>
 </package>
@@ -47,6 +47,9 @@
      <CustomFilesToInclude Include=".\umbraco\**\*">
        <Dir>umbraco</Dir>
      </CustomFilesToInclude>
+      <CustomFilesToInclude Include=".\umbraco_client\**\*">
+        <Dir>umbraco_client</Dir>
+      </CustomFilesToInclude>
      <CustomFilesToInclude Include=".\Global.asax">
        <Dir>.</Dir>
      </CustomFilesToInclude>
@@ -3,7 +3,7 @@
  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Welcome"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
-      <control panelCaption="" xdt:Transform="InsertIfMissing">
+      <control showOnce="true" addPanel="true" panelCaption="" xdt:Transform="InsertIfMissing">
        views/dashboard/settings/settingsdashboardintro.html
      </control>
    </tab>
@@ -14,7 +14,7 @@
      <area>forms</area>
    </areas>
    <tab caption="Install Umbraco Forms">
-      <control panelCaption="">
+      <control showOnce="true" addPanel="true" panelCaption="">
        views/dashboard/forms/formsdashboardintro.html
      </control>
    </tab>
@@ -28,7 +28,7 @@
  
  <section alias="StartupDeveloperDashboardSection">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
-      <control panelCaption="">
+      <control showOnce="true" addPanel="true" panelCaption="">
        views/dashboard/developer/developerdashboardvideos.html
      </control>
    </tab>
@@ -47,7 +47,7 @@
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="Replace">
-      <control panelCaption="">
+      <control showOnce="false" addPanel="false" panelCaption="">
        views/dashboard/media/mediafolderbrowser.html
      </control>
    </tab>
@@ -56,7 +56,7 @@
  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Get Started" xdt:Transform="Insert">
-      <control panelCaption="">
+      <control showOnce="true" addPanel="true" panelCaption="">
        views/dashboard/members/membersdashboardvideos.html
      </control>
    </tab>
@@ -92,4 +92,4 @@
      </control>
    </tab>
  </section>
-</dashBoard>
+</dashBoard>
@@ -1,26 +1,26 @@
-
-  _    _ __  __ ____  _____           _____ ____
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \
- | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
- | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
- | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/
-
----------------------------------------------------
-
-Don't forget to build!
-
-
-When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config
-file (and config files in the config folder).
-
-This NuGet package includes build targets that extend the creation of a deploy package, which is generated by
-Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
-Publish this won't affect you.
-The following items will now be automatically included when creating a deploy package or publishing to the file
-system: umbraco, config\splashes and global.asax.
-
-Please read the release notes on our.umbraco.com:
-https://our.umbraco.com/download/releases
-
- Umbraco
+
+  _    _ __  __ ____  _____           _____ ____  
+ | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
+ | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
+ | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
+ | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
+  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
+                                                   
+----------------------------------------------------
+
+Don't forget to build!
+
+
+When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
+file (and config files in the config folder). 
+
+This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 
+Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
+Publish this won't affect you.
+The following items will now be automatically included when creating a deploy package or publishing to the file 
+system: umbraco, umbraco_client, config\splashes and global.asax.
+
+Please read the release notes on our.umbraco.org:
+http://our.umbraco.org/contribute/releases
+
+- Umbraco
@@ -1,30 +1,39 @@

-  _    _ __  __ ____  _____           _____ ____
- | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \
+  _    _ __  __ ____  _____           _____ ____  
+ | |  | |  \/  |  _ \|  __ \    /\   / ____/ __ \ 
 | |  | | \  / | |_) | |__) |  /  \ | |   | |  | |
 | |  | | |\/| |  _ <|  _  /  / /\ \| |   | |  | |
 | |__| | |  | | |_) | | \ \ / ____ | |___| |__| |
-  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/
-
+  \____/|_|  |_|____/|_|  \_/_/    \_\_____\____/ 
+                                                   
 ----------------------------------------------------

+*** IMPORTANT NOTICE FOR UPGRADES FROM VERSIONS BELOW 7.7.0 ***
+
+Be sure to read the version specific upgrade information before proceeding:
+https://our.umbraco.org/documentation/Getting-Started/Setup/Upgrading/version-specific#version-7-7-0
+
+Depending on the version you are upgrading from, you may need to make some changes to your web.config
+and you will need to be aware of the breaking changes listed there to see if these affect your installation.
+
+
 Don't forget to build!

 We've done our best to transform your configuration files but in case something is not quite right: remember we
 backed up your files in App_Data\NuGetBackup so you can find the original files before they were transformed.

-We've overwritten all the files in the Umbraco folder, these have been backed up in
-App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or
-a package might have added. Only the existing files were overwritten. If you customized anything then make
+We've overwritten all the files in the Umbraco and Umbraco_Client folder, these have been backed up in 
+App_Data\NuGetBackup. We didn't overwrite the UI.xml file nor did we remove any files or folders that you or 
+a package might have added. Only the existing files were overwritten. If you customized anything then make 
 sure to do a compare and merge with the NuGetBackup folder.

-This NuGet package includes build targets that extend the creation of a deploy package, which is generated by
+This NuGet package includes build targets that extend the creation of a deploy package, which is generated by 
 Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
 Publish this won't affect you.
-The following items will now be automatically included when creating a deploy package or publishing to the file
-system: umbraco, config\splashes and global.asax.
+The following items will now be automatically included when creating a deploy package or publishing to the file 
+system: umbraco, umbraco_client, config\splashes and global.asax.

-Please read the release notes on our.umbraco.com:
-http://our.umbraco.com/contribute/releases
+Please read the release notes on our.umbraco.org:
+http://our.umbraco.org/contribute/releases

- Umbraco
+- Umbraco
@@ -1,32 +1,42 @@
 <?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-    <configSections>
-        <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)">
-            <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
-            <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
-        </sectionGroup>
-    </configSections>
-
-    <system.web.webPages.razor>
-        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(factoryType)" xdt:Transform="SetAttributes(factoryType)" />
-        <pages pageBaseType="System.Web.Mvc.WebViewPage">
-            <namespaces>
-                <add namespace="Umbraco.Web.PublishedContentModels" xdt:Transform="InsertIfMissing" />
-            </namespaces>
-        </pages>
-    </system.web.webPages.razor>
-
-    <system.web>
-        <pages
-          pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-          pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-          userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)"
-        xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
-            <controls>
-                <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" xdt:Locator="Match(namespace)" xdt:Transform="SetAttributes(assembly)" />
-            </controls>
-        </pages>
-    </system.web>
-
-</configuration>
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)">
+      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(name)" 
+		xdt:Transform="SetAttributes(type)" />
+    </sectionGroup>
+  </configSections>
+  
+  <system.web.webPages.razor>
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+		xdt:Locator="Match(factoryType)" 
+		xdt:Transform="SetAttributes(factoryType)" />
+    <pages pageBaseType="System.Web.Mvc.WebViewPage">
+      <namespaces>
+		<add namespace="Umbraco.Web.PublishedContentModels" xdt:Transform="InsertIfMissing" />        
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor>
+  
+  <system.web>
+      <pages
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+			xdt:Locator="Match(pageParserFilterType,pageBaseType,userControlBaseType)" 
+			xdt:Transform="SetAttributes(pageParserFilterType,pageBaseType,userControlBaseType)">
+      <controls>
+        <add assembly="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" 
+			xdt:Locator="Match(namespace)" 
+			xdt:Transform="SetAttributes(assembly)" />
+      </controls>
+    </pages>
+  </system.web>
+  
+</configuration>
@@ -2,15 +2,17 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
  <configSections xdt:Transform="InsertIfMissing" />
  <configSections>
+    <section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
    <section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
-
+	
    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
      <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
    </sectionGroup>
    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
    <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
      <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+      <section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
@@ -27,12 +29,14 @@

  <umbracoConfiguration xdt:Transform="InsertIfMissing">
    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
    <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
    <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
  </umbracoConfiguration>

  <FileSystemProviders xdt:Transform="Remove" />
+  <BaseRestExtensions xdt:Transform="Remove" />

  <system.data xdt:Transform="InsertIfMissing">
    <DbProviderFactories xdt:Transform="InsertIfMissing">
@@ -57,7 +61,7 @@
    <httpRuntime xdt:Transform="InsertIfMissing" />
    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
    <httpRuntime targetFramework="4.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
-
+    
    <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
    <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
    <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
@@ -88,6 +92,9 @@
      <remove name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
      <remove name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
      <remove name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+      <remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+      <!-- Inserts it as the first element. Also see http://stackoverflow.com/a/19041487/5018 -->
+      <remove name="WebDAVModule" xdt:Locator="Match(name)" xdt:Transform="Insert" />

      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
@@ -150,38 +157,62 @@

  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-        </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.1.0" newVersion="1.5.1.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="System.Data.SqlServerCe" publicKeyToken="89845DCD8080CC91" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.1" newVersion="4.0.0.1"/>
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>

@@ -201,4 +232,4 @@
    </system.webServer>
  </location>

-</configuration>
+</configuration>
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <applications xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <add alias="content" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="media" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="settings" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="developer" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="users" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="member" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
-  <add alias="forms" name="Forms" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing" />
-  <add alias="translation" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon,sortOrder)" />
-</applications>
+  <add alias="content" icon="traycontent" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
+  <add alias="media" icon="traymedia" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
+  <add alias="settings" icon="traysettings" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
+  <add alias="developer" icon="traydeveloper" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
+  <add alias="users" icon="trayusers" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
+  <add alias="member" icon="traymember" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon)" />
+  <add alias="forms" name="Forms" icon="icon-umb-contour" sortOrder="6" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing" />
+  <add alias="translation" icon="traytranslation" sortOrder="7" xdt:Locator="Match(alias)" xdt:Transform="SetAttributes(icon,sortOrder)" />
+</applications>
@@ -33,6 +33,7 @@ if ($project) {
 		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
 		
 		# Delete files Umbraco ships with
+		if(Test-Path $umbracoBinFolder\log4net.dll) { Remove-Item $umbracoBinFolder\log4net.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll) { Remove-Item $umbracoBinFolder\Microsoft.ApplicationBlocks.Data.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll) { Remove-Item $umbracoBinFolder\System.Data.SqlServerCe.Entity.dll -Force -Confirm:$false }
@@ -1,146 +1,162 @@
-param($installPath, $toolsPath, $package, $project)
-
-Write-Host "installPath:" "${installPath}"
-Write-Host "toolsPath:" "${toolsPath}"
-
-Write-Host " "
-
-if ($project) {
-	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
-
-	# Create paths and list them
-	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
-	Write-Host "projectPath:" "${projectPath}"
-	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
-	Write-Host "backupPath:" "${backupPath}"
-	$copyLogsPath = Join-Path $backupPath "CopyLogs"
-	Write-Host "copyLogsPath:" "${copyLogsPath}"	
-	$webConfigSource = Join-Path $projectPath "Web.config"
-	Write-Host "webConfigSource:" "${webConfigSource}"
-	$configFolder = Join-Path $projectPath "Config"
-	Write-Host "configFolder:" "${configFolder}"
-
-	# Create backup folder and logs folder if it doesn't exist yet
-	New-Item -ItemType Directory -Force -Path $backupPath
-	New-Item -ItemType Directory -Force -Path $copyLogsPath
-	
-	# Create a backup of original web.config
-	Copy-Item $webConfigSource $backupPath -Force
-	
-	# Backup config files folder	
-	if(Test-Path $configFolder) {
-		$umbracoBackupPath = Join-Path $backupPath "Config"
-		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
-		
-		robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
-	}
-	
-	# Copy umbraco and umbraco_files from package to project folder
-	$umbracoFolder = Join-Path $projectPath "Umbraco"
-	New-Item -ItemType Directory -Force -Path $umbracoFolder
-	$umbracoFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco"		
-	$umbracoBackupPath = Join-Path $backupPath "Umbraco"
-	New-Item -ItemType Directory -Force -Path $umbracoBackupPath		
-	robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
-	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
-
-	$copyWebconfig = $true
-	$destinationWebConfig = Join-Path $projectPath "Web.config"
-
-	if(Test-Path $destinationWebConfig) 
-	{
-		Try 
-		{
-			[xml]$config = Get-Content $destinationWebConfig
-			
-			$config.configuration.appSettings.ChildNodes | ForEach-Object { 
-				if($_.key -eq "umbracoConfigurationStatus") 
-				{
-					# The web.config has an umbraco-specific appSetting in it
-					# don't overwrite it and let config transforms do their thing
-					$copyWebconfig = $false 
-				}
-			}
-		} 
-		Catch { }
-	}
-	
-	if($copyWebconfig -eq $true) 
-	{
-		$packageWebConfigSource = Join-Path $installPath "UmbracoFiles\Web.config"
-		Copy-Item $packageWebConfigSource $destinationWebConfig -Force
-
-		# Copy files that don't get automatically copied for Website projects
-		# We do this here, when copyWebconfig is true because we only want to do it for new installs
-		# If this is an upgrade then the files should already be there
-		$splashesSource = Join-Path $installPath "UmbracoFiles\Config\splashes\*.*"
-		$splashesDestination = Join-Path $projectPath "Config\splashes\"
-		New-Item $splashesDestination -Type directory
-		Copy-Item $splashesSource $splashesDestination -Force
-        
-		$umbracoUIXMLSource = Join-Path $installPath "UmbracoFiles\Umbraco\Config\Create\UI.xml"
-		$umbracoUIXMLDestination = Join-Path $projectPath "Umbraco\Config\Create\UI.xml"
-		Copy-Item $umbracoUIXMLSource $umbracoUIXMLDestination -Force
-	} else {
-		# This part only runs for upgrades
-	
-		$upgradeViewSource = Join-Path $umbracoFolderSource "Views\install\*"
-		$upgradeView = Join-Path $umbracoFolder "Views\install\"
-		Write-Host "Copying2 ${upgradeViewSource} to ${upgradeView}"
-		Copy-Item $upgradeViewSource $upgradeView -Force
-		
-		Try 
-		{
-			# Disable tours for upgrades, presumably Umbraco experience is already available
-			$umbracoSettingsConfigPath = Join-Path $configFolder "umbracoSettings.config"
-			$content = (Get-Content $umbracoSettingsConfigPath).Replace('<tours enable="true">','<tours enable="false">')
-			# Saves with UTF-8 encoding without BOM which makes sure Umbraco can still read it
-			# Reference: https://stackoverflow.com/a/32951824/5018
-			[IO.File]::WriteAllLines($umbracoSettingsConfigPath, $content)
-		} 
-		Catch 
-		{
-			# Not a big problem if this fails, let it go
-		}
-		
-		Try 
-		{
-			$uiXmlConfigPath = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
-			$uiXmlFile = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
-
-			$uiXml = New-Object System.Xml.XmlDocument
-			$uiXml.PreserveWhitespace = $true
-
-			$uiXml.Load($uiXmlFile)
-			$createExists = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks/create")
-
-			if($createExists.Count -eq 0) 
-			{    
-				$macrosTasksNode = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks")
-
-				#Creating: <create assembly="umbraco" type="macroTasks" />
-				$createNode = $uiXml.CreateElement("create")
-				$createNode.SetAttribute("assembly", "umbraco")
-				$createNode.SetAttribute("type", "macroTasks")
-				$macrosTasksNode.AppendChild($createNode)
-				$uiXml.Save($uiXmlFile)
-			}
-		} 
-		Catch { }
-	}
-	
-	$installFolder = Join-Path $projectPath "Install"
-	if(Test-Path $installFolder) {
-		Remove-Item $installFolder -Force -Recurse -Confirm:$false
-	}
-	
-	# Open appropriate readme
-	if($copyWebconfig -eq $true)  
-	{
-		$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
-	} 
-	else 
-	{	
-		$DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt')
-	}
-}
+param($installPath, $toolsPath, $package, $project)
+
+Write-Host "installPath:" "${installPath}"
+Write-Host "toolsPath:" "${toolsPath}"
+
+Write-Host " "
+
+if ($project) {
+	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
+
+	# Create paths and list them
+	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
+	Write-Host "projectPath:" "${projectPath}"
+	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
+	Write-Host "backupPath:" "${backupPath}"
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	Write-Host "copyLogsPath:" "${copyLogsPath}"	
+	$webConfigSource = Join-Path $projectPath "Web.config"
+	Write-Host "webConfigSource:" "${webConfigSource}"
+	$configFolder = Join-Path $projectPath "Config"
+	Write-Host "configFolder:" "${configFolder}"
+
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
+	# Create a backup of original web.config
+	Copy-Item $webConfigSource $backupPath -Force
+	
+	# Backup config files folder	
+	if(Test-Path $configFolder) {
+		$umbracoBackupPath = Join-Path $backupPath "Config"
+		New-Item -ItemType Directory -Force -Path $umbracoBackupPath
+		
+		robocopy $configFolder $umbracoBackupPath /e /LOG:$copyLogsPath\ConfigBackup.log
+	}
+	
+	# Copy umbraco and umbraco_files from package to project folder
+	$umbracoFolder = Join-Path $projectPath "Umbraco"
+	New-Item -ItemType Directory -Force -Path $umbracoFolder
+	$umbracoFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco"		
+	$umbracoBackupPath = Join-Path $backupPath "Umbraco"
+	New-Item -ItemType Directory -Force -Path $umbracoBackupPath		
+	robocopy $umbracoFolder $umbracoBackupPath /e /LOG:$copyLogsPath\UmbracoBackup.log
+	robocopy $umbracoFolderSource $umbracoFolder /is /it /e /xf UI.xml /LOG:$copyLogsPath\UmbracoCopy.log
+
+	$umbracoClientFolder = Join-Path $projectPath "Umbraco_Client"	
+	New-Item -ItemType Directory -Force -Path $umbracoClientFolder
+	$umbracoClientFolderSource = Join-Path $installPath "UmbracoFiles\Umbraco_Client"		
+	$umbracoClientBackupPath = Join-Path $backupPath "Umbraco_Client"
+	New-Item -ItemType Directory -Force -Path $umbracoClientBackupPath		
+	robocopy $umbracoClientFolder $umbracoClientBackupPath /e /LOG:$copyLogsPath\UmbracoClientBackup.log
+	robocopy $umbracoClientFolderSource $umbracoClientFolder /is /it /e /LOG:$copyLogsPath\UmbracoClientCopy.log		
+
+	$copyWebconfig = $true
+	$destinationWebConfig = Join-Path $projectPath "Web.config"
+
+	if(Test-Path $destinationWebConfig) 
+	{
+		Try 
+		{
+			[xml]$config = Get-Content $destinationWebConfig
+			
+			$config.configuration.appSettings.ChildNodes | ForEach-Object { 
+				if($_.key -eq "umbracoConfigurationStatus") 
+				{
+					# The web.config has an umbraco-specific appSetting in it
+					# don't overwrite it and let config transforms do their thing
+					$copyWebconfig = $false 
+				}
+			}
+		} 
+		Catch { }
+	}
+	
+	if($copyWebconfig -eq $true) 
+	{
+		$packageWebConfigSource = Join-Path $installPath "UmbracoFiles\Web.config"
+		Copy-Item $packageWebConfigSource $destinationWebConfig -Force
+
+		# Copy files that don't get automatically copied for Website projects
+		# We do this here, when copyWebconfig is true because we only want to do it for new installs
+		# If this is an upgrade then the files should already be there
+		$splashesSource = Join-Path $installPath "UmbracoFiles\Config\splashes\*.*"
+		$splashesDestination = Join-Path $projectPath "Config\splashes\"
+		New-Item $splashesDestination -Type directory
+		Copy-Item $splashesSource $splashesDestination -Force
+
+		$sqlCe64Source = Join-Path $installPath "UmbracoFiles\bin\amd64\*"
+		$sqlCe64Destination = Join-Path $projectPath "bin\amd64\"
+		Copy-Item $sqlCe64Source $sqlCe64Destination -Force
+		
+		$sqlCex86Source = Join-Path $installPath "UmbracoFiles\bin\x86\*"
+		$sqlCex86Destination = Join-Path $projectPath "bin\x86\"
+		Copy-Item $sqlCex86source $sqlCex86Destination -Force
+
+		$umbracoUIXMLSource = Join-Path $installPath "UmbracoFiles\Umbraco\Config\Create\UI.xml"
+		$umbracoUIXMLDestination = Join-Path $projectPath "Umbraco\Config\Create\UI.xml"
+		Copy-Item $umbracoUIXMLSource $umbracoUIXMLDestination -Force
+	} else {
+		# This part only runs for upgrades
+	
+		$upgradeViewSource = Join-Path $umbracoFolderSource "Views\install\*"
+		$upgradeView = Join-Path $umbracoFolder "Views\install\"
+		Write-Host "Copying2 ${upgradeViewSource} to ${upgradeView}"
+		Copy-Item $upgradeViewSource $upgradeView -Force
+		
+		Try 
+		{
+			# Disable tours for upgrades, presumably Umbraco experience is already available
+			$umbracoSettingsConfigPath = Join-Path $configFolder "umbracoSettings.config"
+			$content = (Get-Content $umbracoSettingsConfigPath).Replace('<tours enable="true">','<tours enable="false">')
+			# Saves with UTF-8 encoding without BOM which makes sure Umbraco can still read it
+			# Reference: https://stackoverflow.com/a/32951824/5018
+			[IO.File]::WriteAllLines($umbracoSettingsConfigPath, $content)
+		} 
+		Catch 
+		{
+			# Not a big problem if this fails, let it go
+		}
+		
+		Try 
+		{
+			$uiXmlConfigPath = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+			$uiXmlFile = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+
+			$uiXml = New-Object System.Xml.XmlDocument
+			$uiXml.PreserveWhitespace = $true
+
+			$uiXml.Load($uiXmlFile)
+			$createExists = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks/create")
+
+			if($createExists.Count -eq 0) 
+			{    
+				$macrosTasksNode = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks")
+
+				#Creating: <create assembly="umbraco" type="macroTasks" />
+				$createNode = $uiXml.CreateElement("create")
+				$createNode.SetAttribute("assembly", "umbraco")
+				$createNode.SetAttribute("type", "macroTasks")
+				$macrosTasksNode.AppendChild($createNode)
+				$uiXml.Save($uiXmlFile)
+			}
+		} 
+		Catch { }
+	}
+	
+	$installFolder = Join-Path $projectPath "Install"
+	if(Test-Path $installFolder) {
+		Remove-Item $installFolder -Force -Recurse -Confirm:$false
+	}
+	
+	# Open appropriate readme
+	if($copyWebconfig -eq $true)  
+	{
+		$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
+	} 
+	else 
+	{	
+		$DTE.ItemOperations.OpenFile($toolsPath + '\ReadmeUpgrade.txt')
+	}
+}
@@ -4,18 +4,18 @@
  <add alias="content" application="content"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="RemoveAttributes(silent)" />
-  <add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, Umbraco.Web" 
+  <add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, umbraco" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, Umbraco.Web" 
+  <add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, umbraco" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
  
  <!--Media-->
-  <add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, Umbraco.Web" 
+  <add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, umbraco" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, Umbraco.Web" 
+  <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
  
@@ -23,39 +23,39 @@
  <add application="settings" alias="nodeTypes"  
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="Remove" />
-  <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, Umbraco.Web"
+  <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="InsertIfMissing" />
-  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" 
+  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, Umbraco.Web" iconClosed="" iconOpen="" initialize="false" sortOrder="0" 
+  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="templates" title="Templates" type="Umbraco.Web.Trees.TemplatesTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="1" 
+  <add application="settings" alias="templates" title="Templates" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="1" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" /> 
  
-  <add application="settings" alias="partialViews" type="Umbraco.Web.Trees.PartialViewsTree, Umbraco.Web"
+  <add application="settings" alias="partialViews" type="Umbraco.Web.Trees.PartialViewsTree, umbraco"
       xdt:Locator="Match(application,alias,type)"
       xdt:Transform="Remove()" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, Umbraco.Web" sortOrder="2"
+  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, umbraco" sortOrder="2"
       xdt:Locator="Match(application,alias)"
       xdt:Transform="InsertIfMissing"  />
  
-  <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
+  <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="8" 
+  <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
  <add alias="dictionary" application="settings"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="RemoveAttributes(action)" />
-  <add application="settings" alias="languages" title="Languages" type="Umbraco.Web.Trees.LanguageTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="5" 
+  <add application="settings" alias="languages" title="Languages" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="5" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add application="settings" initialize="true" alias="mediaTypes" title="Media Types" type="Umbraco.Web.Trees.MediaTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="7" 
+  <add application="settings" initialize="true" alias="mediaTypes" title="Media Types" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="7" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />

@@ -66,12 +66,12 @@
  <add alias="packagerPackages" application="developer"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="Remove" />
-  <add initialize="true" sortOrder="0" alias="packager" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, Umbraco.Web" 
+  <add initialize="true" sortOrder="0" alias="packager" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, umbraco" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="InsertIfMissing"  />
  
  <!-- Before 7.4 this tree had the alias 'dataType', without the 's' on the end, this is here to rename it  -->
-  <add sortOrder="1" alias="dataTypes" application="developer" type="Umbraco.Web.Trees.DataTypeTreeController, Umbraco.Web"
+  <add sortOrder="1" alias="dataTypes" application="developer" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco"
       xdt:Locator="Match(application,type)" 
       xdt:Transform="SetAttributes(alias,sortOrder)" />
 	   
@@ -80,17 +80,17 @@
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes(sortOrder)" />

-  <add initialize="true" sortOrder="2" alias="macros" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MacroTreeController, Umbraco.Web"
+  <add initialize="true" sortOrder="2" alias="macros" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MacroTreeController, umbraco"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
+  <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
  
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, Umbraco.Web"
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco"
       xdt:Locator="Match(application,alias,type)" 
       xdt:Transform="Remove()" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, Umbraco.Web" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder"
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder"
       xdt:Locator="Match(application,alias)"
       xdt:Transform="InsertIfMissing"  />
  
@@ -99,7 +99,7 @@
       xdt:Transform="Remove" />

  <!--Users-->
- <add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, Umbraco.Web" 
+ <add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, umbraco" 
      xdt:Locator="Match(application,alias)"
      xdt:Transform="SetAttributes()" />

@@ -111,30 +111,30 @@
       xdt:Transform="Remove" />

  <!--Members-->
-  <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, Umbraco.Web" 
+  <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
  <add application="member" alias="memberGroup"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="Remove" />
-  <add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" 
+  <add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="InsertIfMissing" />
  <add application="member" alias="memberType"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="Remove" />
-  <add application="member" sortOrder="1" alias="memberTypes" initialize="true" title="Member Types" type="Umbraco.Web.Trees.MemberTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder-open" 
+  <add application="member" sortOrder="1" alias="memberTypes" initialize="true" title="Member Types" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder-open" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="InsertIfMissing" />

  <!--Translation-->
-  <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, Umbraco.Web" 
+  <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
  <add alias="openTasks" application="translation"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="RemoveAttributes(action)" />
-  <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, Umbraco.Web" 
+  <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
  <add alias="yourTasks" application="translation"
@@ -0,0 +1,127 @@
+@ECHO OFF
+
+:choice
+set /P c=WARNING! Are you sure you want to continue, this will remove all package files, view files, sqlce database, etc... Press 'Y' to auto-remove all files/folders, 'N' to cancel or 'C' to prompt for each folder removal?
+if /I "%c%" EQU "C" goto :prompt
+if /I "%c%" EQU "Y" goto :auto
+if /I "%c%" EQU "N" goto :exit
+goto :choice
+
+
+:prompt
+
+echo Current folder: %CD%
+
+echo Removing sqlce database
+del ..\src\Umbraco.Web.UI\App_Data\Umbraco.sdf
+
+echo Resetting installedPackages.config
+echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
+
+echo Removing plugin cache files
+del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*
+
+echo Removing cache files and examine index
+del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.*
+
+echo Removing log files
+del ..\src\Umbraco.Web.UI\App_Data\Logs\*.*
+
+echo Removing packages
+del ..\src\Umbraco.Web.UI\App_Data\packages\*.*
+
+echo Removing previews
+del ..\src\Umbraco.Web.UI\App_Data\preview\*.*
+
+echo Removing app code files (typically added by starterkits)
+del ..\src\Umbraco.Web.UI\App_Code\*.*
+
+echo Removing xslt files
+del ..\src\Umbraco.Web.UI\xslt\*.*
+
+echo Removing user control files
+del ..\src\Umbraco.Web.UI\UserControls\*.*
+
+echo Removing masterpage files
+del ..\src\Umbraco.Web.UI\masterpages\*.*
+
+echo Removing razor files
+del ..\src\Umbraco.Web.UI\macroScripts\*.*
+
+echo Removing media files
+del ..\src\Umbraco.Web.UI\media\*.*
+
+echo Removing script files
+del ..\src\Umbraco.Web.UI\scripts\*.*
+
+echo Removing css files
+del ..\src\Umbraco.Web.UI\css\*.*
+
+echo "Umbraco install reverted to clean install"
+pause 
+exit
+
+
+
+:auto
+
+echo Current folder: %CD%
+
+echo Removing sqlce database
+del ..\src\Umbraco.Web.UI\App_Data\Umbraco.sdf
+
+echo Resetting installedPackages.config
+echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
+
+echo Removing plugin cache files
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A
+
+echo Removing cache files and examine index
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A
+
+echo Removing log files
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A
+
+echo Removing packages
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A
+
+echo Removing previews
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A
+
+echo Removing app code files (typically added by starterkits)
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A
+
+echo Removing xslt files
+FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A
+
+echo Removing masterpage files
+FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A
+
+echo Removing user control files
+FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
+
+echo Removing view files
+ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
+ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+
+echo Removing razor files
+FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
+
+echo Removing media files
+FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A
+
+echo Removing script files
+FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A
+
+echo Removing css files
+FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
+
+echo "Umbraco install reverted to clean install"
+pause 
+exit
+
+
+
+:exit
+exit
@@ -0,0 +1,163 @@
+@ECHO OFF
+
+:choice
+set /P c=WARNING! Are you sure you want to continue, this will remove all package files, view files, sqlce database, etc... Press 'Y' to auto-remove all files/folders, 'N' to cancel or 'C' to prompt for each folder removal?
+if /I "%c%" EQU "C" goto :prompt
+if /I "%c%" EQU "Y" goto :auto
+if /I "%c%" EQU "N" goto :exit
+goto :choice
+
+
+:prompt
+
+echo Current folder: %CD%
+
+echo Regenerating SQL CE database
+SET buildfolder=%CD%
+CD ..\tools\RegenerateUmbracoSQLCEDatabase\
+RegenerateUmbracoSQLCEDatabase.exe %CD%\..\..\src\Umbraco.Web.UI
+CD %buildfolder%
+
+echo Removing bin files
+del ..\src\Umbraco.Web.UI\bin\*.*
+
+echo Building solution
+"%ProgramFiles(x86)%"\MSBuild\14.0\Bin\MSBuild.exe ..\src\umbraco.sln /t:Clean,Build
+
+echo Resetting installedPackages.config
+echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
+
+echo Removing plugin cache files
+del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*
+
+echo Removing cache files and examine index
+del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.*
+
+echo Removing log files
+del ..\src\Umbraco.Web.UI\App_Data\Logs\*.*
+
+echo Removing packages
+del ..\src\Umbraco.Web.UI\App_Data\packages\*.*
+
+echo Removing previews
+del ..\src\Umbraco.Web.UI\App_Data\preview\*.*
+
+echo Removing app code files (typically added by starterkits)
+del ..\src\Umbraco.Web.UI\App_Code\*.*
+
+echo Removing xslt files
+del ..\src\Umbraco.Web.UI\xslt\*.*
+
+echo Removing user control files
+del ..\src\Umbraco.Web.UI\UserControls\*.*
+
+echo Removing masterpage files
+del ..\src\Umbraco.Web.UI\masterpages\*.*
+
+echo Removing razor files
+del ..\src\Umbraco.Web.UI\macroScripts\*.*
+
+echo Removing media files
+del ..\src\Umbraco.Web.UI\media\*.*
+
+echo Removing script files
+del ..\src\Umbraco.Web.UI\scripts\*.*
+
+echo Removing css files
+del ..\src\Umbraco.Web.UI\css\*.*
+
+echo "Umbraco install reverted to clean install"
+pause 
+exit
+
+
+
+:auto
+
+echo Current folder: %CD%
+
+echo Regenerating SQL CE database
+SET buildfolder=%CD%
+CD ..\tools\RegenerateUmbracoSQLCEDatabase\
+RegenerateUmbracoSQLCEDatabase.exe %CD%\..\..\src\Umbraco.Web.UI
+CD %buildfolder%
+
+echo Removing bin files
+ FOR %%A IN (..\src\Umbraco.Web.UI\bin\*.*) DO DEL %%A
+
+echo Building solution
+"%ProgramFiles(x86)%"\MSBuild\14.0\Bin\MSBuild.exe ..\src\umbraco.sln /t:Clean,Build
+
+echo Resetting installedPackages.config
+echo ^<?xml version="1.0" encoding="utf-8"?^>^<packages^>^</packages^> >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config
+
+echo Removing plugin cache files
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A
+
+echo Removing cache files and examine index
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A
+
+echo Removing log files
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A
+
+echo Removing packages
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A
+
+echo Removing previews
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A
+
+echo Removing app code files (typically added by starterkits)
+FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A
+
+echo Removing xslt files
+FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A
+
+echo Removing masterpage files
+FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A
+
+echo Removing user control files
+FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A
+
+echo Removing view files
+ATTRIB +H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+FOR %%A IN (..\src\Umbraco.Web.UI\Views\) DO DEL /Q /S *.cshtml -H
+ATTRIB -H ..\src\Umbraco.Web.UI\Views\Partials\Grid\*.cshtml /S
+
+echo Removing razor files
+FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A
+
+echo Removing media files
+FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A
+
+echo Removing script files
+FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A
+
+echo Removing css files
+FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A
+
+echo Removing Courier files
+del ..\src\Umbraco.Web.UI\config\courier.config
+del ..\src\Umbraco.Web.UI\umbraco\images\tray\courier.jpg
+rmdir "..\src\Umbraco.Web.UI\umbraco\plugins\courier\" /S /Q
+
+echo Removing Contour files
+del ..\src\Umbraco.Web.UI\umbraco\images\tray\contour.png
+FOR %%A IN (..\src\Umbraco.Web.UI\umbraco\images\umbraco\icon_*.*) DO DEL %%A
+rmdir "..\src\Umbraco.Web.UI\umbraco\plugins\umbracoContour\" /S /Q
+del ..\src\Umbraco.Web.UI\umbraco\xslt\templates\UmbracoContour*.* /S /Q
+rmdir "..\src\Umbraco.Web.UI\usercontrols\umbracoContour\" /S /Q
+
+echo Start with a clean web.config
+copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
+
+echo Start with a clean web.config
+copy ..\src\Umbraco.Web.UI\web.Template.config ..\src\Umbraco.Web.UI\web.config /Y
+
+echo "Umbraco install reverted to clean install"
+pause 
+exit
+
+
+
+:exit
+exit
@@ -43,6 +43,14 @@

    $release = "" + $semver.Major + "." + $semver.Minor + "." + $semver.Patch

+    Write-Host "Update UmbracoVersion.cs"
+    $this.ReplaceFileText("$($this.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs", `
+      "(\d+)\.(\d+)\.(\d+)(.(\d+))?", `
+      "$release")
+    $this.ReplaceFileText("$($this.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs", `
+      "CurrentComment => `"(.+)`"", `
+      "CurrentComment => `"$($semver.PreRelease)`"")
+
    Write-Host "Update IIS Express port in csproj"
    $updater = New-Object "Umbraco.Build.ExpressPortUpdater"
    $csproj = "$($this.SolutionRoot)\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj"
@@ -54,16 +62,12 @@
    $global:node_path = $env:path
    $nodePath = $this.BuildEnv.NodePath
    $gitExe = (Get-Command git).Source
-    if (-not $gitExe) { $gitExe = (Get-Command git).Path }
    $gitPath = [System.IO.Path]::GetDirectoryName($gitExe)
    $env:path = "$nodePath;$gitPath"

    $global:node_nodepath = $this.ClearEnvVar("NODEPATH")
    $global:node_npmcache = $this.ClearEnvVar("NPM_CONFIG_CACHE")
    $global:node_npmprefix = $this.ClearEnvVar("NPM_CONFIG_PREFIX")
-
-    # https://github.com/gruntjs/grunt-contrib-connect/issues/235
-    $this.SetEnvVar("NODE_NO_HTTP2", "1")
  })

  $ubuild.DefineMethod("RestoreNode",
@@ -73,8 +77,6 @@
    $this.SetEnvVar("NODEPATH", $node_nodepath)
    $this.SetEnvVar("NPM_CONFIG_CACHE", $node_npmcache)
    $this.SetEnvVar("NPM_CONFIG_PREFIX", $node_npmprefix)
-
-    $ignore = $this.ClearEnvVar("NODE_NO_HTTP2")
  })

  $ubuild.DefineMethod("CompileBelle",
@@ -92,40 +94,48 @@
    # so we have to take care of it else they'll bubble and kill the build
    if ($error.Count -gt 0) { return }

-    try {
-        Push-Location "$($this.SolutionRoot)\src\Umbraco.Web.UI.Client"
-        Write-Output "" > $log
+    Push-Location "$($this.SolutionRoot)\src\Umbraco.Web.UI.Client"
+    Write-Output "" > $log

-        Write-Output "### node version is:" > $log
-        node -v >> $log 2>&1
-        if (-not $?) { throw "Failed to report node version." }
+    Write-Output "### node version is:" > $log
+    &node -v >> $log 2>&1
+    if (-not $?) { throw "Failed to report node version." }

-        Write-Output "### npm version is:" >> $log 2>&1
-        npm -v >> $log 2>&1
-        if (-not $?) { throw "Failed to report npm version." }
+    Write-Output "### npm version is:" >> $log 2>&1
+    &npm -v >> $log 2>&1
+    if (-not $?) { throw "Failed to report npm version." }

-        Write-Output "### clean npm cache" >> $log 2>&1
-        npm cache clean --force >> $log 2>&1
-        $error.Clear() # that one can fail 'cos security bug - ignore
+    Write-Output "### clean npm cache" >> $log 2>&1
+    &npm cache clean --force >> $log 2>&1
+    $error.Clear() # that one can fail 'cos security bug - ignore

-        Write-Output "### npm install" >> $log 2>&1
-        npm install >> $log 2>&1
-        Write-Output ">> $? $($error.Count)" >> $log 2>&1
-        # Don't really care about the messages from npm install making us think there are errors
-        $error.Clear()
+    Write-Output "### npm install" >> $log 2>&1
+    &npm install >> $log 2>&1
+    Write-Output ">> $? $($error.Count)" >> $log 2>&1

-        Write-Output "### gulp build for version $($this.Version.Release)" >> $log 2>&1
-        npx gulp build --buildversion=$this.Version.Release >> $log 2>&1
-        if (-not $?) { throw "Failed to build" } # that one is expected to work
-    } finally {
-        Pop-Location
+    Write-Output "### install bower" >> $log 2>&1
+    &npm install -g bower >> $log 2>&1
+    $error.Clear() # that one fails 'cos bower is deprecated - ignore

-        # fixme - should we filter the log to find errors?
-        #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
+    Write-Output "### install gulp" >> $log 2>&1
+    &npm install -g gulp >> $log 2>&1
+    $error.Clear() # that one fails 'cos deprecated stuff - ignore

-        # restore
-        $this.RestoreNode()
-    }
+    Write-Output "### install gulp-cli" >> $log 2>&1
+    &npm install -g gulp-cli --quiet >> $log 2>&1
+    if (-not $?) { throw "Failed to install gulp-cli" } # that one is expected to work
+
+    Write-Output "### gulp build for version $($this.Version.Release)" >> $log 2>&1
+    &gulp build --buildversion=$this.Version.Release >> $log 2>&1
+    if (-not $?) { throw "Failed to build" } # that one is expected to work
+
+    Pop-Location
+
+    # fixme - should we filter the log to find errors?
+    #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
+
+    # restore
+    $this.RestoreNode()

    # setting node_modules folder to hidden
    # used to prevent VS13 from crashing on it while loading the websites project
@@ -287,11 +297,7 @@

    # copy libs
    Write-Host "Copy SqlCE libraries"
-    $nugetPackages = $env:NUGET_PACKAGES
-    if (-not $nugetPackages)
-    {
-      $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
-    }
+    $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
@@ -388,15 +394,9 @@
        -Symbols -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"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." }
-
    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
        -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version "$($this.Version.Semver.ToString())" `
+        -Version $this.Version.Semver.ToString() `
        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log"
    if (-not $?) { throw "Failed to pack NuGet UmbracoCms." }

@@ -412,7 +412,7 @@
  $ubuild.DefineMethod("VerifyNuGet",
  {
    $this.VerifyNuGetConsistency(
-      ("UmbracoCms", "UmbracoCms.Core", "UmbracoCms.Web"),
+      ("UmbracoCms", "UmbracoCms.Core"),
      ("Umbraco.Core", "Umbraco.Web", "Umbraco.Web.UI", "Umbraco.Examine"))
    if ($this.OnError()) { return }
  })
@@ -425,8 +425,6 @@

  $ubuild.DefineMethod("Build",
  {
-    $error.Clear()
-
    $this.PrepareBuild()
    if ($this.OnError()) { return }
    $this.RestoreNuGet()
@@ -452,20 +450,6 @@
    if ($this.OnError()) { return }
    $this.PrepareAzureGallery()
    if ($this.OnError()) { return }
-    $this.PostPackageHook()
-    if ($this.OnError()) { return }
-    Write-Host "Done"
-  })
-
-  $ubuild.DefineMethod("PostPackageHook",
-  {
-    # run hook
-    if ($this.HasMethod("PostPackage"))
-    {
-      Write-Host "Run PostPackage hook"
-      $this.PostPackage();
-      if (-not $?) { throw "Failed to run hook." }
-    }
  })

  # ################################################################
@@ -481,4 +465,5 @@
    $ubuild.Build()
    if ($ubuild.OnError()) { return }
  }
+  Write-Host "Done"
  if ($get) { return $ubuild }
@@ -1,5 +1,5 @@

 - name: Umbraco.Core Documentation
-  href: https://our.umbraco.com/apidocs/csharp/api/Umbraco.Core.html
+  href: https://our.umbraco.org/apidocs/csharp/api/Umbraco.Core.html
 - name: Umbraco.Web Documentation
-  href: https://our.umbraco.com/apidocs/csharp/api/Umbraco.Web.html
+  href: https://our.umbraco.org/apidocs/csharp/api/Umbraco.Web.html
@@ -7,7 +7,7 @@
      <span class="pull-right">
        <a href="#top">Back to top</a>
      </span>
-      <span>Copyright © 2016-present Umbraco<br>Generated by <strong>DocFX</strong></span>
+      <span>Copyright © 2016 Umbraco<br>Generated by <strong>DocFX</strong></span>
    </div>
  </div>
 </footer>
@@ -8,7 +8,7 @@
  <meta name="title" content="{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}">
  <meta name="generator" content="docfx {{_docfxVersion}}">
  {{#_description}}<meta name="description" content="{{_description}}">{{/_description}}
-  <link rel="icon" type="image/png" href="https://our.umbraco.com/assets/images/app-icons/favicon.png">
+  <link rel="icon" type="image/png" href="https://our.umbraco.org/assets/images/app-icons/favicon.png">
  <link rel="stylesheet" href="{{_rel}}styles/docfx.vendor.css">
  <link rel="stylesheet" href="{{_rel}}styles/docfx.css">
  <link rel="stylesheet" href="{{_rel}}styles/main.css">
@@ -63,7 +63,7 @@ a:focus {
 }

 .navbar-header .navbar-brand {
-    background: url(https://our.umbraco.com/assets/images/logo.svg) left center no-repeat;
+    background: url(https://our.umbraco.org/assets/images/logo.svg) left center no-repeat;
    background-size: 40px auto;
    width:50px;
 }
@@ -1,22 +1,22 @@
-using System.Reflection;
-using System.Resources;
-
-[assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// versions
-// read https://stackoverflow.com/questions/64602/what-are-differences-between-assemblyversion-assemblyfileversion-and-assemblyin
+using System.Reflection;
+using System.Resources;
+
+[assembly: AssemblyCompany("Umbraco")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: NeutralResourcesLanguage("en-US")]
+
+// versions
+// read https://stackoverflow.com/questions/64602/what-are-differences-between-assemblyversion-assemblyfileversion-and-assemblyin

 // note: do NOT change anything here manually, use the build scripts
-
-// this is the ONLY ONE the CLR cares about for compatibility
-// should change ONLY when "hard" breaking compatibility (manual change)
-[assembly: AssemblyVersion("8.0.0")]
-
-// these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.0.0")]
-[assembly: AssemblyInformationalVersion("8.0.0-alpha.58")]
+
+// this is the ONLY ONE the CLR cares about for compatibility
+// should change ONLY when "hard" breaking compatibility (manual change)
+[assembly: AssemblyVersion("8.0.0")]
+
+// these are FYI and changed automatically
+[assembly: AssemblyFileVersion("8.0.0")]
+[assembly: AssemblyInformationalVersion("8.0.0-alpha.37")]
@@ -1,72 +1,72 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace Umbraco.Core
-{
-    internal static class AssemblyExtensions
-    {
-        /// <summary>
-        /// Returns the file used to load the assembly
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static FileInfo GetAssemblyFile(this Assembly assembly)
-        {
-            var codeBase = assembly.CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            return new FileInfo(path);
-        }
-
-        /// <summary>
-        /// Returns true if the assembly is the App_Code assembly
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static bool IsAppCodeAssembly(this Assembly assembly)
-        {
-            if (assembly.FullName.StartsWith("App_Code"))
-            {
-                try
-                {
-                    Assembly.Load("App_Code");
-                    return true;
-                }
-                catch (FileNotFoundException)
-                {
-                    //this will occur if it cannot load the assembly
-                    return false;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Returns true if the assembly is the compiled global asax.
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static bool IsGlobalAsaxAssembly(this Assembly assembly)
-        {
-            //only way I can figure out how to test is by the name
-            return assembly.FullName.StartsWith("App_global.asax");
-        }
-
-        /// <summary>
-        ///  Returns the file used to load the assembly
-        /// </summary>
-        /// <param name="assemblyName"></param>
-        /// <returns></returns>
-        public static FileInfo GetAssemblyFile(this AssemblyName assemblyName)
-        {
-            var codeBase = assemblyName.CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            return new FileInfo(path);
-        }
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace Umbraco.Core
+{
+    internal static class AssemblyExtensions
+    {
+        /// <summary>
+        /// Returns the file used to load the assembly
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <returns></returns>
+        public static FileInfo GetAssemblyFile(this Assembly assembly)
+        {
+            var codeBase = assembly.CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            return new FileInfo(path);
+        }
+
+        /// <summary>
+        /// Returns true if the assembly is the App_Code assembly
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <returns></returns>
+        public static bool IsAppCodeAssembly(this Assembly assembly)
+        {
+            if (assembly.FullName.StartsWith("App_Code"))
+            {
+                try
+                {
+                    Assembly.Load("App_Code");
+                    return true;
+                }
+                catch (FileNotFoundException)
+                {
+                    //this will occur if it cannot load the assembly
+                    return false;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns true if the assembly is the compiled global asax.
+        /// </summary>
+        /// <param name="assembly"></param>
+        /// <returns></returns>
+        public static bool IsGlobalAsaxAssembly(this Assembly assembly)
+        {
+            //only way I can figure out how to test is by the name
+            return assembly.FullName.StartsWith("App_global.asax");
+        }
+
+        /// <summary>
+        ///  Returns the file used to load the assembly
+        /// </summary>
+        /// <param name="assemblyName"></param>
+        /// <returns></returns>
+        public static FileInfo GetAssemblyFile(this AssemblyName assemblyName)
+        {
+            var codeBase = assemblyName.CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            return new FileInfo(path);
+        }
+
+    }
+}
@@ -1,126 +1,126 @@
-using System;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides ways to create attempts.
-    /// </summary>
-    public static class Attempt
-    {
-        // note:
-        // cannot rely on overloads only to differenciate between with/without status
-        // in some cases it will always be ambiguous, so be explicit w/ 'WithStatus' methods
-
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<TResult> Succeed<TResult>(TResult result)
-        {
-            return Attempt<TResult>.Succeed(result);
-        }
-
-        /// <summary>
-        /// Creates a successful attempt with a result and a status.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<TResult, TStatus> SucceedWithStatus<TResult, TStatus>(TStatus status, TResult result)
-        {
-            return Attempt<TResult, TStatus>.Succeed(status, result);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail<TResult>()
-        {
-            return Attempt<TResult>.Fail();
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail<TResult>(TResult result)
-        {
-            return Attempt<TResult>.Fail(result);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and a status.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult, TStatus> FailWithStatus<TResult, TStatus>(TStatus status, TResult result)
-        {
-            return Attempt<TResult, TStatus>.Fail(status, result);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult> Fail<TResult>(TResult result, Exception exception)
-        {
-            return Attempt<TResult>.Fail(result, exception);
-        }
-
-
-        /// <summary>
-        /// Creates a failed attempt with a result, an exception and a status.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-        /// <param name="status">The status of the attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<TResult, TStatus> FailWithStatus<TResult, TStatus>(TStatus status, TResult result, Exception exception)
-        {
-            return Attempt<TResult, TStatus>.Fail(status, result, exception);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<TResult> If<TResult>(bool condition, TResult result)
-        {
-            return Attempt<TResult>.If(condition, result);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
-        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="succStatus">The status of the successful attempt.</param>
-        /// <param name="failStatus">The status of the failed attempt.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<TResult, TStatus> IfWithStatus<TResult, TStatus>(bool condition, TStatus succStatus, TStatus failStatus, TResult result)
-        {
-            return Attempt<TResult, TStatus>.If(condition, succStatus, failStatus, result);
-        }
-    }
-}
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides ways to create attempts.
+    /// </summary>
+    public static class Attempt
+    {
+        // note:
+        // cannot rely on overloads only to differenciate between with/without status
+        // in some cases it will always be ambiguous, so be explicit w/ 'WithStatus' methods
+
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<TResult> Succeed<TResult>(TResult result)
+        {
+            return Attempt<TResult>.Succeed(result);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result and a status.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<TResult, TStatus> SucceedWithStatus<TResult, TStatus>(TStatus status, TResult result)
+        {
+            return Attempt<TResult, TStatus>.Succeed(status, result);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult> Fail<TResult>()
+        {
+            return Attempt<TResult>.Fail();
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult> Fail<TResult>(TResult result)
+        {
+            return Attempt<TResult>.Fail(result);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and a status.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult, TStatus> FailWithStatus<TResult, TStatus>(TStatus status, TResult result)
+        {
+            return Attempt<TResult, TStatus>.Fail(status, result);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult> Fail<TResult>(TResult result, Exception exception)
+        {
+            return Attempt<TResult>.Fail(result, exception);
+        }
+
+
+        /// <summary>
+        /// Creates a failed attempt with a result, an exception and a status.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+        /// <param name="status">The status of the attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<TResult, TStatus> FailWithStatus<TResult, TStatus>(TStatus status, TResult result, Exception exception)
+        {
+            return Attempt<TResult, TStatus>.Fail(status, result, exception);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<TResult> If<TResult>(bool condition, TResult result)
+        {
+            return Attempt<TResult>.If(condition, result);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <typeparam name="TResult">The type of the attempted operation result.</typeparam>
+        /// <typeparam name="TStatus">The type of the attempted operation status.</typeparam>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="succStatus">The status of the successful attempt.</param>
+        /// <param name="failStatus">The status of the failed attempt.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<TResult, TStatus> IfWithStatus<TResult, TStatus>(bool condition, TStatus succStatus, TStatus failStatus, TResult result)
+        {
+            return Attempt<TResult, TStatus>.If(condition, succStatus, failStatus, result);
+        }
+    }
+}
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Web;
+using Umbraco.Core.Components;
 using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
@@ -10,38 +11,13 @@ using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;

-namespace Umbraco.Core.Components
+namespace Umbraco.Core.Auditing
 {
-    public sealed class AuditEventsComponent : IComponent
+    public sealed class AuditEventsComponent : UmbracoComponentBase, IUmbracoCoreComponent
    {
-        private readonly IAuditService _auditService;
-        private readonly IUserService _userService;
-        private readonly IEntityService _entityService;
-
-        public AuditEventsComponent(IAuditService auditService, IUserService userService, IEntityService entityService)
-        {
-            _auditService = auditService;
-            _userService = userService;
-            _entityService = entityService;
-        }
-
-        public void Initialize()
-        {
-            UserService.SavedUserGroup += OnSavedUserGroupWithUsers;
-
-            UserService.SavedUser += OnSavedUser;
-            UserService.DeletedUser += OnDeletedUser;
-            UserService.UserGroupPermissionsAssigned += UserGroupPermissionAssigned;
-
-            MemberService.Saved += OnSavedMember;
-            MemberService.Deleted += OnDeletedMember;
-            MemberService.AssignedRoles += OnAssignedRoles;
-            MemberService.RemovedRoles += OnRemovedRoles;
-            MemberService.Exported += OnMemberExported;
-        }
-
-        public void Terminate()
-        { }
+        private IAuditService _auditService;
+        private IUserService _userService;
+        private IEntityService _entityService;

        private IUser CurrentPerformingUser
        {
@@ -71,6 +47,37 @@ namespace Umbraco.Core.Components
            }
        }

+        public void Initialize(IAuditService auditService, IUserService userService, IEntityService entityService)
+        {
+            _auditService = auditService;
+            _userService = userService;
+            _entityService = entityService;
+
+            //BackOfficeUserManager.AccountLocked += ;
+            //BackOfficeUserManager.AccountUnlocked += ;
+            BackOfficeUserManager.ForgotPasswordRequested += OnForgotPasswordRequest;
+            BackOfficeUserManager.ForgotPasswordChangedSuccess += OnForgotPasswordChange;
+            BackOfficeUserManager.LoginFailed += OnLoginFailed;
+            //BackOfficeUserManager.LoginRequiresVerification += ;
+            BackOfficeUserManager.LoginSuccess += OnLoginSuccess;
+            BackOfficeUserManager.LogoutSuccess += OnLogoutSuccess;
+            BackOfficeUserManager.PasswordChanged += OnPasswordChanged;
+            BackOfficeUserManager.PasswordReset += OnPasswordReset;
+            //BackOfficeUserManager.ResetAccessFailedCount += ;
+
+            UserService.SavedUserGroup += OnSavedUserGroupWithUsers;
+
+            UserService.SavedUser += OnSavedUser;
+            UserService.DeletedUser += OnDeletedUser;
+            UserService.UserGroupPermissionsAssigned += UserGroupPermissionAssigned;
+
+            MemberService.Saved += OnSavedMember;
+            MemberService.Deleted += OnDeletedMember;
+            MemberService.AssignedRoles += OnAssignedRoles;
+            MemberService.RemovedRoles += OnRemovedRoles;
+            MemberService.Exported += OnMemberExported;
+        }
+
        private string FormatEmail(IMember member)
        {
            return member == null ? string.Empty : member.Email.IsNullOrWhiteSpace() ? "" : $"<{member.Email}>";
@@ -248,6 +255,64 @@ namespace Umbraco.Core.Components
                    "umbraco/user/delete", "delete user");
        }

+        private void OnLoginSuccess(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs)
+            {
+                var performingUser = GetPerformingUser(identityArgs.PerformingUser);
+                WriteAudit(performingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/sign-in/login", "login success");
+            }
+        }
+
+        private void OnLogoutSuccess(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs)
+            {
+                var performingUser = GetPerformingUser(identityArgs.PerformingUser);
+                WriteAudit(performingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/sign-in/logout", "logout success");
+            }
+        }
+
+        private void OnPasswordReset(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/reset", "password reset");
+            }
+        }
+
+        private void OnPasswordChanged(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/change", "password change");
+            }
+        }
+
+        private void OnLoginFailed(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, 0, identityArgs.IpAddress, "umbraco/user/sign-in/failed", "login failed", affectedDetails: "");
+            }
+        }
+
+        private void OnForgotPasswordChange(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/forgot/change", "password forgot/change");
+            }
+        }
+
+        private void OnForgotPasswordRequest(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/forgot/request", "password forgot/request");
+            }
+        }
+
        private void WriteAudit(int performingId, int affectedId, string ipAddress, string eventType, string eventDetails, string affectedDetails = null)
        {
            var performingUser = _userService.GetUserById(performingId);
@@ -1,8 +1,10 @@
 using System;
+using System.ComponentModel;
 using System.Threading;
+using System.Web;
 using Umbraco.Core.Security;

-namespace Umbraco.Web.Security
+namespace Umbraco.Core.Auditing
 {
    /// <summary>
    /// This class is used by events raised from hthe BackofficeUserManager
@@ -44,6 +46,19 @@ namespace Umbraco.Web.Security
        /// </summary>
        public string Username { get; private set; }

+        [Obsolete("Use the method that has the affectedUser parameter instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IdentityAuditEventArgs(AuditEvent action, string ipAddress, int performingUser = -1)
+        {
+            DateTimeUtc = DateTime.UtcNow;
+            Action = action;
+
+            IpAddress = ipAddress;
+
+            PerformingUser = performingUser == -1
+                ? GetCurrentRequestBackofficeUserId()
+                : performingUser;
+        }

        /// <summary>
        /// Default constructor
@@ -18,7 +18,10 @@ namespace Umbraco.Core
            // this only gets called when an assembly can't be resolved
            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
        }
-        
+
+        private static readonly Regex Log4NetAssemblyPattern = new Regex("log4net, Version=([\\d\\.]+?), Culture=neutral, PublicKeyToken=\\w+$", RegexOptions.Compiled);
+        private const string Log4NetReplacement = "log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a";
+
        /// <summary>
        /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies
        /// </summary>
@@ -27,6 +30,12 @@ namespace Umbraco.Core
        /// <returns></returns>
        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
        {
+            //log4net:
+            if (Log4NetAssemblyPattern.IsMatch(args.Name) && args.Name != Log4NetReplacement)
+            {
+                return Assembly.Load(Log4NetAssemblyPattern.Replace(args.Name, Log4NetReplacement));
+            }
+
            //AutoMapper:
            // 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
@@ -0,0 +1,39 @@
+namespace Umbraco.Core
+{
+    public static class ByteArrayExtensions
+    {
+        private static readonly char[] BytesToHexStringLookup = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+
+        public static string ToHexString(this byte[] bytes)
+        {
+            int i = 0, p = 0, bytesLength = bytes.Length;
+            var chars = new char[bytesLength * 2];
+            while (i < bytesLength)
+            {
+                var b = bytes[i++];
+                chars[p++] = BytesToHexStringLookup[b / 0x10];
+                chars[p++] = BytesToHexStringLookup[b % 0x10];
+            }
+            return new string(chars, 0, chars.Length);
+        }
+
+        public static string ToHexString(this byte[] bytes, char separator, int blockSize, int blockCount)
+        {
+            int p = 0, bytesLength = bytes.Length, count = 0, size = 0;
+            var chars = new char[bytesLength * 2 + blockCount];
+            for (var i = 0; i < bytesLength; i++)
+            {
+                var b = bytes[i++];
+                chars[p++] = BytesToHexStringLookup[b / 0x10];
+                chars[p++] = BytesToHexStringLookup[b % 0x10];
+                if (count == blockCount) continue;
+                if (++size < blockSize) continue;
+
+                chars[p++] = '/';
+                size = 0;
+                count++;
+            }
+            return new string(chars, 0, chars.Length);
+        }
+    }
+}
@@ -1,13 +1,33 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Web;
+using System.Web.Caching;

 namespace Umbraco.Core.Cache
 {
    /// <summary>
-    /// Represents the application-wide caches.
+    /// Class that is exposed by the ApplicationContext for application wide caching purposes
    /// </summary>
    public class CacheHelper
    {
+        public static CacheHelper NoCache { get; } = new CacheHelper(NullCacheProvider.Instance, NullCacheProvider.Instance, NullCacheProvider.Instance, new IsolatedRuntimeCache(_ => NullCacheProvider.Instance));
+
+        /// <summary>
+        /// Creates a cache helper with disabled caches
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// Good for unit testing
+        /// </remarks>
+        public static CacheHelper CreateDisabledCacheHelper()
+        {
+            // do *not* return NoCache
+            // NoCache is a special instance that is detected by RepositoryBase and disables all cache policies
+            // CreateDisabledCacheHelper is used in tests to use no cache, *but* keep all cache policies
+            return new CacheHelper(NullCacheProvider.Instance, NullCacheProvider.Instance, NullCacheProvider.Instance, new IsolatedRuntimeCache(_ => NullCacheProvider.Instance));
+        }
+
        /// <summary>
        /// Initializes a new instance for use in the web
        /// </summary>
@@ -23,6 +43,7 @@ namespace Umbraco.Core.Cache
        /// <summary>
        /// Initializes a new instance for use in the web
        /// </summary>
+        /// <param name="cache"></param>
        public CacheHelper(System.Web.Caching.Cache cache)
            : this(
                new HttpRuntimeCacheProvider(cache),
@@ -32,39 +53,39 @@ namespace Umbraco.Core.Cache
        {
        }

+        [Obsolete("Use the constructor the specifies all dependencies")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public CacheHelper(
+            IRuntimeCacheProvider httpCacheProvider,
+            ICacheProvider staticCacheProvider,
+            ICacheProvider requestCacheProvider)
+            : this(httpCacheProvider, staticCacheProvider, requestCacheProvider, new IsolatedRuntimeCache(t => new ObjectCacheRuntimeCacheProvider()))
+        {
+        }
+
        /// <summary>
        /// Initializes a new instance based on the provided providers
        /// </summary>
+        /// <param name="httpCacheProvider"></param>
+        /// <param name="staticCacheProvider"></param>
+        /// <param name="requestCacheProvider"></param>
+        /// <param name="isolatedCacheManager"></param>
        public CacheHelper(
            IRuntimeCacheProvider httpCacheProvider,
            ICacheProvider staticCacheProvider,
            ICacheProvider requestCacheProvider,
            IsolatedRuntimeCache isolatedCacheManager)
        {
-            RuntimeCache = httpCacheProvider ?? throw new ArgumentNullException(nameof(httpCacheProvider));
-            StaticCache = staticCacheProvider ?? throw new ArgumentNullException(nameof(staticCacheProvider));
-            RequestCache = requestCacheProvider ?? throw new ArgumentNullException(nameof(requestCacheProvider));
-            IsolatedRuntimeCache = isolatedCacheManager ?? throw new ArgumentNullException(nameof(isolatedCacheManager));
+            if (httpCacheProvider == null) throw new ArgumentNullException("httpCacheProvider");
+            if (staticCacheProvider == null) throw new ArgumentNullException("staticCacheProvider");
+            if (requestCacheProvider == null) throw new ArgumentNullException("requestCacheProvider");
+            if (isolatedCacheManager == null) throw new ArgumentNullException("isolatedCacheManager");
+            RuntimeCache = httpCacheProvider;
+            StaticCache = staticCacheProvider;
+            RequestCache = requestCacheProvider;
+            IsolatedRuntimeCache = isolatedCacheManager;
        }

-        /// <summary>
-        /// Gets the special disabled instance.
-        /// </summary>
-        /// <remarks>
-        /// <para>When used by repositories, all cache policies apply, but the underlying caches do not cache anything.</para>
-        /// <para>Used by tests.</para>
-        /// </remarks>
-        public static CacheHelper Disabled { get; } = new CacheHelper(NullCacheProvider.Instance, NullCacheProvider.Instance, NullCacheProvider.Instance, new IsolatedRuntimeCache(_ => NullCacheProvider.Instance));
-
-        /// <summary>
-        /// Gets the special no-cache instance.
-        /// </summary>
-        /// <remarks>
-        /// <para>When used by repositories, all cache policies are bypassed.</para>
-        /// <para>Used by repositories that do no cache.</para>
-        /// </remarks>
-        public static CacheHelper NoCache { get; } = new CacheHelper(NullCacheProvider.Instance, NullCacheProvider.Instance, NullCacheProvider.Instance, new IsolatedRuntimeCache(_ => NullCacheProvider.Instance));
-
        /// <summary>
        /// Returns the current Request cache
        /// </summary>
@@ -85,6 +106,317 @@ namespace Umbraco.Core.Cache
        /// </summary>
        public IsolatedRuntimeCache IsolatedRuntimeCache { get; internal set; }

+        #region Legacy Runtime/Http Cache accessors
+
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache
+        /// </summary>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearAllCache()
+        {
+            RuntimeCache.ClearAllCache();
+            IsolatedRuntimeCache.ClearAllCaches();
+        }
+
+        /// <summary>
+        /// Clears the item in umbraco's runtime cache with the given key
+        /// </summary>
+        /// <param name="key">Key</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearCacheItem(string key)
+        {
+            RuntimeCache.ClearCacheItem(key);
+        }
+
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type name as the
+        /// input parameter. (using [object].GetType())
+        /// </summary>
+        /// <param name="typeName">The name of the System.Type which should be cleared from cache ex "System.Xml.XmlDocument"</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        public void ClearCacheObjectTypes(string typeName)
+        {
+            RuntimeCache.ClearCacheObjectTypes(typeName);
+        }
+
+        /// <summary>
+        /// Clears all objects in the System.Web.Cache with the System.Type specified
+        /// </summary>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearCacheObjectTypes<T>()
+        {
+            RuntimeCache.ClearCacheObjectTypes<T>();
+        }
+
+        /// <summary>
+        /// Clears all cache items that starts with the key passed.
+        /// </summary>
+        /// <param name="keyStartsWith">The start of the key</param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            RuntimeCache.ClearCacheByKeySearch(keyStartsWith);
+        }
+
+        /// <summary>
+        /// Clears all cache items that have a key that matches the regular expression
+        /// </summary>
+        /// <param name="regexString"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ClearCacheByKeyExpression(string regexString)
+        {
+            RuntimeCache.ClearCacheByKeyExpression(regexString);
+        }
+
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public IEnumerable<T> GetCacheItemsByKeySearch<T>(string keyStartsWith)
+        {
+            return RuntimeCache.GetCacheItemsByKeySearch<T>(keyStartsWith);
+        }
+
+        /// <summary>
+        /// Returns a cache item by key, does not update the cache if it isn't there.
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey);
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey, Func<TT> getCacheItem)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem);
+
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey,
+            TimeSpan timeout, Func<TT> getCacheItem)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout);
+
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemRemovedCallback refreshAction, TimeSpan timeout,
+            Func<TT> getCacheItem)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, removedCallback: refreshAction);
+
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority, CacheItemRemovedCallback refreshAction, TimeSpan timeout,
+            Func<TT> getCacheItem)
+        {
+            return RuntimeCache.GetCacheItem<TT>(cacheKey, getCacheItem, timeout, false, priority, refreshAction);
+
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with the specified absolute expiration date (from NOW)
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority,
+            CacheItemRemovedCallback refreshAction,
+            CacheDependency cacheDependency,
+            TimeSpan timeout,
+            Func<TT> getCacheItem)
+        {
+            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
+            if (cache != null)
+            {
+                var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+                return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
+            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+        }
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache
+        /// </summary>
+        /// <typeparam name="TT"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
+        public TT GetCacheItem<TT>(string cacheKey,
+            CacheItemPriority priority,
+            CacheDependency cacheDependency,
+            Func<TT> getCacheItem)
+        {
+            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
+            if (cache != null)
+            {
+                var result = cache.GetCacheItem(cacheKey, () => getCacheItem(), null, false, priority, null, cacheDependency);
+                return result == null ? default(TT) : result.TryConvertTo<TT>().Result;
+            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       Func<T> getCacheItem)
+        {
+            RuntimeCache.InsertCacheItem<T>(cacheKey, getCacheItem, priority: priority);
+
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, access the runtime cache from the RuntimeCache property")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       TimeSpan timeout,
+                                       Func<T> getCacheItem)
+        {
+            RuntimeCache.InsertCacheItem<T>(cacheKey, getCacheItem, timeout, priority: priority);
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       CacheDependency cacheDependency,
+                                       TimeSpan timeout,
+                                       Func<T> getCacheItem)
+        {
+            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
+            if (cache != null)
+            {
+                cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, null, cacheDependency);
+            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+        }
+
+        /// <summary>
+        /// Inserts an item into the cache, if it already exists in the cache it will be replaced
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cacheKey"></param>
+        /// <param name="priority"></param>
+        /// <param name="refreshAction"></param>
+        /// <param name="cacheDependency"></param>
+        /// <param name="timeout">This will set an absolute expiration from now until the timeout</param>
+        /// <param name="getCacheItem"></param>
+        [Obsolete("Do not use this method, we no longer support the caching overloads with references to CacheDependency, use the overloads specifying a file collection instead")]
+        public void InsertCacheItem<T>(string cacheKey,
+                                       CacheItemPriority priority,
+                                       CacheItemRemovedCallback refreshAction,
+                                       CacheDependency cacheDependency,
+                                       TimeSpan? timeout,
+                                       Func<T> getCacheItem)
+        {
+            var cache = GetHttpRuntimeCacheProvider(RuntimeCache);
+            if (cache != null)
+            {
+                cache.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, false, priority, refreshAction, cacheDependency);
+            }
+            throw new InvalidOperationException("Cannot use this obsoleted overload when the current provider is not of type " + typeof(HttpRuntimeCacheProvider));
+        }
+        #endregion
+
+        private HttpRuntimeCacheProvider GetHttpRuntimeCacheProvider(IRuntimeCacheProvider runtimeCache)
+        {
+            HttpRuntimeCacheProvider cache;
+            var wrapper = RuntimeCache as IRuntimeCacheProviderWrapper;
+            if (wrapper != null)
+            {
+                cache = wrapper.InnerProvider as HttpRuntimeCacheProvider;
+            }
+            else
+            {
+                cache = RuntimeCache as HttpRuntimeCacheProvider;
+            }
+            return cache;
+        }
    }

 }
@@ -1,15 +1,51 @@
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Constants storing cache keys used in caching
-    /// </summary>
-    public static class CacheKeys
-    {
-        public const string ApplicationTreeCacheKey = "ApplicationTreeCache"; // used by ApplicationTreeService
-        public const string ApplicationsCacheKey = "ApplicationCache"; // used by SectionService
-
-        public const string TemplateFrontEndCacheKey = "template"; // fixme usage?
-
-        public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
-    }
-}
+using System;
+using System.ComponentModel;
+using Umbraco.Core.CodeAnnotations;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Constants storing cache keys used in caching
+    /// </summary>
+    public static class CacheKeys
+    {
+        public const string ApplicationTreeCacheKey = "ApplicationTreeCache";
+        public const string ApplicationsCacheKey = "ApplicationCache";
+
+        [Obsolete("This is no longer used and will be removed from the codebase in the future")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public const string UserTypeCacheKey = "UserTypeCache";
+
+        [Obsolete("This is no longer used and will be removed from the codebase in the future - it is referenced but no cache is stored against this key")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public const string ContentItemCacheKey = "contentItem";
+
+        [UmbracoWillObsolete("This cache key is only used for the legacy 'library' caching, remove in v8")]
+        public const string MediaCacheKey = "UL_GetMedia";
+        
+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
+        public const string MacroCacheKey = "UmbracoMacroCache";
+
+        public const string MacroContentCacheKey = "macroContent_"; // for macro contents
+
+        [UmbracoWillObsolete("This cache key is only used for legacy 'library' member caching, remove in v8")]
+        public const string MemberLibraryCacheKey = "UL_GetMember";
+
+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
+        public const string MemberBusinessLogicCacheKey = "MemberCacheItem_";
+
+        [UmbracoWillObsolete("This cache key is only used for legacy template business logic caching, remove in v8")]
+        public const string TemplateFrontEndCacheKey = "template";
+
+        public const string UserContextTimeoutCacheKey = "UmbracoUserContextTimeout";
+
+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
+        public const string ContentTypeCacheKey = "UmbracoContentType";
+
+        [UmbracoWillObsolete("This cache key is only used for legacy business logic caching, remove in v8")]
+        public const string ContentTypePropertiesCacheKey = "ContentType_PropertyTypes_Content:";
+        
+        public const string IdToKeyCacheKey = "UI2K__";
+        public const string KeyToIdCacheKey = "UK2I__";
+    }
+}
@@ -1,70 +1,70 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Caching;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Extensions for strongly typed access
-    /// </summary>
-    public static class CacheProviderExtensions
-    {
-        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
-            string cacheKey,
-            Func<T> getCacheItem,
-            TimeSpan? timeout,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null)
-        {
-            var result = provider.GetCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
-            return result == null ? default(T) : result.TryConvertTo<T>().Result;
-        }
-
-        public static void InsertCacheItem<T>(this IRuntimeCacheProvider provider,
-            string cacheKey,
-            Func<T> getCacheItem,
-            TimeSpan? timeout = null,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null)
-        {
-            provider.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
-        }
-
-        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this ICacheProvider provider, string keyStartsWith)
-        {
-            var result = provider.GetCacheItemsByKeySearch(keyStartsWith);
-            return result.Select(x => x.TryConvertTo<T>().Result);
-        }
-
-        public static IEnumerable<T> GetCacheItemsByKeyExpression<T>(this ICacheProvider provider, string regexString)
-        {
-            var result = provider.GetCacheItemsByKeyExpression(regexString);
-            return result.Select(x => x.TryConvertTo<T>().Result);
-        }
-
-        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
-        {
-            var result = provider.GetCacheItem(cacheKey);
-            if (result == null)
-            {
-                return default(T);
-            }
-            return result.TryConvertTo<T>().Result;
-        }
-
-        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey, Func<T> getCacheItem)
-        {
-            var result = provider.GetCacheItem(cacheKey, () => getCacheItem());
-            if (result == null)
-            {
-                return default(T);
-            }
-            return result.TryConvertTo<T>().Result;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Extensions for strongly typed access
+    /// </summary>
+    public static class CacheProviderExtensions
+    {
+        public static T GetCacheItem<T>(this IRuntimeCacheProvider provider,
+            string cacheKey,
+            Func<T> getCacheItem,
+            TimeSpan? timeout,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null)
+        {
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            return result == null ? default(T) : result.TryConvertTo<T>().Result;
+        }
+
+        public static void InsertCacheItem<T>(this IRuntimeCacheProvider provider,
+            string cacheKey,
+            Func<T> getCacheItem,
+            TimeSpan? timeout = null,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null)
+        {
+            provider.InsertCacheItem(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+        }
+
+        public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this ICacheProvider provider, string keyStartsWith)
+        {
+            var result = provider.GetCacheItemsByKeySearch(keyStartsWith);
+            return result.Select(x => x.TryConvertTo<T>().Result);
+        }
+
+        public static IEnumerable<T> GetCacheItemsByKeyExpression<T>(this ICacheProvider provider, string regexString)
+        {
+            var result = provider.GetCacheItemsByKeyExpression(regexString);
+            return result.Select(x => x.TryConvertTo<T>().Result);
+        }
+
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey)
+        {
+            var result = provider.GetCacheItem(cacheKey);
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+
+        public static T GetCacheItem<T>(this ICacheProvider provider, string cacheKey, Func<T> getCacheItem)
+        {
+            var result = provider.GetCacheItem(cacheKey, () => getCacheItem());
+            if (result == null)
+            {
+                return default(T);
+            }
+            return result.TryConvertTo<T>().Result;
+        }
+    }
+}
@@ -1,120 +1,120 @@
-using System;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Sync;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A base class for cache refreshers that handles events.
-    /// </summary>
-    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
-    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
-    public abstract class CacheRefresherBase<TInstanceType> : ICacheRefresher
-        where TInstanceType : class, ICacheRefresher
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CacheRefresherBase{TInstanceType}"/>.
-        /// </summary>
-        /// <param name="cacheHelper">A cache helper.</param>
-        protected CacheRefresherBase(CacheHelper cacheHelper)
-        {
-            CacheHelper = cacheHelper;
-        }
-
-        /// <summary>
-        /// Triggers when the cache is updated on the server.
-        /// </summary>
-        /// <remarks>
-        /// Triggers on each server configured for an Umbraco project whenever a cache refresher is updated.
-        /// </remarks>
-        public static event TypedEventHandler<TInstanceType, CacheRefresherEventArgs> CacheUpdated;
-
-        #region Define
-
-        /// <summary>
-        /// Gets the typed 'this' for events.
-        /// </summary>
-        protected abstract TInstanceType This { get; }
-
-        /// <summary>
-        /// Gets the unique identifier of the refresher.
-        /// </summary>
-        public abstract Guid RefresherUniqueId { get; }
-
-        /// <summary>
-        /// Gets the name of the refresher.
-        /// </summary>
-        public abstract string Name { get; }
-
-        #endregion
-
-        #region Refresher
-
-        /// <summary>
-        /// Refreshes all entities.
-        /// </summary>
-        public virtual void RefreshAll()
-        {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(null, MessageType.RefreshAll));
-        }
-
-        /// <summary>
-        /// Refreshes an entity.
-        /// </summary>
-        /// <param name="id">The entity's identifier.</param>
-        public virtual void Refresh(int id)
-        {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RefreshById));
-        }
-
-        /// <summary>
-        /// Refreshes an entity.
-        /// </summary>
-        /// <param name="id">The entity's identifier.</param>
-        public virtual void Refresh(Guid id)
-        {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RefreshById));
-        }
-
-        /// <summary>
-        /// Removes an entity.
-        /// </summary>
-        /// <param name="id">The entity's identifier.</param>
-        public virtual void Remove(int id)
-        {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RemoveById));
-        }
-
-        #endregion
-
-        #region Protected
-
-        /// <summary>
-        /// Gets the cache helper.
-        /// </summary>
-        protected CacheHelper CacheHelper { get; }
-
-        /// <summary>
-        /// Clears the cache for all repository entities of a specified type.
-        /// </summary>
-        /// <typeparam name="TEntity">The type of the entities.</typeparam>
-        protected void ClearAllIsolatedCacheByEntityType<TEntity>()
-            where TEntity : class, IEntity
-        {
-            CacheHelper.IsolatedRuntimeCache.ClearCache<TEntity>();
-        }
-
-        /// <summary>
-        /// Raises the CacheUpdated event.
-        /// </summary>
-        /// <param name="sender">The event sender.</param>
-        /// <param name="args">The event arguments.</param>
-        protected static void OnCacheUpdated(TInstanceType sender, CacheRefresherEventArgs args)
-        {
-            CacheUpdated?.Invoke(sender, args);
-        }
-
-        #endregion
-    }
-}
+using System;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Sync;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A base class for cache refreshers that handles events.
+    /// </summary>
+    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
+    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
+    public abstract class CacheRefresherBase<TInstanceType> : ICacheRefresher
+        where TInstanceType : class, ICacheRefresher
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CacheRefresherBase{TInstanceType}"/>.
+        /// </summary>
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected CacheRefresherBase(CacheHelper cacheHelper)
+        {
+            CacheHelper = cacheHelper;
+        }
+
+        /// <summary>
+        /// Triggers when the cache is updated on the server.
+        /// </summary>
+        /// <remarks>
+        /// Triggers on each server configured for an Umbraco project whenever a cache refresher is updated.
+        /// </remarks>
+        public static event TypedEventHandler<TInstanceType, CacheRefresherEventArgs> CacheUpdated;
+
+        #region Define
+
+        /// <summary>
+        /// Gets the typed 'this' for events.
+        /// </summary>
+        protected abstract TInstanceType This { get; }
+
+        /// <summary>
+        /// Gets the unique identifier of the refresher.
+        /// </summary>
+        public abstract Guid RefresherUniqueId { get; }
+
+        /// <summary>
+        /// Gets the name of the refresher.
+        /// </summary>
+        public abstract string Name { get; }
+
+        #endregion
+
+        #region Refresher
+
+        /// <summary>
+        /// Refreshes all entities.
+        /// </summary>
+        public virtual void RefreshAll()
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(null, MessageType.RefreshAll));
+        }
+
+        /// <summary>
+        /// Refreshes an entity.
+        /// </summary>
+        /// <param name="id">The entity's identifier.</param>
+        public virtual void Refresh(int id)
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RefreshById));
+        }
+
+        /// <summary>
+        /// Refreshes an entity.
+        /// </summary>
+        /// <param name="id">The entity's identifier.</param>
+        public virtual void Refresh(Guid id)
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RefreshById));
+        }
+
+        /// <summary>
+        /// Removes an entity.
+        /// </summary>
+        /// <param name="id">The entity's identifier.</param>
+        public virtual void Remove(int id)
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RemoveById));
+        }
+
+        #endregion
+
+        #region Protected
+
+        /// <summary>
+        /// Gets the cache helper.
+        /// </summary>
+        protected CacheHelper CacheHelper { get; }
+
+        /// <summary>
+        /// Clears the cache for all repository entities of a specified type.
+        /// </summary>
+        /// <typeparam name="TEntity">The type of the entities.</typeparam>
+        protected void ClearAllIsolatedCacheByEntityType<TEntity>()
+            where TEntity : class, IEntity
+        {
+            CacheHelper.IsolatedRuntimeCache.ClearCache<TEntity>();
+        }
+
+        /// <summary>
+        /// Raises the CacheUpdated event.
+        /// </summary>
+        /// <param name="sender">The event sender.</param>
+        /// <param name="args">The event arguments.</param>
+        protected static void OnCacheUpdated(TInstanceType sender, CacheRefresherEventArgs args)
+        {
+            CacheUpdated?.Invoke(sender, args);
+        }
+
+        #endregion
+    }
+}
@@ -1,9 +1,15 @@
-using Umbraco.Core.Composing;
+using System.Collections.Generic;
+using LightInject;
+using Umbraco.Core.Composing;

 namespace Umbraco.Core.Cache
 {
    public class CacheRefresherCollectionBuilder : LazyCollectionBuilderBase<CacheRefresherCollectionBuilder, CacheRefresherCollection, ICacheRefresher>
    {
+        public CacheRefresherCollectionBuilder(IServiceContainer container)
+            : base(container)
+        { }
+
        protected override CacheRefresherCollectionBuilder This => this;
    }
 }
@@ -1,19 +1,19 @@
-using System;
-using Umbraco.Core.Sync;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Event args for cache refresher updates
-    /// </summary>
-    public class CacheRefresherEventArgs : EventArgs
-    {
-        public CacheRefresherEventArgs(object msgObject, MessageType type)
-        {
-            MessageType = type;
-            MessageObject = msgObject;
-        }
-        public object MessageObject { get; private set; }
-        public MessageType MessageType { get; private set; }
-    }
-}
+using System;
+using Umbraco.Core.Sync;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Event args for cache refresher updates
+    /// </summary>
+    public class CacheRefresherEventArgs : EventArgs
+    {
+        public CacheRefresherEventArgs(object msgObject, MessageType type)
+        {
+            MessageType = type;
+            MessageObject = msgObject;
+        }
+        public object MessageObject { get; private set; }
+        public MessageType MessageType { get; private set; }
+    }
+}
@@ -1,313 +1,313 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.ExceptionServices;
-using System.Text.RegularExpressions;
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Cache
-{
-    internal abstract class DictionaryCacheProviderBase : ICacheProvider
-    {
-        // prefix cache keys so we know which one are ours
-        protected const string CacheItemPrefix = "umbrtmche";
-
-        // an object that represent a value that has not been created yet
-        protected internal static readonly object ValueNotCreated = new object();
-
-        // manupulate the underlying cache entries
-        // these *must* be called from within the appropriate locks
-        // and use the full prefixed cache keys
-        protected abstract IEnumerable<DictionaryEntry> GetDictionaryEntries();
-        protected abstract void RemoveEntry(string key);
-        protected abstract object GetEntry(string key);
-
-        // read-write lock the underlying cache
-        //protected abstract IDisposable ReadLock { get; }
-        //protected abstract IDisposable WriteLock { get; }
-
-        protected abstract void EnterReadLock();
-        protected abstract void ExitReadLock();
-        protected abstract void EnterWriteLock();
-        protected abstract void ExitWriteLock();
-
-        protected string GetCacheKey(string key)
-        {
-            return string.Format("{0}-{1}", CacheItemPrefix, key);
-        }
-
-        protected internal static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
-        {
-            // try to generate the value and if it fails,
-            // wrap in an ExceptionHolder - would be much simpler
-            // to just use lazy.IsValueFaulted alas that field is
-            // internal
-            return new Lazy<object>(() =>
-            {
-                try
-                {
-                    return getCacheItem();
-                }
-                catch (Exception e)
-                {
-                    return new ExceptionHolder(ExceptionDispatchInfo.Capture(e));
-                }
-            });
-        }
-
-        protected internal static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
-        {
-            // if onlyIfValueIsCreated, do not trigger value creation
-            // must return something, though, to differenciate from null values
-            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
-
-            // if execution has thrown then lazy.IsValueCreated is false
-            // and lazy.IsValueFaulted is true (but internal) so we use our
-            // own exception holder (see Lazy<T> source code) to return null
-            if (lazy.Value is ExceptionHolder) return null;
-
-            // we have a value and execution has not thrown so returning
-            // here does not throw - unless we're re-entering, take care of it
-            try
-            {
-                return lazy.Value;
-            }
-            catch (InvalidOperationException e)
-            {
-                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
-            }
-        }
-
-        internal class ExceptionHolder
-        {
-            public ExceptionHolder(ExceptionDispatchInfo e)
-            {
-                Exception = e;
-            }
-
-            public ExceptionDispatchInfo Exception { get; }
-        }
-
-        #region Clear
-
-        public virtual void ClearAllCache()
-        {
-            try
-            {
-                EnterWriteLock();
-                foreach (var entry in GetDictionaryEntries()
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheItem(string key)
-        {
-            var cacheKey = GetCacheKey(key);
-            try
-            {
-                EnterWriteLock();
-                RemoveEntry(cacheKey);
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes(string typeName)
-        {
-            var type = TypeFinder.GetTypeByName(typeName);
-            if (type == null) return;
-            var isInterface = type.IsInterface;
-            try
-            {
-                EnterWriteLock();
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x =>
-                    {
-                        // entry.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
-
-                        // if T is an interface remove anything that implements that interface
-                        // otherwise remove exact types (not inherited types)
-                        return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
-                    })
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>()
-        {
-            var typeOfT = typeof(T);
-            var isInterface = typeOfT.IsInterface;
-            try
-            {
-                EnterWriteLock();
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x =>
-                    {
-                        // entry.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // compare on exact type, don't use "is"
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
-
-                        // if T is an interface remove anything that implements that interface
-                        // otherwise remove exact types (not inherited types)
-                        return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
-                    })
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        {
-            var typeOfT = typeof(T);
-            var isInterface = typeOfT.IsInterface;
-            var plen = CacheItemPrefix.Length + 1;
-            try
-            {
-                EnterWriteLock();
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x =>
-                    {
-                        // entry.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // compare on exact type, don't use "is"
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
-                        if (value == null) return true;
-
-                        // if T is an interface remove anything that implements that interface
-                        // otherwise remove exact types (not inherited types)
-                        return (isInterface ? (value is T) : (value.GetType() == typeOfT))
-                               // run predicate on the 'public key' part only, ie without prefix
-                               && predicate(((string) x.Key).Substring(plen), (T) value);
-                    }))
-                    RemoveEntry((string) entry.Key);
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            var plen = CacheItemPrefix.Length + 1;
-            try
-            {
-                EnterWriteLock();
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheByKeyExpression(string regexString)
-        {
-            var plen = CacheItemPrefix.Length + 1;
-            try
-            {
-                EnterWriteLock();
-                foreach (var entry in GetDictionaryEntries()
-                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
-                    .ToArray())
-                    RemoveEntry((string) entry.Key);
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-        }
-
-        #endregion
-
-        #region Get
-
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            var plen = CacheItemPrefix.Length + 1;
-            IEnumerable<DictionaryEntry> entries;
-            try
-            {
-                EnterReadLock();
-                entries = GetDictionaryEntries()
-                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
-                    .ToArray(); // evaluate while locked
-            }
-            finally
-            {
-                ExitReadLock();
-            }
-
-            return entries
-                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                    .Where(x => x != null); // backward compat, don't store null values in the cache
-        }
-
-        public virtual IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
-        {
-            const string prefix = CacheItemPrefix + "-";
-            var plen = prefix.Length;
-            IEnumerable<DictionaryEntry> entries;
-            try
-            {
-                EnterReadLock();
-                entries = GetDictionaryEntries()
-                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
-                    .ToArray(); // evaluate while locked
-            }
-            finally
-            {
-                ExitReadLock();
-            }
-            return entries
-                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                    .Where(x => x != null); // backward compat, don't store null values in the cache
-        }
-
-        public virtual object GetCacheItem(string cacheKey)
-        {
-            cacheKey = GetCacheKey(cacheKey);
-            Lazy<object> result;
-            try
-            {
-                EnterReadLock();
-                result = GetEntry(cacheKey) as Lazy<object>; // null if key not found
-            }
-            finally
-            {
-                ExitReadLock();
-            }
-            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
-        }
-
-        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);
-
-        #endregion
-    }
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.ExceptionServices;
+using System.Text.RegularExpressions;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Cache
+{
+    internal abstract class DictionaryCacheProviderBase : ICacheProvider
+    {
+        // prefix cache keys so we know which one are ours
+        protected const string CacheItemPrefix = "umbrtmche";
+
+        // an object that represent a value that has not been created yet
+        protected internal static readonly object ValueNotCreated = new object();
+
+        // manupulate the underlying cache entries
+        // these *must* be called from within the appropriate locks
+        // and use the full prefixed cache keys
+        protected abstract IEnumerable<DictionaryEntry> GetDictionaryEntries();
+        protected abstract void RemoveEntry(string key);
+        protected abstract object GetEntry(string key);
+
+        // read-write lock the underlying cache
+        //protected abstract IDisposable ReadLock { get; }
+        //protected abstract IDisposable WriteLock { get; }
+
+        protected abstract void EnterReadLock();
+        protected abstract void ExitReadLock();
+        protected abstract void EnterWriteLock();
+        protected abstract void ExitWriteLock();
+
+        protected string GetCacheKey(string key)
+        {
+            return string.Format("{0}-{1}", CacheItemPrefix, key);
+        }
+
+        protected internal static Lazy<object> GetSafeLazy(Func<object> getCacheItem)
+        {
+            // try to generate the value and if it fails,
+            // wrap in an ExceptionHolder - would be much simpler
+            // to just use lazy.IsValueFaulted alas that field is
+            // internal
+            return new Lazy<object>(() =>
+            {
+                try
+                {
+                    return getCacheItem();
+                }
+                catch (Exception e)
+                {
+                    return new ExceptionHolder(ExceptionDispatchInfo.Capture(e));
+                }
+            });
+        }
+
+        protected internal static object GetSafeLazyValue(Lazy<object> lazy, bool onlyIfValueIsCreated = false)
+        {
+            // if onlyIfValueIsCreated, do not trigger value creation
+            // must return something, though, to differenciate from null values
+            if (onlyIfValueIsCreated && lazy.IsValueCreated == false) return ValueNotCreated;
+
+            // if execution has thrown then lazy.IsValueCreated is false
+            // and lazy.IsValueFaulted is true (but internal) so we use our
+            // own exception holder (see Lazy<T> source code) to return null
+            if (lazy.Value is ExceptionHolder) return null;
+
+            // we have a value and execution has not thrown so returning
+            // here does not throw - unless we're re-entering, take care of it
+            try
+            {
+                return lazy.Value;
+            }
+            catch (InvalidOperationException e)
+            {
+                throw new InvalidOperationException("The method that computes a value for the cache has tried to read that value from the cache.", e);
+            }
+        }
+
+        internal class ExceptionHolder
+        {
+            public ExceptionHolder(ExceptionDispatchInfo e)
+            {
+                Exception = e;
+            }
+
+            public ExceptionDispatchInfo Exception { get; }
+        }
+
+        #region Clear
+
+        public virtual void ClearAllCache()
+        {
+            try
+            {
+                EnterWriteLock();
+                foreach (var entry in GetDictionaryEntries()
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheItem(string key)
+        {
+            var cacheKey = GetCacheKey(key);
+            try
+            {
+                EnterWriteLock();
+                RemoveEntry(cacheKey);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            var type = TypeFinder.GetTypeByName(typeName);
+            if (type == null) return;
+            var isInterface = type.IsInterface;
+            try
+            {
+                EnterWriteLock();
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
+                    })
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            var typeOfT = typeof(T);
+            var isInterface = typeOfT.IsInterface;
+            try
+            {
+                EnterWriteLock();
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // compare on exact type, don't use "is"
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
+                    })
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            var typeOfT = typeof(T);
+            var isInterface = typeOfT.IsInterface;
+            var plen = CacheItemPrefix.Length + 1;
+            try
+            {
+                EnterWriteLock();
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x =>
+                    {
+                        // entry.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // compare on exact type, don't use "is"
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = GetSafeLazyValue((Lazy<object>) x.Value, true);
+                        if (value == null) return true;
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return (isInterface ? (value is T) : (value.GetType() == typeOfT))
+                               // run predicate on the 'public key' part only, ie without prefix
+                               && predicate(((string) x.Key).Substring(plen), (T) value);
+                    }))
+                    RemoveEntry((string) entry.Key);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            try
+            {
+                EnterWriteLock();
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            try
+            {
+                EnterWriteLock();
+                foreach (var entry in GetDictionaryEntries()
+                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
+                    .ToArray())
+                    RemoveEntry((string) entry.Key);
+            }
+            finally
+            {
+                ExitWriteLock();
+            }
+        }
+
+        #endregion
+
+        #region Get
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            var plen = CacheItemPrefix.Length + 1;
+            IEnumerable<DictionaryEntry> entries;
+            try
+            {
+                EnterReadLock();
+                entries = GetDictionaryEntries()
+                    .Where(x => ((string)x.Key).Substring(plen).InvariantStartsWith(keyStartsWith))
+                    .ToArray(); // evaluate while locked
+            }
+            finally
+            {
+                ExitReadLock();
+            }
+
+            return entries
+                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                    .Where(x => x != null); // backward compat, don't store null values in the cache
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            const string prefix = CacheItemPrefix + "-";
+            var plen = prefix.Length;
+            IEnumerable<DictionaryEntry> entries;
+            try
+            {
+                EnterReadLock();
+                entries = GetDictionaryEntries()
+                    .Where(x => Regex.IsMatch(((string)x.Key).Substring(plen), regexString))
+                    .ToArray(); // evaluate while locked
+            }
+            finally
+            {
+                ExitReadLock();
+            }
+            return entries
+                    .Select(x => GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                    .Where(x => x != null); // backward compat, don't store null values in the cache
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            cacheKey = GetCacheKey(cacheKey);
+            Lazy<object> result;
+            try
+            {
+                EnterReadLock();
+                result = GetEntry(cacheKey) as Lazy<object>; // null if key not found
+            }
+            finally
+            {
+                ExitReadLock();
+            }
+            return result == null ? null : GetSafeLazyValue(result); // return exceptions as null
+        }
+
+        public abstract object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+
+        #endregion
+    }
+}
@@ -1,161 +1,161 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A cache provider that caches items in the HttpContext.Items
-    /// </summary>
-    /// <remarks>
-    /// If the Items collection is null, then this provider has no effect
-    /// </remarks>
-    internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
-    {
-        // context provider
-        // the idea is that there is only one, application-wide HttpRequestCacheProvider instance,
-        // that is initialized with a method that returns the "current" context.
-        // NOTE
-        //   but then it is initialized with () => new HttpContextWrapper(HttpContent.Current)
-        //   which is higly inefficient because it creates a new wrapper each time we refer to _context()
-        //   so replace it with _context1 and _context2 below + a way to get context.Items.
-        //private readonly Func<HttpContextBase> _context;
-
-        // NOTE
-        //   and then in almost 100% cases _context2 will be () => HttpContext.Current
-        //   so why not bring that logic in here and fallback on to HttpContext.Current when
-        //   _context1 is null?
-        //private readonly HttpContextBase _context1;
-        //private readonly Func<HttpContext> _context2;
-        private readonly HttpContextBase _context;
-
-        private IDictionary ContextItems
-        {
-            //get { return _context1 != null ? _context1.Items : _context2().Items; }
-            get { return _context != null ? _context.Items : HttpContext.Current.Items; }
-        }
-
-        private bool HasContextItems
-        {
-            get { return (_context != null && _context.Items != null) || HttpContext.Current != null; }
-        }
-
-        // for unit tests
-        public HttpRequestCacheProvider(HttpContextBase context)
-        {
-            _context = context;
-        }
-
-        // main constructor
-        // will use HttpContext.Current
-        public HttpRequestCacheProvider(/*Func<HttpContext> context*/)
-        {
-            //_context2 = context;
-        }
-
-        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
-        {
-            const string prefix = CacheItemPrefix + "-";
-
-            if (HasContextItems == false) return Enumerable.Empty<DictionaryEntry>();
-
-            return ContextItems.Cast<DictionaryEntry>()
-                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
-        }
-
-        protected override void RemoveEntry(string key)
-        {
-            if (HasContextItems == false) return;
-
-            ContextItems.Remove(key);
-        }
-
-        protected override object GetEntry(string key)
-        {
-            return HasContextItems ? ContextItems[key] : null;
-        }
-
-        #region Lock
-
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache provider that caches items in the HttpContext.Items
+    /// </summary>
+    /// <remarks>
+    /// If the Items collection is null, then this provider has no effect
+    /// </remarks>
+    internal class HttpRequestCacheProvider : DictionaryCacheProviderBase
+    {
+        // context provider
+        // the idea is that there is only one, application-wide HttpRequestCacheProvider instance,
+        // that is initialized with a method that returns the "current" context.
+        // NOTE
+        //   but then it is initialized with () => new HttpContextWrapper(HttpContent.Current)
+        //   which is higly inefficient because it creates a new wrapper each time we refer to _context()
+        //   so replace it with _context1 and _context2 below + a way to get context.Items.
+        //private readonly Func<HttpContextBase> _context;
+
+        // NOTE
+        //   and then in almost 100% cases _context2 will be () => HttpContext.Current
+        //   so why not bring that logic in here and fallback on to HttpContext.Current when
+        //   _context1 is null?
+        //private readonly HttpContextBase _context1;
+        //private readonly Func<HttpContext> _context2;
+        private readonly HttpContextBase _context;
+
+        private IDictionary ContextItems
+        {
+            //get { return _context1 != null ? _context1.Items : _context2().Items; }
+            get { return _context != null ? _context.Items : HttpContext.Current.Items; }
+        }
+
+        private bool HasContextItems
+        {
+            get { return (_context != null && _context.Items != null) || HttpContext.Current != null; }
+        }
+
+        // for unit tests
+        public HttpRequestCacheProvider(HttpContextBase context)
+        {
+            _context = context;
+        }
+
+        // main constructor
+        // will use HttpContext.Current
+        public HttpRequestCacheProvider(/*Func<HttpContext> context*/)
+        {
+            //_context2 = context;
+        }
+
+        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
+        {
+            const string prefix = CacheItemPrefix + "-";
+
+            if (HasContextItems == false) return Enumerable.Empty<DictionaryEntry>();
+
+            return ContextItems.Cast<DictionaryEntry>()
+                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
+        }
+
+        protected override void RemoveEntry(string key)
+        {
+            if (HasContextItems == false) return;
+
+            ContextItems.Remove(key);
+        }
+
+        protected override object GetEntry(string key)
+        {
+            return HasContextItems ? ContextItems[key] : null;
+        }
+
+        #region Lock
+
        private bool _entered;
-
-        protected override void EnterReadLock() => EnterWriteLock();
-
-        protected override void EnterWriteLock()
-        {
-            if (HasContextItems)
-            {
-                System.Threading.Monitor.Enter(ContextItems.SyncRoot, ref _entered);
-            }
-        }
-
-        protected override void ExitReadLock() => ExitWriteLock();
-
-        protected override void ExitWriteLock()
-        {
-            if (_entered)
-            {
-                _entered = false;
+
+        protected override void EnterReadLock() => EnterWriteLock();
+
+        protected override void EnterWriteLock()
+        {
+            if (HasContextItems)
+            {
+                System.Threading.Monitor.Enter(ContextItems.SyncRoot, ref _entered);
+            }
+        }
+
+        protected override void ExitReadLock() => ExitWriteLock();
+
+        protected override void ExitWriteLock()
+        {
+            if (_entered)
+            {
+                _entered = false;
                System.Threading.Monitor.Exit(ContextItems.SyncRoot);
+            }
+        }
+
+        #endregion
+
+        #region Get
+
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            //no place to cache so just return the callback result
+            if (HasContextItems == false) return getCacheItem();
+
+            cacheKey = GetCacheKey(cacheKey);
+
+            Lazy<object> result;
+
+            try
+            {
+                EnterWriteLock();
+                result = ContextItems[cacheKey] as Lazy<object>; // null if key not found
+
+                // cannot create value within the lock, so if result.IsValueCreated is false, just
+                // do nothing here - means that if creation throws, a race condition could cause
+                // more than one thread to reach the return statement below and throw - accepted.
+
+                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = GetSafeLazy(getCacheItem);
+                    ContextItems[cacheKey] = result;
+                }
+            }
+            finally
+            {
+                ExitWriteLock();
            }
-        }
-
-        #endregion
-
-        #region Get
-
-        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
-        {
-            //no place to cache so just return the callback result
-            if (HasContextItems == false) return getCacheItem();
-
-            cacheKey = GetCacheKey(cacheKey);
-
-            Lazy<object> result;
-
-            try
-            {
-                EnterWriteLock();
-                result = ContextItems[cacheKey] as Lazy<object>; // null if key not found
-
-                // cannot create value within the lock, so if result.IsValueCreated is false, just
-                // do nothing here - means that if creation throws, a race condition could cause
-                // more than one thread to reach the return statement below and throw - accepted.
-
-                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
-                {
-                    result = GetSafeLazy(getCacheItem);
-                    ContextItems[cacheKey] = result;
-                }
-            }
-            finally
-            {
-                ExitWriteLock();
-            }
-
-            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
-            // exceptions (but try again and again) and silently eat them - however at
-            // some point we have to report them - so need to re-throw here
-
-            // this does not throw anymore
-            //return result.Value;
-
-            var value = result.Value; // will not throw (safe lazy)
-            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
-            return value;
-        }
-
-        #endregion
-
-        #region Insert
-        #endregion
-
-        private class NoopLocker : DisposableObjectSlim
-        {
-            protected override void DisposeResources()
-            { }
-        }
-    }
-}
+
+            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
+            // exceptions (but try again and again) and silently eat them - however at
+            // some point we have to report them - so need to re-throw here
+
+            // this does not throw anymore
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
+            return value;
+        }
+
+        #endregion
+
+        #region Insert
+        #endregion
+
+        private class NoopLocker : DisposableObjectSlim
+        {
+            protected override void DisposeResources()
+            { }
+        }
+    }
+}
@@ -1,241 +1,241 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Web.Caching;
-using CacheItemPriority = System.Web.Caching.CacheItemPriority;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A CacheProvider that wraps the logic of the HttpRuntime.Cache
-    /// </summary>
-    internal class HttpRuntimeCacheProvider : DictionaryCacheProviderBase, IRuntimeCacheProvider
-    {
-        // locker object that supports upgradeable read locking
-        // does not need to support recursion if we implement the cache correctly and ensure
-        // that methods cannot be reentrant, ie we do NOT create values while holding a lock.
-        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
-
-        private readonly System.Web.Caching.Cache _cache;
-
-        /// <summary>
-        /// Used for debugging
-        /// </summary>
-        internal Guid InstanceId { get; private set; }
-
-        public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
-        {
-            _cache = cache;
-            InstanceId = Guid.NewGuid();
-        }
-
-        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
-        {
-            const string prefix = CacheItemPrefix + "-";
-            return _cache.Cast<DictionaryEntry>()
-                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
-        }
-
-        protected override void RemoveEntry(string key)
-        {
-            _cache.Remove(key);
-        }
-
-        protected override object GetEntry(string key)
-        {
-            return _cache.Get(key);
-        }
-
-        #region Lock
-
-        protected override void EnterReadLock()
-        {
-            _locker.EnterReadLock();
-        }
-
-        protected override void EnterWriteLock()
-        {
-            _locker.EnterWriteLock();;
-        }
-
-        protected override void ExitReadLock()
-        {
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Web.Caching;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A CacheProvider that wraps the logic of the HttpRuntime.Cache
+    /// </summary>
+    internal class HttpRuntimeCacheProvider : DictionaryCacheProviderBase, IRuntimeCacheProvider
+    {
+        // locker object that supports upgradeable read locking
+        // does not need to support recursion if we implement the cache correctly and ensure
+        // that methods cannot be reentrant, ie we do NOT create values while holding a lock.
+        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
+
+        private readonly System.Web.Caching.Cache _cache;
+
+        /// <summary>
+        /// Used for debugging
+        /// </summary>
+        internal Guid InstanceId { get; private set; }
+
+        public HttpRuntimeCacheProvider(System.Web.Caching.Cache cache)
+        {
+            _cache = cache;
+            InstanceId = Guid.NewGuid();
+        }
+
+        protected override IEnumerable<DictionaryEntry> GetDictionaryEntries()
+        {
+            const string prefix = CacheItemPrefix + "-";
+            return _cache.Cast<DictionaryEntry>()
+                .Where(x => x.Key is string && ((string)x.Key).StartsWith(prefix));
+        }
+
+        protected override void RemoveEntry(string key)
+        {
+            _cache.Remove(key);
+        }
+
+        protected override object GetEntry(string key)
+        {
+            return _cache.Get(key);
+        }
+
+        #region Lock
+
+        protected override void EnterReadLock()
+        {
+            _locker.EnterReadLock();
+        }
+
+        protected override void EnterWriteLock()
+        {
+            _locker.EnterWriteLock();;
+        }
+
+        protected override void ExitReadLock()
+        {
            if (_locker.IsReadLockHeld)
-                _locker.ExitReadLock();
-        }
-
-        protected override void ExitWriteLock()
-        {
+                _locker.ExitReadLock();
+        }
+
+        protected override void ExitWriteLock()
+        {
            if (_locker.IsWriteLockHeld)
-                _locker.ExitWriteLock();
-        }
-
-        #endregion
-
-        #region Get
-
-        /// <summary>
-        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <param name="getCacheItem"></param>
-        /// <returns></returns>
-        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
-        {
-            return GetCacheItem(cacheKey, getCacheItem, null, dependentFiles: null);
-        }
-
-        /// <summary>
-        /// This overload is here for legacy purposes
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <param name="getCacheItem"></param>
-        /// <param name="timeout"></param>
-        /// <param name="isSliding"></param>
-        /// <param name="priority"></param>
-        /// <param name="removedCallback"></param>
-        /// <param name="dependency"></param>
-        /// <returns></returns>
-        internal object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
-        {
-            cacheKey = GetCacheKey(cacheKey);
-
-            // NOTE - because we don't know what getCacheItem does, how long it will take and whether it will hang,
-            // getCacheItem should run OUTSIDE of the global application lock else we run into lock contention and
-            // nasty performance issues.
-
-            // So.... we insert a Lazy<object> in the cache while holding the global application lock, and then rely
-            // on the Lazy lock to ensure that getCacheItem runs once and everybody waits on it, while the global
-            // application lock has been released.
-
-            // NOTE
-            //   The Lazy value creation may produce a null value.
-            //   Must make sure (for backward compatibility) that we pretend they are not in the cache.
-            //   So if we find an entry in the cache that already has its value created and is null,
-            //   pretend it was not there. If value is not already created, wait... and return null, that's
-            //   what prior code did.
-
-            // NOTE
-            //   The Lazy value creation may throw.
-
-            // So... the null value _will_ be in the cache but never returned
-
-            Lazy<object> result;
-
-            // Fast!
-            // Only one thread can enter an UpgradeableReadLock at a time, but it does not prevent other
-            // threads to enter a ReadLock in the meantime -- only upgrading to WriteLock will prevent all
-            // reads. We first try with a normal ReadLock for maximum concurrency and take the penalty of
-            // having to re-lock in case there's no value. Would need to benchmark to figure out whether
-            // it's worth it, though...
-            try
-            {
-                _locker.EnterReadLock();
-                result = _cache.Get(cacheKey) as Lazy<object>; // null if key not found
-            }
-            finally
-            {
+                _locker.ExitWriteLock();
+        }
+
+        #endregion
+
+        #region Get
+
+        /// <summary>
+        /// Gets (and adds if necessary) an item from the cache with all of the default parameters
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <returns></returns>
+        public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, getCacheItem, null, dependentFiles: null);
+        }
+
+        /// <summary>
+        /// This overload is here for legacy purposes
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <param name="timeout"></param>
+        /// <param name="isSliding"></param>
+        /// <param name="priority"></param>
+        /// <param name="removedCallback"></param>
+        /// <param name="dependency"></param>
+        /// <returns></returns>
+        internal object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        {
+            cacheKey = GetCacheKey(cacheKey);
+
+            // NOTE - because we don't know what getCacheItem does, how long it will take and whether it will hang,
+            // getCacheItem should run OUTSIDE of the global application lock else we run into lock contention and
+            // nasty performance issues.
+
+            // So.... we insert a Lazy<object> in the cache while holding the global application lock, and then rely
+            // on the Lazy lock to ensure that getCacheItem runs once and everybody waits on it, while the global
+            // application lock has been released.
+
+            // NOTE
+            //   The Lazy value creation may produce a null value.
+            //   Must make sure (for backward compatibility) that we pretend they are not in the cache.
+            //   So if we find an entry in the cache that already has its value created and is null,
+            //   pretend it was not there. If value is not already created, wait... and return null, that's
+            //   what prior code did.
+
+            // NOTE
+            //   The Lazy value creation may throw.
+
+            // So... the null value _will_ be in the cache but never returned
+
+            Lazy<object> result;
+
+            // Fast!
+            // Only one thread can enter an UpgradeableReadLock at a time, but it does not prevent other
+            // threads to enter a ReadLock in the meantime -- only upgrading to WriteLock will prevent all
+            // reads. We first try with a normal ReadLock for maximum concurrency and take the penalty of
+            // having to re-lock in case there's no value. Would need to benchmark to figure out whether
+            // it's worth it, though...
+            try
+            {
+                _locker.EnterReadLock();
+                result = _cache.Get(cacheKey) as Lazy<object>; // null if key not found
+            }
+            finally
+            {
                if (_locker.IsReadLockHeld)
-                    _locker.ExitReadLock();
-            }
-            var value = result == null ? null : GetSafeLazyValue(result);
-            if (value != null) return value;
-
-            using (var lck = new UpgradeableReadLock(_locker))
-            {
-                result = _cache.Get(cacheKey) as Lazy<object>; // null if key not found
-
-                // cannot create value within the lock, so if result.IsValueCreated is false, just
-                // do nothing here - means that if creation throws, a race condition could cause
-                // more than one thread to reach the return statement below and throw - accepted.
-
-                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
-                {
-                    result = GetSafeLazy(getCacheItem);
-                    var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
-                    var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
-
-                    lck.UpgradeToWriteLock();
-                    //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                    _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
-                }
-            }
-
-            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
-            // exceptions (but try again and again) and silently eat them - however at
-            // some point we have to report them - so need to re-throw here
-
-            // this does not throw anymore
-            //return result.Value;
-
-            value = result.Value; // will not throw (safe lazy)
-            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
-            return value;
-        }
-
-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
-        }
-
-        #endregion
-
-        #region Insert
-
-        /// <summary>
-        /// This overload is here for legacy purposes
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <param name="getCacheItem"></param>
-        /// <param name="timeout"></param>
-        /// <param name="isSliding"></param>
-        /// <param name="priority"></param>
-        /// <param name="removedCallback"></param>
-        /// <param name="dependency"></param>
-        internal void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
-        {
-            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
-            // and make sure we don't store a null value.
-
-            var result = GetSafeLazy(getCacheItem);
-            var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
-            if (value == null) return; // do not store null values (backward compat)
-
-            cacheKey = GetCacheKey(cacheKey);
-
-            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
-            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
-
-            try
-            {
-                _locker.EnterWriteLock();
-                //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
-            }
-            finally
-            {
+                    _locker.ExitReadLock();
+            }
+            var value = result == null ? null : GetSafeLazyValue(result);
+            if (value != null) return value;
+
+            using (var lck = new UpgradeableReadLock(_locker))
+            {
+                result = _cache.Get(cacheKey) as Lazy<object>; // null if key not found
+
+                // cannot create value within the lock, so if result.IsValueCreated is false, just
+                // do nothing here - means that if creation throws, a race condition could cause
+                // more than one thread to reach the return statement below and throw - accepted.
+
+                if (result == null || GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = GetSafeLazy(getCacheItem);
+                    var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
+                    var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
+
+                    lck.UpgradeToWriteLock();
+                    //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
+                    _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
+                }
+            }
+
+            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
+            // exceptions (but try again and again) and silently eat them - however at
+            // some point we have to report them - so need to re-throw here
+
+            // this does not throw anymore
+            //return result.Value;
+
+            value = result.Value; // will not throw (safe lazy)
+            if (value is ExceptionHolder eh) eh.Exception.Throw(); // throw once!
+            return value;
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            CacheDependency dependency = null;
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                dependency = new CacheDependency(dependentFiles);
+            }
+            return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
+        }
+
+        #endregion
+
+        #region Insert
+
+        /// <summary>
+        /// This overload is here for legacy purposes
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="getCacheItem"></param>
+        /// <param name="timeout"></param>
+        /// <param name="isSliding"></param>
+        /// <param name="priority"></param>
+        /// <param name="removedCallback"></param>
+        /// <param name="dependency"></param>
+        internal void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
+        {
+            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
+            // and make sure we don't store a null value.
+
+            var result = GetSafeLazy(getCacheItem);
+            var value = result.Value; // force evaluation now - this may throw if cacheItem throws, and then nothing goes into cache
+            if (value == null) return; // do not store null values (backward compat)
+
+            cacheKey = GetCacheKey(cacheKey);
+
+            var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
+            var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);
+
+            try
+            {
+                _locker.EnterWriteLock();
+                //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
+                _cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
+            }
+            finally
+            {
                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-
-        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            CacheDependency dependency = null;
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                dependency = new CacheDependency(dependentFiles);
-            }
-            InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
-        }
-
-        #endregion
-    }
-}
+                    _locker.ExitWriteLock();
+            }
+        }
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            CacheDependency dependency = null;
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                dependency = new CacheDependency(dependentFiles);
+            }
+            InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
+        }
+
+        #endregion
+    }
+}
@@ -1,68 +1,68 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An interface for implementing a basic cache provider
-    /// </summary>
-    public interface ICacheProvider
-    {
-        /// <summary>
-        /// Removes all items from the cache.
-        /// </summary>
-        void ClearAllCache();
-
-        /// <summary>
-        /// Removes an item from the cache, identified by its key.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        void ClearCacheItem(string key);
-
-        /// <summary>
-        /// Removes items from the cache, of a specified type.
-        /// </summary>
-        /// <param name="typeName">The name of the type to remove.</param>
-        /// <remarks>
-        /// <para>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</para>
-        /// <para>Performs a case-sensitive search.</para>
-        /// </remarks>
-        void ClearCacheObjectTypes(string typeName);
-
-        /// <summary>
-        /// Removes items from the cache, of a specified type.
-        /// </summary>
-        /// <typeparam name="T">The type of the items to remove.</typeparam>
-        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</remarks>
-        void ClearCacheObjectTypes<T>();
-
-        /// <summary>
-        /// Removes items from the cache, of a specified type, satisfying a predicate.
-        /// </summary>
-        /// <typeparam name="T">The type of the items to remove.</typeparam>
-        /// <param name="predicate">The predicate to satisfy.</param>
-        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
-        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
-        /// the specified type are not removed).</remarks>
-        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
-
-        void ClearCacheByKeySearch(string keyStartsWith);
-        void ClearCacheByKeyExpression(string regexString);
-
-        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
-        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
-
-        /// <summary>
-        /// Returns an item with a given key
-        /// </summary>
-        /// <param name="cacheKey"></param>
-        /// <returns></returns>
-        object GetCacheItem(string cacheKey);
-
-        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
-    }
-}
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An interface for implementing a basic cache provider
+    /// </summary>
+    public interface ICacheProvider
+    {
+        /// <summary>
+        /// Removes all items from the cache.
+        /// </summary>
+        void ClearAllCache();
+
+        /// <summary>
+        /// Removes an item from the cache, identified by its key.
+        /// </summary>
+        /// <param name="key">The key of the item.</param>
+        void ClearCacheItem(string key);
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type.
+        /// </summary>
+        /// <param name="typeName">The name of the type to remove.</param>
+        /// <remarks>
+        /// <para>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</para>
+        /// <para>Performs a case-sensitive search.</para>
+        /// </remarks>
+        void ClearCacheObjectTypes(string typeName);
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of the items to remove.</typeparam>
+        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</remarks>
+        void ClearCacheObjectTypes<T>();
+
+        /// <summary>
+        /// Removes items from the cache, of a specified type, satisfying a predicate.
+        /// </summary>
+        /// <typeparam name="T">The type of the items to remove.</typeparam>
+        /// <param name="predicate">The predicate to satisfy.</param>
+        /// <remarks>If the type is an interface, then all items of a type implementing that interface are
+        /// removed. Otherwise, only items of that exact type are removed (items of type inheriting from
+        /// the specified type are not removed).</remarks>
+        void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate);
+
+        void ClearCacheByKeySearch(string keyStartsWith);
+        void ClearCacheByKeyExpression(string regexString);
+
+        IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith);
+        IEnumerable<object> GetCacheItemsByKeyExpression(string regexString);
+
+        /// <summary>
+        /// Returns an item with a given key
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <returns></returns>
+        object GetCacheItem(string cacheKey);
+
+        object GetCacheItem(string cacheKey, Func<object> getCacheItem);
+    }
+}
@@ -1,33 +1,33 @@
-using System;
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// The IcacheRefresher Interface is used for loadbalancing.
-    ///
-    /// </summary>
-    public interface ICacheRefresher : IDiscoverable
-    {
-        Guid RefresherUniqueId { get; }
-        string Name { get; }
-        void RefreshAll();
-        void Refresh(int id);
-        void Remove(int id);
-        void Refresh(Guid id);
-    }
-
-    /// <summary>
-    /// Strongly type cache refresher that is able to refresh cache of real instances of objects as well as IDs
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <remarks>
-    /// This is much better for performance when we're not running in a load balanced environment so we can refresh the cache
-    /// against a already resolved object instead of looking the object back up by id.
-    /// </remarks>
-    interface ICacheRefresher<T> : ICacheRefresher
-    {
-        void Refresh(T instance);
-        void Remove(T instance);
-    }
-}
+using System;
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// The IcacheRefresher Interface is used for loadbalancing.
+    ///
+    /// </summary>
+    public interface ICacheRefresher : IDiscoverable
+    {
+        Guid RefresherUniqueId { get; }
+        string Name { get; }
+        void RefreshAll();
+        void Refresh(int id);
+        void Remove(int id);
+        void Refresh(Guid id);
+    }
+
+    /// <summary>
+    /// Strongly type cache refresher that is able to refresh cache of real instances of objects as well as IDs
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <remarks>
+    /// This is much better for performance when we're not running in a load balanced environment so we can refresh the cache
+    /// against a already resolved object instead of looking the object back up by id.
+    /// </remarks>
+    interface ICacheRefresher<T> : ICacheRefresher
+    {
+        void Refresh(T instance);
+        void Remove(T instance);
+    }
+}
@@ -1,14 +1,14 @@
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A cache refresher that supports refreshing or removing cache based on a custom Json payload
-    /// </summary>
-    interface IJsonCacheRefresher : ICacheRefresher
-    {
-        /// <summary>
-        /// Refreshes, clears, etc... any cache based on the information provided in the json
-        /// </summary>
-        /// <param name="json"></param>
-        void Refresh(string json);
-    }
-}
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A cache refresher that supports refreshing or removing cache based on a custom Json payload
+    /// </summary>
+    interface IJsonCacheRefresher : ICacheRefresher
+    {
+        /// <summary>
+        /// Refreshes, clears, etc... any cache based on the information provided in the json
+        /// </summary>
+        /// <param name="json"></param>
+        void Refresh(string json);
+    }
+}
@@ -1,35 +1,35 @@
-using System;
-using System.Runtime.Caching;
-using System.Text;
-using System.Web.Caching;
-using CacheItemPriority = System.Web.Caching.CacheItemPriority;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// An abstract class for implementing a runtime cache provider
-    /// </summary>
-    /// <remarks>
-    /// </remarks>
-    public interface IRuntimeCacheProvider : ICacheProvider
-    {
-        object GetCacheItem(
-            string cacheKey,
-            Func<object> getCacheItem,
-            TimeSpan? timeout,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null);
-
-        void InsertCacheItem(
-            string cacheKey,
-            Func<object> getCacheItem,
-            TimeSpan? timeout = null,
-            bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
-            string[] dependentFiles = null);
-
-    }
-}
+using System;
+using System.Runtime.Caching;
+using System.Text;
+using System.Web.Caching;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// An abstract class for implementing a runtime cache provider
+    /// </summary>
+    /// <remarks>
+    /// </remarks>
+    public interface IRuntimeCacheProvider : ICacheProvider
+    {
+        object GetCacheItem(
+            string cacheKey,
+            Func<object> getCacheItem,
+            TimeSpan? timeout,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null);
+
+        void InsertCacheItem(
+            string cacheKey,
+            Func<object> getCacheItem,
+            TimeSpan? timeout = null,
+            bool isSliding = false,
+            CacheItemPriority priority = CacheItemPriority.Normal,
+            CacheItemRemovedCallback removedCallback = null,
+            string[] dependentFiles = null);
+
+    }
+}
@@ -1,29 +1,29 @@
-using Umbraco.Core.Sync;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A base class for "json" cache refreshers.
-    /// </summary>
-    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
-    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
-    public abstract class JsonCacheRefresherBase<TInstanceType> : CacheRefresherBase<TInstanceType>, IJsonCacheRefresher
-        where TInstanceType : class, ICacheRefresher
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonCacheRefresherBase{TInstanceType}"/>.
-        /// </summary>
-        /// <param name="cacheHelper">A cache helper.</param>
-        protected JsonCacheRefresherBase(CacheHelper cacheHelper) : base(cacheHelper)
-        { }
-
-        /// <summary>
-        /// Refreshes as specified by a json payload.
-        /// </summary>
-        /// <param name="json">The json payload.</param>
-        public virtual void Refresh(string json)
-        {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(json, MessageType.RefreshByJson));
-        }
-    }
-}
+using Umbraco.Core.Sync;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A base class for "json" cache refreshers.
+    /// </summary>
+    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
+    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
+    public abstract class JsonCacheRefresherBase<TInstanceType> : CacheRefresherBase<TInstanceType>, IJsonCacheRefresher
+        where TInstanceType : class, ICacheRefresher
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonCacheRefresherBase{TInstanceType}"/>.
+        /// </summary>
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected JsonCacheRefresherBase(CacheHelper cacheHelper) : base(cacheHelper)
+        { }
+
+        /// <summary>
+        /// Refreshes as specified by a json payload.
+        /// </summary>
+        /// <param name="json">The json payload.</param>
+        public virtual void Refresh(string json)
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(json, MessageType.RefreshByJson));
+        }
+    }
+}
@@ -1,66 +1,66 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Caching;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Represents a cache provider that does not cache anything.
-    /// </summary>
-    public class NullCacheProvider : IRuntimeCacheProvider
-    {
-        private NullCacheProvider() { }
-
-        public static NullCacheProvider Instance { get; } = new NullCacheProvider();
-
-        public virtual void ClearAllCache()
-        { }
-
-        public virtual void ClearCacheItem(string key)
-        { }
-
-        public virtual void ClearCacheObjectTypes(string typeName)
-        { }
-
-        public virtual void ClearCacheObjectTypes<T>()
-        { }
-
-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        { }
-
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        { }
-
-        public virtual void ClearCacheByKeyExpression(string regexString)
-        { }
-
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            return Enumerable.Empty<object>();
-        }
-
-        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
-        {
-            return Enumerable.Empty<object>();
-        }
-
-        public virtual object GetCacheItem(string cacheKey)
-        {
-            return default(object);
-        }
-
-        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
-        {
-            return getCacheItem();
-        }
-
-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            return getCacheItem();
-        }
-
-        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        { }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Caching;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Represents a cache provider that does not cache anything.
+    /// </summary>
+    public class NullCacheProvider : IRuntimeCacheProvider
+    {
+        private NullCacheProvider() { }
+
+        public static NullCacheProvider Instance { get; } = new NullCacheProvider();
+
+        public virtual void ClearAllCache()
+        { }
+
+        public virtual void ClearCacheItem(string key)
+        { }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        { }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        { }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        { }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        { }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        { }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return Enumerable.Empty<object>();
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return Enumerable.Empty<object>();
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            return default(object);
+        }
+
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return getCacheItem();
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            return getCacheItem();
+        }
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        { }
+    }
+}
@@ -1,359 +1,359 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Caching;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Web.Caching;
-using Umbraco.Core.Composing;
-using CacheItemPriority = System.Web.Caching.CacheItemPriority;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Represents a cache provider that caches item in a <see cref="MemoryCache"/>.
-    /// A cache provider that wraps the logic of a System.Runtime.Caching.ObjectCache
-    /// </summary>
-    /// <remarks>The <see cref="MemoryCache"/> is created with name "in-memory". That name is
-    /// used to retrieve configuration options. It does not identify the memory cache, i.e.
-    /// each instance of this class has its own, independent, memory cache.</remarks>
-    public class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
-    {
-        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
-        internal ObjectCache MemoryCache;
-
-        /// <summary>
-        /// Used for debugging
-        /// </summary>
-        internal Guid InstanceId { get; private set; }
-
-        public ObjectCacheRuntimeCacheProvider()
-        {
-            MemoryCache = new MemoryCache("in-memory");
-            InstanceId = Guid.NewGuid();
-        }
-
-        #region Clear
-
-        public virtual void ClearAllCache()
-        {
-            try
-            {
-                _locker.EnterWriteLock();
-                MemoryCache.DisposeIfDisposable();
-                MemoryCache = new MemoryCache("in-memory");
-            }
-            finally
-            {
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Caching;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Web.Caching;
+using Umbraco.Core.Composing;
+using CacheItemPriority = System.Web.Caching.CacheItemPriority;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Represents a cache provider that caches item in a <see cref="MemoryCache"/>.
+    /// A cache provider that wraps the logic of a System.Runtime.Caching.ObjectCache
+    /// </summary>
+    /// <remarks>The <see cref="MemoryCache"/> is created with name "in-memory". That name is
+    /// used to retrieve configuration options. It does not identify the memory cache, i.e.
+    /// each instance of this class has its own, independent, memory cache.</remarks>
+    public class ObjectCacheRuntimeCacheProvider : IRuntimeCacheProvider
+    {
+        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        internal ObjectCache MemoryCache;
+
+        /// <summary>
+        /// Used for debugging
+        /// </summary>
+        internal Guid InstanceId { get; private set; }
+
+        public ObjectCacheRuntimeCacheProvider()
+        {
+            MemoryCache = new MemoryCache("in-memory");
+            InstanceId = Guid.NewGuid();
+        }
+
+        #region Clear
+
+        public virtual void ClearAllCache()
+        {
+            try
+            {
+                _locker.EnterWriteLock();
+                MemoryCache.DisposeIfDisposable();
+                MemoryCache = new MemoryCache("in-memory");
+            }
+            finally
+            {
                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheItem(string key)
-        {
-            try
-            {
-                _locker.EnterWriteLock();
-                if (MemoryCache[key] == null) return;
-                MemoryCache.Remove(key);
-            }
-            finally
-            {
-                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes(string typeName)
-        {
-            var type = TypeFinder.GetTypeByName(typeName);
-            if (type == null) return;
-            var isInterface = type.IsInterface;
-            try
-            {
-                _locker.EnterWriteLock();
-                foreach (var key in MemoryCache
-                    .Where(x =>
-                    {
-                        // x.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
-
-                        // if T is an interface remove anything that implements that interface
-                        // otherwise remove exact types (not inherited types)
-                        return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
-                    })
-                    .Select(x => x.Key)
-                    .ToArray()) // ToArray required to remove
-                    MemoryCache.Remove(key);
-            }
-            finally
-            {
-                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>()
-        {
-            try
-            {
-                _locker.EnterWriteLock();
-                var typeOfT = typeof (T);
-                var isInterface = typeOfT.IsInterface;
-                foreach (var key in MemoryCache
-                    .Where(x =>
-                    {
-                        // x.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
-
-                        // if T is an interface remove anything that implements that interface
-                        // otherwise remove exact types (not inherited types)
-                        return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
-
-                    })
-                    .Select(x => x.Key)
-                    .ToArray()) // ToArray required to remove
-                    MemoryCache.Remove(key);
-            }
-            finally
-            {
-                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        {
-            try
-            {
-                _locker.EnterWriteLock();
-                var typeOfT = typeof(T);
-                var isInterface = typeOfT.IsInterface;
-                foreach (var key in MemoryCache
-                    .Where(x =>
-                    {
-                        // x.Value is Lazy<object> and not null, its value may be null
-                        // remove null values as well, does not hurt
-                        // get non-created as NonCreatedValue & exceptions as null
-                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
-                        if (value == null) return true;
-
-                        // if T is an interface remove anything that implements that interface
-                        // otherwise remove exact types (not inherited types)
-                        return (isInterface ? (value is T) : (value.GetType() == typeOfT))
-                               && predicate(x.Key, (T)value);
-                    })
-                    .Select(x => x.Key)
-                    .ToArray()) // ToArray required to remove
-                    MemoryCache.Remove(key);
-            }
-            finally
-            {
-                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            try
-            {
-                _locker.EnterWriteLock();
-                foreach (var key in MemoryCache
-                    .Where(x => x.Key.InvariantStartsWith(keyStartsWith))
-                    .Select(x => x.Key)
-                    .ToArray()) // ToArray required to remove
-                    MemoryCache.Remove(key);
-            }
-            finally
-            {
-                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-
-        public virtual void ClearCacheByKeyExpression(string regexString)
-        {
-            try
-            {
-                _locker.EnterWriteLock();
-                foreach (var key in MemoryCache
-                    .Where(x => Regex.IsMatch(x.Key, regexString))
-                    .Select(x => x.Key)
-                    .ToArray()) // ToArray required to remove
-                    MemoryCache.Remove(key);
-            }
-            finally
-            {
-                if (_locker.IsWriteLockHeld)
-                    _locker.ExitWriteLock();
-            }
-        }
-
-        #endregion
-
-        #region Get
-
-        public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            KeyValuePair<string, object>[] entries;
-            try
-            {
-                _locker.EnterReadLock();
-                entries = MemoryCache
-                    .Where(x => x.Key.InvariantStartsWith(keyStartsWith))
-                    .ToArray(); // evaluate while locked
-            }
-            finally
-            {
+                    _locker.ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheItem(string key)
+        {
+            try
+            {
+                _locker.EnterWriteLock();
+                if (MemoryCache[key] == null) return;
+                MemoryCache.Remove(key);
+            }
+            finally
+            {
+                if (_locker.IsWriteLockHeld)
+                    _locker.ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            var type = TypeFinder.GetTypeByName(typeName);
+            if (type == null) return;
+            var isInterface = type.IsInterface;
+            try
+            {
+                _locker.EnterWriteLock();
+                foreach (var key in MemoryCache
+                    .Where(x =>
+                    {
+                        // x.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
+                    })
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }
+            finally
+            {
+                if (_locker.IsWriteLockHeld)
+                    _locker.ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            try
+            {
+                _locker.EnterWriteLock();
+                var typeOfT = typeof (T);
+                var isInterface = typeOfT.IsInterface;
+                foreach (var key in MemoryCache
+                    .Where(x =>
+                    {
+                        // x.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
+
+                    })
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }
+            finally
+            {
+                if (_locker.IsWriteLockHeld)
+                    _locker.ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            try
+            {
+                _locker.EnterWriteLock();
+                var typeOfT = typeof(T);
+                var isInterface = typeOfT.IsInterface;
+                foreach (var key in MemoryCache
+                    .Where(x =>
+                    {
+                        // x.Value is Lazy<object> and not null, its value may be null
+                        // remove null values as well, does not hurt
+                        // get non-created as NonCreatedValue & exceptions as null
+                        var value = DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value, true);
+                        if (value == null) return true;
+
+                        // if T is an interface remove anything that implements that interface
+                        // otherwise remove exact types (not inherited types)
+                        return (isInterface ? (value is T) : (value.GetType() == typeOfT))
+                               && predicate(x.Key, (T)value);
+                    })
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }
+            finally
+            {
+                if (_locker.IsWriteLockHeld)
+                    _locker.ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            try
+            {
+                _locker.EnterWriteLock();
+                foreach (var key in MemoryCache
+                    .Where(x => x.Key.InvariantStartsWith(keyStartsWith))
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }
+            finally
+            {
+                if (_locker.IsWriteLockHeld)
+                    _locker.ExitWriteLock();
+            }
+        }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            try
+            {
+                _locker.EnterWriteLock();
+                foreach (var key in MemoryCache
+                    .Where(x => Regex.IsMatch(x.Key, regexString))
+                    .Select(x => x.Key)
+                    .ToArray()) // ToArray required to remove
+                    MemoryCache.Remove(key);
+            }
+            finally
+            {
+                if (_locker.IsWriteLockHeld)
+                    _locker.ExitWriteLock();
+            }
+        }
+
+        #endregion
+
+        #region Get
+
+        public IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            KeyValuePair<string, object>[] entries;
+            try
+            {
+                _locker.EnterReadLock();
+                entries = MemoryCache
+                    .Where(x => x.Key.InvariantStartsWith(keyStartsWith))
+                    .ToArray(); // evaluate while locked
+            }
+            finally
+            {
                if (_locker.IsReadLockHeld)
-                    _locker.ExitReadLock();
-            }
-            return entries
-                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                .Where(x => x != null) // backward compat, don't store null values in the cache
-                .ToList();
-        }
-
-        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
-        {
-            KeyValuePair<string, object>[] entries;
-            try
-            {
-                _locker.EnterReadLock();
-                entries = MemoryCache
-                    .Where(x => Regex.IsMatch(x.Key, regexString))
-                    .ToArray(); // evaluate while locked
-            }
-            finally
-            {
-                if (_locker.IsReadLockHeld)
-                    _locker.ExitReadLock();
-            }
-            return entries
-                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
-                .Where(x => x != null) // backward compat, don't store null values in the cache
-                .ToList();
-        }
-
-        public object GetCacheItem(string cacheKey)
-        {
-            Lazy<object> result;
-            try
-            {
-                _locker.EnterReadLock();
-                result = MemoryCache.Get(cacheKey) as Lazy<object>; // null if key not found
-            }
-            finally
-            {
-                if (_locker.IsReadLockHeld)
-                    _locker.ExitReadLock();
-            }
-            return result == null ? null : DictionaryCacheProviderBase.GetSafeLazyValue(result); // return exceptions as null
-        }
-
-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
-        {
-            return GetCacheItem(cacheKey, getCacheItem, null);
-        }
-
-        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            // see notes in HttpRuntimeCacheProvider
-
-            Lazy<object> result;
-
-            using (var lck = new UpgradeableReadLock(_locker))
-            {
-                result = MemoryCache.Get(cacheKey) as Lazy<object>;
-                if (result == null || DictionaryCacheProviderBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
-                {
-                    result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
-                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
-
-                    lck.UpgradeToWriteLock();
-                    //NOTE: This does an add or update
-                    MemoryCache.Set(cacheKey, result, policy);
-                }
-            }
-
-            //return result.Value;
-
-            var value = result.Value; // will not throw (safe lazy)
-            if (value is DictionaryCacheProviderBase.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
-            return value;
-        }
-
-        #endregion
-
-        #region Insert
-
-        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
-            // and make sure we don't store a null value.
-
-            var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
-            var value = result.Value; // force evaluation now
-            if (value == null) return; // do not store null values (backward compat)
-
-            var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
-            //NOTE: This does an add or update
-            MemoryCache.Set(cacheKey, result, policy);
-        }
-
-        #endregion
-
-        private static CacheItemPolicy GetPolicy(TimeSpan? timeout = null, bool isSliding = false, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
-        {
-            var absolute = isSliding ? ObjectCache.InfiniteAbsoluteExpiration : (timeout == null ? ObjectCache.InfiniteAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
-            var sliding = isSliding == false ? ObjectCache.NoSlidingExpiration : (timeout ?? ObjectCache.NoSlidingExpiration);
-
-            var policy = new CacheItemPolicy
-            {
-                AbsoluteExpiration = absolute,
-                SlidingExpiration = sliding
-            };
-
-            if (dependentFiles != null && dependentFiles.Any())
-            {
-                policy.ChangeMonitors.Add(new HostFileChangeMonitor(dependentFiles.ToList()));
-            }
-
-            if (removedCallback != null)
-            {
-                policy.RemovedCallback = arguments =>
-                {
-                    //convert the reason
-                    var reason = CacheItemRemovedReason.Removed;
-                    switch (arguments.RemovedReason)
-                    {
-                        case CacheEntryRemovedReason.Removed:
-                            reason = CacheItemRemovedReason.Removed;
-                            break;
-                        case CacheEntryRemovedReason.Expired:
-                            reason = CacheItemRemovedReason.Expired;
-                            break;
-                        case CacheEntryRemovedReason.Evicted:
-                            reason = CacheItemRemovedReason.Underused;
-                            break;
-                        case CacheEntryRemovedReason.ChangeMonitorChanged:
-                            reason = CacheItemRemovedReason.Expired;
-                            break;
-                        case CacheEntryRemovedReason.CacheSpecificEviction:
-                            reason = CacheItemRemovedReason.Underused;
-                            break;
-                    }
-                    //call the callback
-                    removedCallback(arguments.CacheItem.Key, arguments.CacheItem.Value, reason);
-                };
-            }
-            return policy;
-        }
-    }
-}
+                    _locker.ExitReadLock();
+            }
+            return entries
+                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Where(x => x != null) // backward compat, don't store null values in the cache
+                .ToList();
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            KeyValuePair<string, object>[] entries;
+            try
+            {
+                _locker.EnterReadLock();
+                entries = MemoryCache
+                    .Where(x => Regex.IsMatch(x.Key, regexString))
+                    .ToArray(); // evaluate while locked
+            }
+            finally
+            {
+                if (_locker.IsReadLockHeld)
+                    _locker.ExitReadLock();
+            }
+            return entries
+                .Select(x => DictionaryCacheProviderBase.GetSafeLazyValue((Lazy<object>)x.Value)) // return exceptions as null
+                .Where(x => x != null) // backward compat, don't store null values in the cache
+                .ToList();
+        }
+
+        public object GetCacheItem(string cacheKey)
+        {
+            Lazy<object> result;
+            try
+            {
+                _locker.EnterReadLock();
+                result = MemoryCache.Get(cacheKey) as Lazy<object>; // null if key not found
+            }
+            finally
+            {
+                if (_locker.IsReadLockHeld)
+                    _locker.ExitReadLock();
+            }
+            return result == null ? null : DictionaryCacheProviderBase.GetSafeLazyValue(result); // return exceptions as null
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return GetCacheItem(cacheKey, getCacheItem, null);
+        }
+
+        public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            // see notes in HttpRuntimeCacheProvider
+
+            Lazy<object> result;
+
+            using (var lck = new UpgradeableReadLock(_locker))
+            {
+                result = MemoryCache.Get(cacheKey) as Lazy<object>;
+                if (result == null || DictionaryCacheProviderBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
+                {
+                    result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
+                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+
+                    lck.UpgradeToWriteLock();
+                    //NOTE: This does an add or update
+                    MemoryCache.Set(cacheKey, result, policy);
+                }
+            }
+
+            //return result.Value;
+
+            var value = result.Value; // will not throw (safe lazy)
+            if (value is DictionaryCacheProviderBase.ExceptionHolder eh) eh.Exception.Throw(); // throw once!
+            return value;
+        }
+
+        #endregion
+
+        #region Insert
+
+        public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            // NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
+            // and make sure we don't store a null value.
+
+            var result = DictionaryCacheProviderBase.GetSafeLazy(getCacheItem);
+            var value = result.Value; // force evaluation now
+            if (value == null) return; // do not store null values (backward compat)
+
+            var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);
+            //NOTE: This does an add or update
+            MemoryCache.Set(cacheKey, result, policy);
+        }
+
+        #endregion
+
+        private static CacheItemPolicy GetPolicy(TimeSpan? timeout = null, bool isSliding = false, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
+        {
+            var absolute = isSliding ? ObjectCache.InfiniteAbsoluteExpiration : (timeout == null ? ObjectCache.InfiniteAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
+            var sliding = isSliding == false ? ObjectCache.NoSlidingExpiration : (timeout ?? ObjectCache.NoSlidingExpiration);
+
+            var policy = new CacheItemPolicy
+            {
+                AbsoluteExpiration = absolute,
+                SlidingExpiration = sliding
+            };
+
+            if (dependentFiles != null && dependentFiles.Any())
+            {
+                policy.ChangeMonitors.Add(new HostFileChangeMonitor(dependentFiles.ToList()));
+            }
+
+            if (removedCallback != null)
+            {
+                policy.RemovedCallback = arguments =>
+                {
+                    //convert the reason
+                    var reason = CacheItemRemovedReason.Removed;
+                    switch (arguments.RemovedReason)
+                    {
+                        case CacheEntryRemovedReason.Removed:
+                            reason = CacheItemRemovedReason.Removed;
+                            break;
+                        case CacheEntryRemovedReason.Expired:
+                            reason = CacheItemRemovedReason.Expired;
+                            break;
+                        case CacheEntryRemovedReason.Evicted:
+                            reason = CacheItemRemovedReason.Underused;
+                            break;
+                        case CacheEntryRemovedReason.ChangeMonitorChanged:
+                            reason = CacheItemRemovedReason.Expired;
+                            break;
+                        case CacheEntryRemovedReason.CacheSpecificEviction:
+                            reason = CacheItemRemovedReason.Underused;
+                            break;
+                    }
+                    //call the callback
+                    removedCallback(arguments.CacheItem.Key, arguments.CacheItem.Value, reason);
+                };
+            }
+            return policy;
+        }
+    }
+}
@@ -1,79 +1,79 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Represents a cache provider that statically caches item in a concurrent dictionary.
-    /// </summary>
-    public class StaticCacheProvider : ICacheProvider
-    {
-        internal readonly ConcurrentDictionary<string, object> StaticCache = new ConcurrentDictionary<string, object>();
-
-        public virtual void ClearAllCache()
-        {
-            StaticCache.Clear();
-        }
-
-        public virtual void ClearCacheItem(string key)
-        {
-            object val;
-            StaticCache.TryRemove(key, out val);
-        }
-
-        public virtual void ClearCacheObjectTypes(string typeName)
-        {
-            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
-        }
-
-        public virtual void ClearCacheObjectTypes<T>()
-        {
-            var typeOfT = typeof(T);
-            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
-        }
-
-        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
-        {
-            var typeOfT = typeof(T);
-            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
-        }
-
-        public virtual void ClearCacheByKeySearch(string keyStartsWith)
-        {
-            StaticCache.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
-        }
-
-        public virtual void ClearCacheByKeyExpression(string regexString)
-        {
-            StaticCache.RemoveAll(kvp => Regex.IsMatch(kvp.Key, regexString));
-        }
-
-        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
-        {
-            return (from KeyValuePair<string, object> c in StaticCache
-                    where c.Key.InvariantStartsWith(keyStartsWith)
-                    select c.Value).ToList();
-        }
-
-        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
-        {
-            return (from KeyValuePair<string, object> c in StaticCache
-                    where Regex.IsMatch(c.Key, regexString)
-                    select c.Value).ToList();
-        }
-
-        public virtual object GetCacheItem(string cacheKey)
-        {
-            var result = StaticCache[cacheKey];
-            return result;
-        }
-
-        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
-        {
-            return StaticCache.GetOrAdd(cacheKey, key => getCacheItem());
-        }
-    }
-}
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// Represents a cache provider that statically caches item in a concurrent dictionary.
+    /// </summary>
+    public class StaticCacheProvider : ICacheProvider
+    {
+        internal readonly ConcurrentDictionary<string, object> StaticCache = new ConcurrentDictionary<string, object>();
+
+        public virtual void ClearAllCache()
+        {
+            StaticCache.Clear();
+        }
+
+        public virtual void ClearCacheItem(string key)
+        {
+            object val;
+            StaticCache.TryRemove(key, out val);
+        }
+
+        public virtual void ClearCacheObjectTypes(string typeName)
+        {
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType().ToString().InvariantEquals(typeName));
+        }
+
+        public virtual void ClearCacheObjectTypes<T>()
+        {
+            var typeOfT = typeof(T);
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT);
+        }
+
+        public virtual void ClearCacheObjectTypes<T>(Func<string, T, bool> predicate)
+        {
+            var typeOfT = typeof(T);
+            StaticCache.RemoveAll(kvp => kvp.Value != null && kvp.Value.GetType() == typeOfT && predicate(kvp.Key, (T)kvp.Value));
+        }
+
+        public virtual void ClearCacheByKeySearch(string keyStartsWith)
+        {
+            StaticCache.RemoveAll(kvp => kvp.Key.InvariantStartsWith(keyStartsWith));
+        }
+
+        public virtual void ClearCacheByKeyExpression(string regexString)
+        {
+            StaticCache.RemoveAll(kvp => Regex.IsMatch(kvp.Key, regexString));
+        }
+
+        public virtual IEnumerable<object> GetCacheItemsByKeySearch(string keyStartsWith)
+        {
+            return (from KeyValuePair<string, object> c in StaticCache
+                    where c.Key.InvariantStartsWith(keyStartsWith)
+                    select c.Value).ToList();
+        }
+
+        public IEnumerable<object> GetCacheItemsByKeyExpression(string regexString)
+        {
+            return (from KeyValuePair<string, object> c in StaticCache
+                    where Regex.IsMatch(c.Key, regexString)
+                    select c.Value).ToList();
+        }
+
+        public virtual object GetCacheItem(string cacheKey)
+        {
+            var result = StaticCache[cacheKey];
+            return result;
+        }
+
+        public virtual object GetCacheItem(string cacheKey, Func<object> getCacheItem)
+        {
+            return StaticCache.GetOrAdd(cacheKey, key => getCacheItem());
+        }
+    }
+}
@@ -1,36 +1,36 @@
-using Umbraco.Core.Sync;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// A base class for "typed" cache refreshers.
-    /// </summary>
-    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
-    /// <typeparam name="TEntityType">The entity type.</typeparam>
-    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
-    public abstract class TypedCacheRefresherBase<TInstanceType, TEntityType> : CacheRefresherBase<TInstanceType>, ICacheRefresher<TEntityType>
-        where TInstanceType : class, ICacheRefresher
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypedCacheRefresherBase{TInstanceType, TEntityType}"/>.
-        /// </summary>
-        /// <param name="cacheHelper">A cache helper.</param>
-        protected TypedCacheRefresherBase(CacheHelper cacheHelper)
-            : base(cacheHelper)
-        { }
-
-        #region Refresher
-
-        public virtual void Refresh(TEntityType instance)
-        {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(instance, MessageType.RefreshByInstance));
-        }
-
-        public virtual void Remove(TEntityType instance)
-        {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(instance, MessageType.RemoveByInstance));
-        }
-
-        #endregion
-    }
-}
+using Umbraco.Core.Sync;
+
+namespace Umbraco.Core.Cache
+{
+    /// <summary>
+    /// A base class for "typed" cache refreshers.
+    /// </summary>
+    /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
+    /// <typeparam name="TEntityType">The entity type.</typeparam>
+    /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
+    public abstract class TypedCacheRefresherBase<TInstanceType, TEntityType> : CacheRefresherBase<TInstanceType>, ICacheRefresher<TEntityType>
+        where TInstanceType : class, ICacheRefresher
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TypedCacheRefresherBase{TInstanceType, TEntityType}"/>.
+        /// </summary>
+        /// <param name="cacheHelper">A cache helper.</param>
+        protected TypedCacheRefresherBase(CacheHelper cacheHelper)
+            : base(cacheHelper)
+        { }
+
+        #region Refresher
+
+        public virtual void Refresh(TEntityType instance)
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(instance, MessageType.RefreshByInstance));
+        }
+
+        public virtual void Remove(TEntityType instance)
+        {
+            OnCacheUpdated(This, new CacheRefresherEventArgs(instance, MessageType.RemoveByInstance));
+        }
+
+        #endregion
+    }
+}
@@ -0,0 +1,35 @@
+using System;
+using Umbraco.Core.Exceptions;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+    internal class ActionMetadataAttribute : Attribute
+    {
+        public string Category { get; }
+        public string Name { get; }
+
+        /// <summary>
+        /// Constructor used to assign a Category, since no name is assigned it will try to be translated from the language files based on the action's alias
+        /// </summary>
+        /// <param name="category"></param>
+        public ActionMetadataAttribute(string category)
+        {
+            if (string.IsNullOrWhiteSpace(category)) throw new ArgumentNullOrEmptyException(nameof(category));
+            Category = category;
+        }
+
+        /// <summary>
+        /// Constructor used to assign an explicit name and category
+        /// </summary>
+        /// <param name="category"></param>
+        /// <param name="name"></param>
+        public ActionMetadataAttribute(string category, string name)
+        {
+            if (string.IsNullOrWhiteSpace(category)) throw new ArgumentNullOrEmptyException(nameof(category));
+            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
+            Category = category;
+            Name = name;
+        }
+    }
+}
@@ -1,35 +1,35 @@
-using System;
-
-namespace Umbraco.Core.CodeAnnotations
-{
-    /// <summary>
-    /// Attribute to add a Friendly Name string with an UmbracoObjectType enum value
-    /// </summary>
-    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
-    internal class FriendlyNameAttribute : Attribute
-    {
-        /// <summary>
-        /// friendly name value
-        /// </summary>
-        private readonly string _friendlyName;
-
-        /// <summary>
-        /// Initializes a new instance of the FriendlyNameAttribute class
-        /// Sets the friendly name value
-        /// </summary>
-        /// <param name="friendlyName">attribute value</param>
-        public FriendlyNameAttribute(string friendlyName)
-        {
-            this._friendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Gets the friendly name
-        /// </summary>
-        /// <returns>string of friendly name</returns>
-        public override string ToString()
-        {
-            return this._friendlyName;
-        }
-    }
-}
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    /// <summary>
+    /// Attribute to add a Friendly Name string with an UmbracoObjectType enum value
+    /// </summary>
+    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
+    internal class FriendlyNameAttribute : Attribute
+    {
+        /// <summary>
+        /// friendly name value
+        /// </summary>
+        private readonly string _friendlyName;
+
+        /// <summary>
+        /// Initializes a new instance of the FriendlyNameAttribute class
+        /// Sets the friendly name value
+        /// </summary>
+        /// <param name="friendlyName">attribute value</param>
+        public FriendlyNameAttribute(string friendlyName)
+        {
+            this._friendlyName = friendlyName;
+        }
+
+        /// <summary>
+        /// Gets the friendly name
+        /// </summary>
+        /// <returns>string of friendly name</returns>
+        public override string ToString()
+        {
+            return this._friendlyName;
+        }
+    }
+}
@@ -0,0 +1,35 @@
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    /// <summary>
+    /// Marks the program elements that Umbraco is experimenting with and could become public.
+    /// </summary>
+    /// <remarks>
+    /// <para>Indicates that Umbraco  is experimenting with code that potentially could become
+    /// public, but we're not sure, and the code is not stable and can be refactored at any time.</para>
+    /// <para>The issue tracker should contain more details, discussion, and planning.</para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
+    internal sealed class UmbracoExperimentalFeatureAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoExperimentalFeatureAttribute"/> class with a description.
+        /// </summary>
+        /// <param name="description">The text string that describes what is intended.</param>
+        public UmbracoExperimentalFeatureAttribute(string description)
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoExperimentalFeatureAttribute"/> class with a tracker url and a description.
+        /// </summary>
+        /// <param name="trackerUrl">The url of a tracker issue containing more details, discussion, and planning.</param>
+        /// <param name="description">The text string that describes what is intended.</param>
+        public UmbracoExperimentalFeatureAttribute(string trackerUrl, string description)
+        {
+
+        }
+    }
+}
@@ -1,26 +1,26 @@
-using System;
-
-namespace Umbraco.Core.CodeAnnotations
-{
-    /// <summary>
-    /// Attribute to associate a GUID string and Type with an UmbracoObjectType Enum value
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
-    internal class UmbracoObjectTypeAttribute : Attribute
-    {
-        public UmbracoObjectTypeAttribute(string objectId)
-        {
-            ObjectId = new Guid(objectId);
-        }
-
-        public UmbracoObjectTypeAttribute(string objectId, Type modelType)
-        {
-            ObjectId = new Guid(objectId);
-            ModelType = modelType;
-        }
-
-        public Guid ObjectId { get; private set; }
-
-        public Type ModelType { get; private set; }
-    }
-}
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    /// <summary>
+    /// Attribute to associate a GUID string and Type with an UmbracoObjectType Enum value
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+    internal class UmbracoObjectTypeAttribute : Attribute
+    {
+        public UmbracoObjectTypeAttribute(string objectId)
+        {
+            ObjectId = new Guid(objectId);
+        }
+
+        public UmbracoObjectTypeAttribute(string objectId, Type modelType)
+        {
+            ObjectId = new Guid(objectId);
+            ModelType = modelType;
+        }
+
+        public Guid ObjectId { get; private set; }
+
+        public Type ModelType { get; private set; }
+    }
+}
@@ -0,0 +1,36 @@
+using System;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    /// <summary>
+    /// Marks the program elements that Umbraco is considering making public.
+    /// </summary>
+    /// <remarks>
+    /// <para>Indicates that Umbraco considers making the (currently internal) program element public
+    /// at some point in the future, but the decision is not fully made yet and is still pending reviews.</para>
+    /// <para>Note that it is not a commitment to make the program element public. It may not ever become public.</para>
+    /// <para>The issue tracker should contain more details, discussion, and planning.</para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.All, AllowMultiple=false, Inherited=false)]
+    internal sealed class UmbracoProposedPublicAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoProposedPublicAttribute"/> class with a description.
+        /// </summary>
+        /// <param name="description">The text string that describes what is intended.</param>
+        public UmbracoProposedPublicAttribute(string description)
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoProposedPublicAttribute"/> class with a tracker url and a description.
+        /// </summary>
+        /// <param name="trackerUrl">The url of a tracker issue containing more details, discussion, and planning.</param>
+        /// <param name="description">The text string that describes what is intended.</param>
+        public UmbracoProposedPublicAttribute(string trackerUrl, string description)
+        {
+
+        }
+    }
+}
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core.CodeAnnotations
+{
+    /// <summary>
+    /// Marks the program elements that Umbraco will obsolete.
+    /// </summary>
+    /// <remarks>
+    /// Indicates that Umbraco will obsolete the program element at some point in the future, but we do not want to
+    /// explicitely mark it [Obsolete] yet to avoid warning messages showing when developers compile Umbraco.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
+    internal sealed class UmbracoWillObsoleteAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoWillObsoleteAttribute"/> class with a description.
+        /// </summary>
+        /// <param name="description">The text string that describes what is intended.</param>
+        public UmbracoWillObsoleteAttribute(string description)
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoWillObsoleteAttribute"/> class with a tracker url and a description.
+        /// </summary>
+        /// <param name="trackerUrl">The url of a tracker issue containing more details, discussion, and planning.</param>
+        /// <param name="description">The text string that describes what is intended.</param>
+        public UmbracoWillObsoleteAttribute(string trackerUrl, string description)
+        {
+
+        }
+    }
+}
@@ -40,4 +40,4 @@ namespace Umbraco.Core.Collections
        public static bool operator !=(CompositeIntStringKey key1, CompositeIntStringKey key2)
            => key1._key2 != key2._key2 || key1._key1 != key2._key1;
    }
-}
+}
@@ -70,7 +70,10 @@ namespace Umbraco.Core.Collections
        /// The number of elements contained in the <see cref="T:System.Collections.ICollection"/>.
        /// </returns>
        /// <filterpriority>2</filterpriority>
-        public int Count => GetThreadSafeClone().Count;
+        public int Count
+        {
+            get { return GetThreadSafeClone().Count; }
+        }

        /// <summary>
        /// Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
@@ -78,7 +81,10 @@ namespace Umbraco.Core.Collections
        /// <returns>
        /// true if the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only; otherwise, false.
        /// </returns>
-        public bool IsReadOnly => false;
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }

        /// <summary>
        /// Adds an item to the <see cref="T:System.Collections.Generic.ICollection`1"/>.
@@ -14,31 +14,30 @@ namespace Umbraco.Core.Collections
    /// </remarks>
    /// <typeparam name="TValue">The type of elements contained in the BindableCollection</typeparam>
    /// <typeparam name="TKey">The type of the indexing key</typeparam>
-    public class ObservableDictionary<TKey, TValue> : ObservableCollection<TValue>, IReadOnlyDictionary<TKey, TValue>, IDictionary<TKey, TValue>
+    public class ObservableDictionary<TKey, TValue> : ObservableCollection<TValue>
    {
-        protected Dictionary<TKey, int> Indecies { get; }
-        protected Func<TValue, TKey> KeySelector { get; }
+        protected Dictionary<TKey, int> Indecies = new Dictionary<TKey, int>();
+        protected Func<TValue, TKey> KeySelector;

        /// <summary>
        /// Create new ObservableDictionary
        /// </summary>
        /// <param name="keySelector">Selector function to create key from value</param>
-        /// <param name="equalityComparer">The equality comparer to use when comparing keys, or null to use the default comparer.</param>
-        public ObservableDictionary(Func<TValue, TKey> keySelector, IEqualityComparer<TKey> equalityComparer = null)
+        public ObservableDictionary(Func<TValue, TKey> keySelector)
+            : base()
        {
-            KeySelector = keySelector ?? throw new ArgumentException("keySelector");
-            Indecies = new Dictionary<TKey, int>(equalityComparer);
+            if (keySelector == null) throw new ArgumentException("keySelector");
+            KeySelector = keySelector;
        }

        #region Protected Methods
-
        protected override void InsertItem(int index, TValue item)
        {
            var key = KeySelector(item);
            if (Indecies.ContainsKey(key))
                throw new DuplicateKeyException(key.ToString());

-            if (index != Count)
+            if (index != this.Count)
            {
                foreach (var k in Indecies.Keys.Where(k => Indecies[k] >= index).ToList())
                {
@@ -48,6 +47,7 @@ namespace Umbraco.Core.Collections

            base.InsertItem(index, item);
            Indecies[key] = index;
+
        }

        protected override void ClearItems()
@@ -56,6 +56,7 @@ namespace Umbraco.Core.Collections
            Indecies.Clear();
        }

+
        protected override void RemoveItem(int index)
        {
            var item = this[index];
@@ -70,10 +71,9 @@ namespace Umbraco.Core.Collections
                Indecies[k]--;
            }
        }
-
        #endregion

-        public bool ContainsKey(TKey key)
+        public virtual bool ContainsKey(TKey key)
        {
            return Indecies.ContainsKey(key);
        }
@@ -83,10 +83,10 @@ namespace Umbraco.Core.Collections
        /// </summary>
        /// <param name="key">Key of element to replace</param>
        /// <returns></returns>
-        public TValue this[TKey key]
+        public virtual TValue this[TKey key]
        {

-            get => this[Indecies[key]];
+            get { return this[Indecies[key]]; }
            set
            {
                //confirm key matches
@@ -95,7 +95,7 @@ namespace Umbraco.Core.Collections

                if (!Indecies.ContainsKey(key))
                {
-                    Add(value);
+                    this.Add(value);
                }
                else
                {
@@ -112,10 +112,9 @@ namespace Umbraco.Core.Collections
        ///
        /// <exception cref="InvalidOperationException"></exception>
        /// <returns>False if key not found</returns>
-        public bool Replace(TKey key, TValue value)
+        public virtual bool Replace(TKey key, TValue value)
        {
            if (!Indecies.ContainsKey(key)) return false;
-
            //confirm key matches
            if (!KeySelector(value).Equals(key))
                throw new InvalidOperationException("Key of new value does not match");
@@ -125,11 +124,11 @@ namespace Umbraco.Core.Collections

        }

-        public bool Remove(TKey key)
+        public virtual bool Remove(TKey key)
        {
            if (!Indecies.ContainsKey(key)) return false;

-            RemoveAt(Indecies[key]);
+            this.RemoveAt(Indecies[key]);
            return true;

        }
@@ -139,13 +138,12 @@ namespace Umbraco.Core.Collections
        /// </summary>
        /// <param name="currentKey"></param>
        /// <param name="newKey"></param>
-        public void ChangeKey(TKey currentKey, TKey newKey)
+        public virtual void ChangeKey(TKey currentKey, TKey newKey)
        {
            if (!Indecies.ContainsKey(currentKey))
            {
                throw new InvalidOperationException("No item with the key " + currentKey + "was found in the collection");
            }
-
            if (ContainsKey(newKey))
            {
                throw new DuplicateKeyException(newKey.ToString());
@@ -157,81 +155,16 @@ namespace Umbraco.Core.Collections
            Indecies.Add(newKey, currentIndex);
        }

-        #region IDictionary and IReadOnlyDictionary implementation
-
-        public bool TryGetValue(TKey key, out TValue val)
-        {
-            if (Indecies.TryGetValue(key, out var index))
-            {
-                val = this[index];
-                return true;
-            }
-            val = default;
-            return false;
-        }
-
-        /// <summary>
-        /// Returns all keys
-        /// </summary>
-        public IEnumerable<TKey> Keys => Indecies.Keys;
-
-        /// <summary>
-        /// Returns all values
-        /// </summary>
-        public IEnumerable<TValue> Values => base.Items;
-
-        ICollection<TKey> IDictionary<TKey, TValue>.Keys => Indecies.Keys;
-
-        //this will never be used
-        ICollection<TValue> IDictionary<TKey, TValue>.Values => Values.ToList();
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly => false;
-
-        IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator()
-        {
-            foreach (var i in Values)
-            {
-                var key = KeySelector(i);
-                yield return new KeyValuePair<TKey, TValue>(key, i);
-            }
-        }
-
-        void IDictionary<TKey, TValue>.Add(TKey key, TValue value)
-        {
-            Add(value);
-        }
-
-        void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item)
-        {
-            Add(item.Value);
-        }
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item)
-        {
-            return ContainsKey(item.Key);
-        }
-
-        void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
-        {
-            throw new NotImplementedException();
-        }
-
-        bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item)
-        {
-            return Remove(item.Key);
-        }
-
-        #endregion
-
        internal class DuplicateKeyException : Exception
        {
+
+            public string Key { get; private set; }
            public DuplicateKeyException(string key)
-                : base("Attempted to insert duplicate key \"" + key + "\" in collection.")
+                : base("Attempted to insert duplicate key " + key + " in collection")
            {
                Key = key;
            }
-
-            public string Key { get; }
        }
+
    }
 }
@@ -1,5 +0,0 @@
-namespace Umbraco.Core.Components
-{
-    public sealed class AuditEventsComposer : ComponentComposer<AuditEventsComponent>, ICoreComposer
-    { }
-}
@@ -0,0 +1,367 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using LightInject;
+using Umbraco.Core.Collections;
+using Umbraco.Core.Exceptions;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Scoping;
+
+namespace Umbraco.Core.Components
+{
+    // note: this class is NOT thread-safe in any ways
+
+    internal class BootLoader
+    {
+        private readonly IServiceContainer _container;
+        private readonly ProfilingLogger _proflog;
+        private readonly ILogger _logger;
+        private IUmbracoComponent[] _components;
+        private bool _booted;
+
+        private const int LogThresholdMilliseconds = 100;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BootLoader"/> class.
+        /// </summary>
+        /// <param name="container">The application container.</param>
+        public BootLoader(IServiceContainer container)
+        {
+            if (container == null) throw new ArgumentNullException(nameof(container));
+            _container = container;
+            _proflog = container.GetInstance<ProfilingLogger>();
+            _logger = container.GetInstance<ILogger>();
+        }
+
+        private class EnableInfo
+        {
+            public bool Enabled;
+            public int Weight = -1;
+        }
+
+        public void Boot(IEnumerable<Type> componentTypes, RuntimeLevel level)
+        {
+            if (_booted) throw new InvalidOperationException("Can not boot, has already booted.");
+
+            var orderedComponentTypes = PrepareComponentTypes(componentTypes, level);
+
+            InstanciateComponents(orderedComponentTypes);
+            ComposeComponents(level);
+
+            using (var scope = _container.GetInstance<IScopeProvider>().CreateScope())
+            {
+                InitializeComponents();
+                scope.Complete();
+            }
+
+            // rejoice!
+            _booted = true;
+        }
+
+        private IEnumerable<Type> PrepareComponentTypes(IEnumerable<Type> componentTypes, RuntimeLevel level)
+        {
+            using (_proflog.DebugDuration<BootLoader>("Preparing component types.", "Prepared component types."))
+            {
+                return PrepareComponentTypes2(componentTypes, level);
+            }
+        }
+
+        private IEnumerable<Type> PrepareComponentTypes2(IEnumerable<Type> componentTypes, RuntimeLevel level)
+        {
+            // create a list, remove those that cannot be enabled due to runtime level
+            var componentTypeList = componentTypes
+                .Where(x =>
+                {
+                    var attr = x.GetCustomAttribute<RuntimeLevelAttribute>();
+                    return attr == null || level >= attr.MinLevel;
+                })
+                .ToList();
+
+            // cannot remove that one - ever
+            if (componentTypeList.Contains(typeof(UmbracoCoreComponent)) == false)
+                componentTypeList.Add(typeof(UmbracoCoreComponent));
+
+            // enable or disable components
+            EnableDisableComponents(componentTypeList);
+
+            // sort the components according to their dependencies
+            var requirements = new Dictionary<Type, List<Type>>();
+            foreach (var type in componentTypeList) requirements[type] = null;
+            foreach (var type in componentTypeList)
+            {
+                GatherRequirementsFromRequireAttribute(type, componentTypeList, requirements);
+                GatherRequirementsFromRequiredAttribute(type, componentTypeList, requirements);
+            }
+
+            // only for debugging, this is verbose
+            //_logger.Debug<BootLoader>(GetComponentsReport(requirements));
+
+            // sort components
+            var graph = new TopoGraph<Type, KeyValuePair<Type, List<Type>>>(kvp => kvp.Key, kvp => kvp.Value);
+            graph.AddItems(requirements);
+            List<Type> sortedComponentTypes;
+            try
+            {
+                sortedComponentTypes = graph.GetSortedItems().Select(x => x.Key).ToList();
+            }
+            catch (Exception e)
+            {
+                // in case of an error, force-dump everything to log
+                _logger.Info<BootLoader>(GetComponentsReport(requirements));
+                _logger.Error<BootLoader>("Failed to sort components.", e);
+                throw;
+            }
+
+            // bit verbose but should help for troubleshooting
+            var text = "Ordered Components: " + Environment.NewLine + string.Join(Environment.NewLine, sortedComponentTypes) + Environment.NewLine;
+            Console.WriteLine(text);
+            _logger.Debug<BootLoader>(text);
+
+            return sortedComponentTypes;
+        }
+
+        private static string GetComponentsReport(Dictionary<Type, List<Type>> requirements)
+        {
+            var text = new StringBuilder();
+            text.AppendLine("Components & Dependencies:");
+            text.AppendLine();
+
+            foreach (var kvp in requirements)
+            {
+                var type = kvp.Key;
+
+                text.AppendLine(type.FullName);
+                foreach (var attribute in type.GetCustomAttributes<RequireComponentAttribute>())
+                    text.AppendLine("  -> " + attribute.RequiredType + (attribute.Weak.HasValue
+                        ? (attribute.Weak.Value ? " (weak)" : (" (strong" + (requirements.ContainsKey(attribute.RequiredType) ? ", missing" : "") + ")"))
+                        : ""));
+                foreach (var attribute in type.GetCustomAttributes<RequiredComponentAttribute>())
+                    text.AppendLine("  -< " + attribute.RequiringType);
+                foreach (var i in type.GetInterfaces())
+                {
+                    text.AppendLine("  : " + i.FullName);
+                    foreach (var attribute in i.GetCustomAttributes<RequireComponentAttribute>())
+                        text.AppendLine("    -> " + attribute.RequiredType + (attribute.Weak.HasValue
+                            ? (attribute.Weak.Value ? " (weak)" : (" (strong" + (requirements.ContainsKey(attribute.RequiredType) ? ", missing" : "") + ")"))
+                            : ""));
+                    foreach (var attribute in i.GetCustomAttributes<RequiredComponentAttribute>())
+                        text.AppendLine("    -< " + attribute.RequiringType);
+                }
+                if (kvp.Value != null)
+                    foreach (var t in kvp.Value)
+                        text.AppendLine("  = " + t);
+                text.AppendLine();
+            }
+            text.AppendLine("/");
+            text.AppendLine();
+            return text.ToString();
+        }
+
+        private static void EnableDisableComponents(ICollection<Type> types)
+        {
+            var enabled = new Dictionary<Type, EnableInfo>();
+
+            // process the enable/disable attributes
+            // these two attributes are *not* inherited and apply to *classes* only (not interfaces).
+            // remote declarations (when a component enables/disables *another* component)
+            // have priority over local declarations (when a component disables itself) so that
+            // ppl can enable components that, by default, are disabled.
+            // what happens in case of conflicting remote declarations is unspecified. more
+            // precisely, the last declaration to be processed wins, but the order of the
+            // declarations depends on the type finder and is unspecified.
+            foreach (var componentType in types)
+            {
+                foreach (var attr in componentType.GetCustomAttributes<EnableComponentAttribute>())
+                {
+                    var type = attr.EnabledType ?? componentType;
+                    EnableInfo enableInfo;
+                    if (enabled.TryGetValue(type, out enableInfo) == false) enableInfo = enabled[type] = new EnableInfo();
+                    var weight = type == componentType ? 1 : 2;
+                    if (enableInfo.Weight > weight) continue;
+
+                    enableInfo.Enabled = true;
+                    enableInfo.Weight = weight;
+                }
+                foreach (var attr in componentType.GetCustomAttributes<DisableComponentAttribute>())
+                {
+                    var type = attr.DisabledType ?? componentType;
+                    if (type == typeof(UmbracoCoreComponent)) throw new InvalidOperationException("Cannot disable UmbracoCoreComponent.");
+                    EnableInfo enableInfo;
+                    if (enabled.TryGetValue(type, out enableInfo) == false) enableInfo = enabled[type] = new EnableInfo();
+                    var weight = type == componentType ? 1 : 2;
+                    if (enableInfo.Weight > weight) continue;
+
+                    enableInfo.Enabled = false;
+                    enableInfo.Weight = weight;
+                }
+            }
+
+            // remove components that end up being disabled
+            foreach (var kvp in enabled.Where(x => x.Value.Enabled == false))
+                types.Remove(kvp.Key);
+        }
+
+        private static void GatherRequirementsFromRequireAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
+        {
+            // get 'require' attributes
+            // these attributes are *not* inherited because we want to "custom-inherit" for interfaces only
+            var requireAttributes = type
+                .GetInterfaces().SelectMany(x => x.GetCustomAttributes<RequireComponentAttribute>()) // those marking interfaces
+                .Concat(type.GetCustomAttributes<RequireComponentAttribute>()); // those marking the component
+
+            // what happens in case of conflicting attributes (different strong/weak for same type) is not specified.
+            foreach (var attr in requireAttributes)
+            {
+                if (attr.RequiredType == type) continue; // ignore self-requirements (+ exclude in implems, below)
+
+                // requiring an interface = require any enabled component implementing that interface
+                // unless strong, and then require at least one enabled component implementing that interface
+                if (attr.RequiredType.IsInterface)
+                {
+                    var implems = types.Where(x => x != type && attr.RequiredType.IsAssignableFrom(x)).ToList();
+                    if (implems.Count > 0)
+                    {
+                        if (requirements[type] == null) requirements[type] = new List<Type>();
+                        requirements[type].AddRange(implems);
+                    }
+                    else if (attr.Weak == false) // if explicitely set to !weak, is strong, else is weak
+                        throw new Exception($"Broken component dependency: {type.FullName} -> {attr.RequiredType.FullName}.");
+                }
+                // requiring a class = require that the component is enabled
+                // unless weak, and then requires it if it is enabled
+                else
+                {
+                    if (types.Contains(attr.RequiredType))
+                    {
+                        if (requirements[type] == null) requirements[type] = new List<Type>();
+                        requirements[type].Add(attr.RequiredType);
+                    }
+                    else if (attr.Weak != true) // if not explicitely set to weak, is strong
+                        throw new Exception($"Broken component dependency: {type.FullName} -> {attr.RequiredType.FullName}.");
+                }
+            }
+        }
+
+        private static void GatherRequirementsFromRequiredAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
+        {
+            // get 'required' attributes
+            // fixme explain
+            var requiredAttributes = type
+                .GetInterfaces().SelectMany(x => x.GetCustomAttributes<RequiredComponentAttribute>())
+                .Concat(type.GetCustomAttributes<RequiredComponentAttribute>());
+
+            foreach (var attr in requiredAttributes)
+            {
+                if (attr.RequiringType == type) continue; // ignore self-requirements (+ exclude in implems, below)
+
+                if (attr.RequiringType.IsInterface)
+                {
+                    var implems = types.Where(x => x != type && attr.RequiringType.IsAssignableFrom(x)).ToList();
+                    foreach (var implem in implems)
+                    {
+                        if (requirements[implem] == null) requirements[implem] = new List<Type>();
+                        requirements[implem].Add(type);
+                    }
+                }
+                else
+                {
+                    if (types.Contains(attr.RequiringType))
+                    {
+                        if (requirements[attr.RequiringType] == null) requirements[attr.RequiringType] = new List<Type>();
+                        requirements[attr.RequiringType].Add(type);
+                    }
+                }
+            }
+        }
+
+        private void InstanciateComponents(IEnumerable<Type> types)
+        {
+            using (_proflog.DebugDuration<BootLoader>("Instanciating components.", "Instanciated components."))
+            {
+                _components = types.Select(x => (IUmbracoComponent) Activator.CreateInstance(x)).ToArray();
+            }
+        }
+
+        private void ComposeComponents(RuntimeLevel level)
+        {
+            using (_proflog.DebugDuration<BootLoader>($"Composing components. (log when >{LogThresholdMilliseconds}ms)", "Composed components."))
+            {
+                var composition = new Composition(_container, level);
+                foreach (var component in _components)
+                {
+                    var componentType = component.GetType();
+                    using (_proflog.DebugDuration<BootLoader>($"Composing {componentType.FullName}.", $"Composed {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
+                    {
+                        component.Compose(composition);
+                    }
+                }
+            }
+        }
+
+        private void InitializeComponents()
+        {
+            // use a container scope to ensure that PerScope instances are disposed
+            // components that require instances that should not survive should register them with PerScope lifetime
+            using (_proflog.DebugDuration<BootLoader>($"Initializing components. (log when >{LogThresholdMilliseconds}ms)", "Initialized components."))
+            using (_container.BeginScope())
+            {
+                foreach (var component in _components)
+                {
+                    var componentType = component.GetType();
+                    var initializers = componentType.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+                        .Where(x => x.Name == "Initialize" && x.IsGenericMethod == false);
+                    using (_proflog.DebugDuration<BootLoader>($"Initializing {componentType.FullName}.", $"Initialised {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
+                    {
+                        foreach (var initializer in initializers)
+                        {
+                            var parameters = initializer.GetParameters()
+                                .Select(x => GetParameter(componentType, x.ParameterType))
+                                .ToArray();
+                            initializer.Invoke(component, parameters);
+                        }
+                    }
+                }
+            }
+        }
+
+        private object GetParameter(Type componentType, Type parameterType)
+        {
+            object param;
+
+            try
+            {
+                param = _container.TryGetInstance(parameterType);
+            }
+            catch (Exception e)
+            {
+                throw new BootFailedException($"Could not get parameter of type {parameterType.FullName} for component {componentType.FullName}.", e);
+            }
+
+            if (param == null) throw new BootFailedException($"Could not get parameter of type {parameterType.FullName} for component {componentType.FullName}.");
+            return param;
+        }
+
+        public void Terminate()
+        {
+            if (_booted == false)
+            {
+                _proflog.Logger.Warn<BootLoader>("Cannot terminate, has not booted.");
+                return;
+            }
+
+            using (_proflog.DebugDuration<BootLoader>($"Terminating. (log components when >{LogThresholdMilliseconds}ms)", "Terminated."))
+            {
+                foreach (var component in _components)
+                {
+                    var componentType = component.GetType();
+                    using (_proflog.DebugDuration<BootLoader>($"Terminating {componentType.FullName}.", $"Terminated {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
+                    {
+                        component.Terminate();
+                    }
+                }
+            }
+        }
+    }
+}
@@ -1,54 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Represents the collection of <see cref="IComponent"/> implementations.
-    /// </summary>
-    public class ComponentCollection : BuilderCollectionBase<IComponent>
-    {
-        private const int LogThresholdMilliseconds = 100;
-
-        private readonly IProfilingLogger _logger;
-
-        public ComponentCollection(IEnumerable<IComponent> items, IProfilingLogger logger)
-            : base(items)
-        {
-            _logger = logger;
-        }
-
-        public void Initialize()
-        {
-            using (_logger.DebugDuration<ComponentCollection>($"Initializing. (log components when >{LogThresholdMilliseconds}ms)", "Initialized."))
-            {
-                foreach (var component in this.Reverse()) // terminate components in reverse order
-                {
-                    var componentType = component.GetType();
-                    using (_logger.DebugDuration<ComponentCollection>($"Initializing {componentType.FullName}.", $"Initialized {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
-                    {
-                        component.Initialize();
-                    }
-                }
-            }
-        }
-
-        public void Terminate()
-        {
-            using (_logger.DebugDuration<ComponentCollection>($"Terminating. (log components when >{LogThresholdMilliseconds}ms)", "Terminated."))
-            {
-                foreach (var component in this.Reverse()) // terminate components in reverse order
-                {
-                    var componentType = component.GetType();
-                    using (_logger.DebugDuration<ComponentCollection>($"Terminating {componentType.FullName}.", $"Terminated {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
-                    {
-                        component.Terminate();
-                        component.DisposeIfDisposable();
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Builds a <see cref="ComponentCollection"/>.
-    /// </summary>
-    public class ComponentCollectionBuilder : OrderedCollectionBuilderBase<ComponentCollectionBuilder, ComponentCollection, IComponent>
-    {
-        private const int LogThresholdMilliseconds = 100;
-
-        private IProfilingLogger _logger;
-
-        public ComponentCollectionBuilder()
-        { }
-
-        protected override ComponentCollectionBuilder This => this;
-
-        protected override IEnumerable<IComponent> CreateItems(IFactory factory)
-        {
-            _logger = factory.GetInstance<IProfilingLogger>();
-
-            using (_logger.DebugDuration<ComponentCollectionBuilder>($"Creating components. (log when >{LogThresholdMilliseconds}ms)", "Created."))
-            {
-                return base.CreateItems(factory);
-            }
-        }
-
-        protected override IComponent CreateItem(IFactory factory, Type itemType)
-        {
-            using (_logger.DebugDuration<Composers>($"Creating {itemType.FullName}.", $"Created {itemType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
-            {
-                return base.CreateItem(factory, itemType);
-            }
-        }
-    }
-}
@@ -1,20 +0,0 @@
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Provides a base class for composers which compose a component.
-    /// </summary>
-    /// <typeparam name="TComponent">The type of the component</typeparam>
-    public abstract class ComponentComposer<TComponent> : IComposer
-        where TComponent : IComponent
-    {
-        /// <inheritdoc />
-        public virtual void Compose(Composition composition)
-        {
-            composition.Components().Append<TComponent>();
-        }
-
-        // note: thanks to this class, a component that does not compose anything can be
-        // registered with one line:
-        // public class MyComponentComposer : ComponentComposer<MyComponent> { }
-    }
-}
@@ -1,59 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Indicates that a composer requires another composer.
-    /// </summary>
-    /// <remarks>
-    /// <para>This attribute is *not* inherited. This means that a composer class inheriting from
-    /// another composer class does *not* inherit its requirements. However, the runtime checks
-    /// the *interfaces* of every composer for their requirements, so requirements declared on
-    /// interfaces are inherited by every composer class implementing the interface.</para>
-    /// <para>When targeting a class, indicates a dependency on the composer which must be enabled,
-    /// unless the requirement has explicitly been declared as weak (and then, only if the composer
-    /// is enabled).</para>
-    /// <para>When targeting an interface, indicates a dependency on enabled composers implementing
-    /// the interface. It could be no composer at all, unless the requirement has explicitly been
-    /// declared as strong (and at least one composer must be enabled).</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = true, Inherited = false)]
-    public sealed class ComposeAfterAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ComposeAfterAttribute"/> class.
-        /// </summary>
-        /// <param name="requiredType">The type of the required composer.</param>
-        public ComposeAfterAttribute(Type requiredType)
-        {
-            if (typeof(IComposer).IsAssignableFrom(requiredType) == false)
-                throw new ArgumentException($"Type {requiredType.FullName} is invalid here because it does not implement {typeof(IComposer).FullName}.");
-            RequiredType = requiredType;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ComposeAfterAttribute"/> class.
-        /// </summary>
-        /// <param name="requiredType">The type of the required composer.</param>
-        /// <param name="weak">A value indicating whether the requirement is weak.</param>
-        public ComposeAfterAttribute(Type requiredType, bool weak)
-            : this(requiredType)
-        {
-            Weak = weak;
-        }
-
-        /// <summary>
-        /// Gets the required type.
-        /// </summary>
-        public Type RequiredType { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the requirement is weak.
-        /// </summary>
-        /// <remarks>Returns <c>true</c> if the requirement is weak (requires the other composer if it
-        /// is enabled), <c>false</c> if the requirement is strong (requires the other composer to be
-        /// enabled), and <c>null</c> if unspecified, in which case it is strong for classes and weak for
-        /// interfaces.</remarks>
-        public bool? Weak { get; }
-    }
-}
@@ -1,40 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Indicates that a component is required by another composer.
-    /// </summary>
-    /// <remarks>
-    /// <para>This attribute is *not* inherited. This means that a composer class inheriting from
-    /// another composer class does *not* inherit its requirements. However, the runtime checks
-    /// the *interfaces* of every composer for their requirements, so requirements declared on
-    /// interfaces are inherited by every composer class implementing the interface.</para>
-    /// <para>When targeting a class, indicates a dependency on the composer which must be enabled,
-    /// unless the requirement has explicitly been declared as weak (and then, only if the composer
-    /// is enabled).</para>
-    /// <para>When targeting an interface, indicates a dependency on enabled composers implementing
-    /// the interface. It could be no composer at all, unless the requirement has explicitly been
-    /// declared as strong (and at least one composer must be enabled).</para>
-    /// </remarks>
-
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = true, Inherited = false)]
-    public sealed class ComposeBeforeAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ComposeBeforeAttribute"/> class.
-        /// </summary>
-        /// <param name="requiringType">The type of the required composer.</param>
-        public ComposeBeforeAttribute(Type requiringType)
-        {
-            if (typeof(IComposer).IsAssignableFrom(requiringType) == false)
-                throw new ArgumentException($"Type {requiringType.FullName} is invalid here because it does not implement {typeof(IComposer).FullName}.");
-            RequiringType = requiringType;
-        }
-
-        /// <summary>
-        /// Gets the required type.
-        /// </summary>
-        public Type RequiringType { get; }
-    }
-}
@@ -1,294 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using Umbraco.Core.Collections;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.Components
-{
-    // note: this class is NOT thread-safe in any ways
-
-    /// <summary>
-    /// Handles the composers.
-    /// </summary>
-    public class Composers
-    {
-        private readonly Composition _composition;
-        private readonly IProfilingLogger _logger;
-        private readonly IEnumerable<Type> _composerTypes;
-
-        private const int LogThresholdMilliseconds = 100;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Composers"/> class.
-        /// </summary>
-        /// <param name="composition">The composition.</param>
-        /// <param name="composerTypes">The composer types.</param>
-        /// <param name="logger">A profiling logger.</param>
-        public Composers(Composition composition, IEnumerable<Type> composerTypes, IProfilingLogger logger)
-        {
-            _composition = composition ?? throw new ArgumentNullException(nameof(composition));
-            _composerTypes = composerTypes ?? throw new ArgumentNullException(nameof(composerTypes));
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
-        private class EnableInfo
-        {
-            public bool Enabled;
-            public int Weight = -1;
-        }
-
-        /// <summary>
-        /// Instantiates and composes the composers.
-        /// </summary>
-        public void Compose()
-        {
-            // make sure it is there
-            _composition.WithCollectionBuilder<ComponentCollectionBuilder>();
-
-            IEnumerable<Type> orderedComposerTypes;
-
-            using (_logger.DebugDuration<Composers>("Preparing composer types.", "Prepared composer types."))
-            {
-                orderedComposerTypes = PrepareComposerTypes();
-            }
-
-            var composers = InstantiateComposers(orderedComposerTypes);
-
-            using (_logger.DebugDuration<Composers>($"Composing composers. (log when >{LogThresholdMilliseconds}ms)", "Composed composers."))
-            {
-                foreach (var composer in composers)
-                {
-                    var componentType = composer.GetType();
-                    using (_logger.DebugDuration<Composers>($"Composing {componentType.FullName}.", $"Composed {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
-                    {
-                        composer.Compose(_composition);
-                    }
-                }
-            }
-        }
-
-        private IEnumerable<Type> PrepareComposerTypes()
-        {
-            // create a list, remove those that cannot be enabled due to runtime level
-            var composerTypeList = _composerTypes
-                .Where(x =>
-                {
-                    // use the min level specified by the attribute if any
-                    // otherwise, user composers have Run min level, anything else is Unknown (always run)
-                    var attr = x.GetCustomAttribute<RuntimeLevelAttribute>();
-                    var minLevel = attr?.MinLevel ?? (x.Implements<IUserComposer>() ? RuntimeLevel.Run : RuntimeLevel.Unknown);
-                    return _composition.RuntimeState.Level >= minLevel;
-                })
-                .ToList();
-
-            // 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)
-            {
-                GatherRequirementsFromRequireAttribute(type, composerTypeList, requirements);
-                GatherRequirementsFromRequiredByAttribute(type, composerTypeList, requirements);
-            }
-
-            // only for debugging, this is verbose
-            //_logger.Debug<Composers>(GetComposersReport(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();
-            }
-            catch (Exception e)
-            {
-                // in case of an error, force-dump everything to log
-                _logger.Info<Composers>("Composer Report:\r\n{ComposerReport}", GetComposersReport(requirements));
-                _logger.Error<Composers>(e, "Failed to sort composers.");
-                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)
-        {
-            var text = new StringBuilder();
-            text.AppendLine("Composers & Dependencies:");
-            text.AppendLine();
-
-            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);
-                }
-                if (kvp.Value != null)
-                    foreach (var t in kvp.Value)
-                        text.AppendLine("  = " + t);
-                text.AppendLine();
-            }
-            text.AppendLine("/");
-            text.AppendLine();
-            return text.ToString();
-        }
-
-        private static void EnableDisableComposers(ICollection<Type> types)
-        {
-            var enabled = new Dictionary<Type, EnableInfo>();
-
-            // process the enable/disable attributes
-            // these two attributes are *not* inherited and apply to *classes* only (not interfaces).
-            // remote declarations (when a composer enables/disables *another* composer)
-            // have priority over local declarations (when a composer disables itself) so that
-            // ppl can enable composers that, by default, are disabled.
-            // what happens in case of conflicting remote declarations is unspecified. more
-            // precisely, the last declaration to be processed wins, but the order of the
-            // declarations depends on the type finder and is unspecified.
-            foreach (var composerType in types)
-            {
-                foreach (var attr in composerType.GetCustomAttributes<EnableAttribute>())
-                {
-                    var type = attr.EnabledType ?? composerType;
-                    if (enabled.TryGetValue(type, out var enableInfo) == false) enableInfo = enabled[type] = new EnableInfo();
-                    var weight = type == composerType ? 1 : 2;
-                    if (enableInfo.Weight > weight) continue;
-
-                    enableInfo.Enabled = true;
-                    enableInfo.Weight = weight;
-                }
-                foreach (var attr in composerType.GetCustomAttributes<DisableAttribute>())
-                {
-                    var type = attr.DisabledType ?? composerType;
-                    if (enabled.TryGetValue(type, out var enableInfo) == false) enableInfo = enabled[type] = new EnableInfo();
-                    var weight = type == composerType ? 1 : 2;
-                    if (enableInfo.Weight > weight) continue;
-
-                    enableInfo.Enabled = false;
-                    enableInfo.Weight = weight;
-                }
-            }
-
-            // remove composers that end up being disabled
-            foreach (var kvp in enabled.Where(x => x.Value.Enabled == false))
-                types.Remove(kvp.Key);
-        }
-
-        private static void GatherRequirementsFromRequireAttribute(Type type, ICollection<Type> types, IDictionary<Type, List<Type>> requirements)
-        {
-            // get 'require' attributes
-            // these attributes are *not* inherited because we want to "custom-inherit" for interfaces only
-            var requireAttributes = 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)
-            {
-                if (attr.RequiredType == type) continue; // ignore self-requirements (+ exclude in implems, below)
-
-                // requiring an interface = require any enabled composer implementing that interface
-                // 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();
-                    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
-                        throw new Exception($"Broken composer dependency: {type.FullName} -> {attr.RequiredType.FullName}.");
-                }
-                // requiring a class = require that the composer is enabled
-                // unless weak, and then requires it if it is enabled
-                else
-                {
-                    if (types.Contains(attr.RequiredType))
-                    {
-                        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
-                        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)
-        {
-            // get 'required' attributes
-            // these attributes are *not* inherited because we want to "custom-inherit" for interfaces only
-            var requiredAttributes = type
-                .GetInterfaces().SelectMany(x => x.GetCustomAttributes<ComposeBeforeAttribute>()) // those marking interfaces
-                .Concat(type.GetCustomAttributes<ComposeBeforeAttribute>()); // those marking the composer
-
-            foreach (var attr in requiredAttributes)
-            {
-                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();
-                    foreach (var implem in implems)
-                    {
-                        if (requirements[implem] == null) requirements[implem] = new List<Type>();
-                        requirements[implem].Add(type);
-                    }
-                }
-                // required by a class
-                else
-                {
-                    if (types.Contains(attr.RequiringType))
-                    {
-                        if (requirements[attr.RequiringType] == null) requirements[attr.RequiringType] = new List<Type>();
-                        requirements[attr.RequiringType].Add(type);
-                    }
-                }
-            }
-        }
-
-        private IEnumerable<IComposer> InstantiateComposers(IEnumerable<Type> types)
-        {
-            IComposer InstantiateComposer(Type type)
-            {
-                var ctor = type.GetConstructor(Array.Empty<Type>());
-                if (ctor == null)
-                    throw new InvalidOperationException($"Composer {type.FullName} does not have a parameter-less constructor.");
-                return (IComposer) ctor.Invoke(Array.Empty<object>());
-            }
-
-            using (_logger.DebugDuration<Composers>("Instantiating composers.", "Instantiated composers."))
-            {
-                return types.Select(InstantiateComposer).ToArray();
-            }
-        }
-    }
-}
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
+using LightInject;

 namespace Umbraco.Core.Components
 {
@@ -14,206 +10,28 @@ namespace Umbraco.Core.Components
    /// avoid accessing the container. This is because everything needs to be properly registered and with
    /// the proper lifecycle. These methods will take care of it. Directly registering into the container
    /// may cause issues.</remarks>
-    public class Composition : IRegister
+    public class Composition
    {
-        private readonly Dictionary<Type, ICollectionBuilder> _builders = new Dictionary<Type, ICollectionBuilder>();
-        private readonly Dictionary<Type, Unique> _uniques = new Dictionary<Type, Unique>();
-        private readonly IRegister _register;
-
        /// <summary>
        /// Initializes a new instance of the <see cref="Composition"/> class.
        /// </summary>
-        /// <param name="register">A register.</param>
-        /// <param name="typeLoader">A type loader.</param>
-        /// <param name="logger">A logger.</param>
-        /// <param name="runtimeState">The runtime state.</param>
-        /// <param name="configs">Optional configs.</param>
-        public Composition(IRegister register, TypeLoader typeLoader, IProfilingLogger logger, IRuntimeState runtimeState, Configs configs = null)
+        /// <param name="container">A container.</param>
+        /// <param name="level">The runtime level.</param>
+        public Composition(IServiceContainer container, RuntimeLevel level)
        {
-            _register = register;
-            TypeLoader = typeLoader;
-            Logger = logger;
-            RuntimeState = runtimeState;
-
-            if (configs == null)
-            {
-                configs = new Configs();
-                configs.AddCoreConfigs();
-            }
-
-            Configs = configs;
-        }
-
-        #region Services
-
-        /// <summary>
-        /// Gets the logger.
-        /// </summary>
-        public IProfilingLogger Logger { get; }
-
-        /// <summary>
-        /// Gets the type loader.
-        /// </summary>
-        public TypeLoader TypeLoader { get; }
-
-        /// <summary>
-        /// Gets the runtime state.
-        /// </summary>
-        public IRuntimeState RuntimeState { get; }
-
-        /// <summary>
-        /// Gets the configurations.
-        /// </summary>
-        public Configs Configs { get; }
-
-        #endregion
-
-        #region IRegister
-
-        /// <inheritdoc />
-        public object Concrete => _register.Concrete;
-
-        /// <inheritdoc />
-        public void Register(Type serviceType, Lifetime lifetime = Lifetime.Transient)
-            => _register.Register(serviceType, lifetime);
-
-        /// <inheritdoc />
-        public void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            => _register.Register(serviceType, implementingType, lifetime);
-
-        /// <inheritdoc />
-        public void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            => _register.Register(factory, lifetime);
-
-        /// <inheritdoc />
-        public void RegisterInstance(Type serviceType, object instance)
-            => _register.RegisterInstance(serviceType, instance);
-
-        /// <inheritdoc />
-        public void RegisterAuto(Type serviceBaseType)
-            => _register.RegisterAuto(serviceBaseType);
-
-        /// <inheritdoc />
-        public void ConfigureForWeb()
-            => _register.ConfigureForWeb();
-
-        /// <inheritdoc />
-        public IFactory CreateFactory()
-        {
-            foreach (var onCreating in OnCreatingFactory.Values)
-                onCreating();
-
-            foreach (var unique in _uniques.Values)
-                unique.RegisterWith(_register);
-
-            foreach (var builder in _builders.Values)
-                builder.RegisterWith(_register);
-
-            Configs.RegisterWith(_register);
-
-            return _register.CreateFactory();
+            Container = container;
+            RuntimeLevel = level;
        }

        /// <summary>
-        /// Gets a dictionary of action to execute when creating the factory.
+        /// Gets the container.
        /// </summary>
-        public Dictionary<string, Action> OnCreatingFactory { get; } = new Dictionary<string, Action>();
-
-        #endregion
-
-        #region Unique
+        /// <remarks>Use with care!</remarks>
+        public IServiceContainer Container { get; }

        /// <summary>
-        /// Registers a unique service.
+        /// Gets the runtime level.
        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUnique(Type serviceType, Type implementingType)
-            => _uniques[serviceType] = new Unique(serviceType, implementingType);
-
-        /// <summary>
-        /// Registers a unique service.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUnique(Type serviceType, object instance)
-            => _uniques[serviceType] = new Unique(serviceType, instance);
-
-        /// <summary>
-        /// Registers a unique service.
-        /// </summary>
-        /// <remarks>Unique services have one single implementation, and a Singleton lifetime.</remarks>
-        public void RegisterUnique<TService>(Func<IFactory, TService> factory)
-            => _uniques[typeof(TService)] = new Unique<TService>(factory);
-
-        private class Unique
-        {
-            private readonly Type _serviceType;
-            private readonly Type _implementingType;
-            private readonly object _instance;
-
-            protected Unique(Type serviceType)
-            {
-                _serviceType = serviceType;
-            }
-
-            public Unique(Type serviceType, Type implementingType)
-                : this(serviceType)
-            {
-                _implementingType = implementingType;
-            }
-
-            public Unique(Type serviceType, object instance)
-                : this(serviceType)
-            {
-                _instance = instance;
-            }
-
-            public virtual void RegisterWith(IRegister register)
-            {
-                if (_implementingType != null)
-                    register.Register(_serviceType, _implementingType, Lifetime.Singleton);
-                else if (_instance != null)
-                    register.RegisterInstance(_serviceType, _instance);
-            }
-        }
-
-        private class Unique<TService> : Unique
-        {
-            private readonly Func<IFactory, TService> _factory;
-
-            public Unique(Func<IFactory, TService> factory)
-                : base(typeof(TService))
-            {
-                _factory = factory;
-            }
-
-            public override void RegisterWith(IRegister register)
-            {
-                register.Register(_factory, Lifetime.Singleton);
-            }
-        }
-
-        #endregion
-
-        #region Collection Builders
-
-        /// <summary>
-        /// Gets a collection builder (and registers the collection).
-        /// </summary>
-        /// <typeparam name="TBuilder">The type of the collection builder.</typeparam>
-        /// <returns>The collection builder.</returns>
-        public TBuilder WithCollectionBuilder<TBuilder>()
-            where TBuilder: ICollectionBuilder, new()
-        {
-            var typeOfBuilder = typeof(TBuilder);
-
-            if (_builders.TryGetValue(typeOfBuilder, out var o))
-                return (TBuilder) o;
-
-            var builder = new TBuilder();
-            _builders[typeOfBuilder] = builder;
-            return builder;
-        }
-
-        #endregion
+        public RuntimeLevel RuntimeLevel { get; }
    }
 }
@@ -1,8 +1,9 @@
 using System;
+using System.Runtime.CompilerServices;
+using LightInject;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Composing;
-using Umbraco.Core.IO;
 using Umbraco.Core.Migrations;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence.Mappers;
@@ -18,45 +19,6 @@ namespace Umbraco.Core.Components
    /// </summary>
    public static class CompositionExtensions
    {
-        #region FileSystems
-
-        /// <summary>
-        /// Registers a filesystem.
-        /// </summary>
-        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
-        /// <typeparam name="TImplementing">The implementing type.</typeparam>
-        /// <param name="composition">The composition.</param>
-        /// <param name="supportingFileSystemFactory">A factory method creating the supporting filesystem.</param>
-        /// <returns>The register.</returns>
-        public static void RegisterFileSystem<TFileSystem, TImplementing>(this Composition composition, Func<IFactory, IFileSystem> supportingFileSystemFactory)
-            where TImplementing : FileSystemWrapper, TFileSystem
-        {
-            composition.RegisterUnique<TFileSystem>(factory =>
-            {
-                var fileSystems = factory.GetInstance<FileSystems>();
-                return fileSystems.GetFileSystem<TImplementing>(supportingFileSystemFactory(factory));
-            });
-        }
-
-        /// <summary>
-        /// Registers a filesystem.
-        /// </summary>
-        /// <typeparam name="TFileSystem">The type of the filesystem.</typeparam>
-        /// <param name="composition">The composition.</param>
-        /// <param name="supportingFileSystemFactory">A factory method creating the supporting filesystem.</param>
-        /// <returns>The register.</returns>
-        public static void RegisterFileSystem<TFileSystem>(this Composition composition, Func<IFactory, IFileSystem> supportingFileSystemFactory)
-            where TFileSystem : FileSystemWrapper
-        {
-            composition.RegisterUnique(factory =>
-            {
-                var fileSystems = factory.GetInstance<FileSystems>();
-                return fileSystems.GetFileSystem<TFileSystem>(supportingFileSystemFactory(factory));
-            });
-        }
-
-        #endregion
-
        #region Collection Builders

        /// <summary>
@@ -64,66 +26,60 @@ namespace Umbraco.Core.Components
        /// </summary>
        /// <param name="composition">The composition.</param>
        public static CacheRefresherCollectionBuilder CacheRefreshers(this Composition composition)
-            => composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>();
+            => composition.Container.GetInstance<CacheRefresherCollectionBuilder>();

        /// <summary>
        /// Gets the mappers collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
        public static MapperCollectionBuilder Mappers(this Composition composition)
-            => composition.WithCollectionBuilder<MapperCollectionBuilder>();
+            => composition.Container.GetInstance<MapperCollectionBuilder>();

        /// <summary>
        /// Gets the package actions collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
        internal static PackageActionCollectionBuilder PackageActions(this Composition composition)
-            => composition.WithCollectionBuilder<PackageActionCollectionBuilder>();
+            => composition.Container.GetInstance<PackageActionCollectionBuilder>();

        /// <summary>
        /// Gets the data editor collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
        public static DataEditorCollectionBuilder DataEditors(this Composition composition)
-            => composition.WithCollectionBuilder<DataEditorCollectionBuilder>();
+            => composition.Container.GetInstance<DataEditorCollectionBuilder>();

        /// <summary>
        /// Gets the property value converters collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
        public static PropertyValueConverterCollectionBuilder PropertyValueConverters(this Composition composition)
-            => composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
+            => composition.Container.GetInstance<PropertyValueConverterCollectionBuilder>();

        /// <summary>
        /// Gets the url segment providers collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
        public static UrlSegmentProviderCollectionBuilder UrlSegmentProviders(this Composition composition)
-            => composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>();
+            => composition.Container.GetInstance<UrlSegmentProviderCollectionBuilder>();

        /// <summary>
        /// Gets the validators collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
        internal static ManifestValueValidatorCollectionBuilder Validators(this Composition composition)
-            => composition.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>();
+            => composition.Container.GetInstance<ManifestValueValidatorCollectionBuilder>();

        /// <summary>
        /// Gets the post-migrations collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
        internal static PostMigrationCollectionBuilder PostMigrations(this Composition composition)
-            => composition.WithCollectionBuilder<PostMigrationCollectionBuilder>();
-
-        /// <summary>
-        /// Gets the components collection builder.
-        /// </summary>
-        public static ComponentCollectionBuilder Components(this Composition composition)
-            => composition.WithCollectionBuilder<ComponentCollectionBuilder>();
+            => composition.Container.GetInstance<PostMigrationCollectionBuilder>();

        #endregion

-        #region Uniques
+        #region Singleton

        /// <summary>
        /// Sets the culture dictionary factory.
@@ -133,7 +89,7 @@ namespace Umbraco.Core.Components
        public static void SetCultureDictionaryFactory<T>(this Composition composition)
            where T : ICultureDictionaryFactory
        {
-            composition.RegisterUnique<ICultureDictionaryFactory, T>();
+            composition.Container.RegisterSingleton<ICultureDictionaryFactory, T>();
        }

        /// <summary>
@@ -141,9 +97,9 @@ namespace Umbraco.Core.Components
        /// </summary>
        /// <param name="composition">The composition.</param>
        /// <param name="factory">A function creating a culture dictionary factory.</param>
-        public static void SetCultureDictionaryFactory(this Composition composition, Func<IFactory, ICultureDictionaryFactory> factory)
+        public static void SetCultureDictionaryFactory(this Composition composition, Func<IServiceFactory, ICultureDictionaryFactory> factory)
        {
-            composition.RegisterUnique(factory);
+            composition.Container.RegisterSingleton(factory);
        }

        /// <summary>
@@ -153,7 +109,7 @@ namespace Umbraco.Core.Components
        /// <param name="factory">A factory.</param>
        public static void SetCultureDictionaryFactory(this Composition composition, ICultureDictionaryFactory factory)
        {
-            composition.RegisterUnique(_ => factory);
+            composition.Container.RegisterSingleton(_ => factory);
        }

        /// <summary>
@@ -164,7 +120,7 @@ namespace Umbraco.Core.Components
        public static void SetPublishedContentModelFactory<T>(this Composition composition)
            where T : IPublishedModelFactory
        {
-            composition.RegisterUnique<IPublishedModelFactory, T>();
+            composition.Container.RegisterSingleton<IPublishedModelFactory, T>();
        }

        /// <summary>
@@ -172,9 +128,9 @@ namespace Umbraco.Core.Components
        /// </summary>
        /// <param name="composition">The composition.</param>
        /// <param name="factory">A function creating a published content model factory.</param>
-        public static void SetPublishedContentModelFactory(this Composition composition, Func<IFactory, IPublishedModelFactory> factory)
+        public static void SetPublishedContentModelFactory(this Composition composition, Func<IServiceFactory, IPublishedModelFactory> factory)
        {
-            composition.RegisterUnique(factory);
+            composition.Container.RegisterSingleton(factory);
        }

        /// <summary>
@@ -184,7 +140,7 @@ namespace Umbraco.Core.Components
        /// <param name="factory">A published content model factory.</param>
        public static void SetPublishedContentModelFactory(this Composition composition, IPublishedModelFactory factory)
        {
-            composition.RegisterUnique(_ => factory);
+            composition.Container.RegisterSingleton(_ => factory);
        }

        /// <summary>
@@ -195,7 +151,7 @@ namespace Umbraco.Core.Components
        public static void SetServerRegistrar<T>(this Composition composition)
            where T : IServerRegistrar
        {
-            composition.RegisterUnique<IServerRegistrar, T>();
+            composition.Container.RegisterSingleton<IServerRegistrar, T>();
        }

        /// <summary>
@@ -203,9 +159,9 @@ namespace Umbraco.Core.Components
        /// </summary>
        /// <param name="composition">The composition.</param>
        /// <param name="factory">A function creating a server registar.</param>
-        public static void SetServerRegistrar(this Composition composition, Func<IFactory, IServerRegistrar> factory)
+        public static void SetServerRegistrar(this Composition composition, Func<IServiceFactory, IServerRegistrar> factory)
        {
-            composition.RegisterUnique(factory);
+            composition.Container.RegisterSingleton(factory);
        }

        /// <summary>
@@ -215,7 +171,7 @@ namespace Umbraco.Core.Components
        /// <param name="registrar">A server registrar.</param>
        public static void SetServerRegistrar(this Composition composition, IServerRegistrar registrar)
        {
-            composition.RegisterUnique(_ => registrar);
+            composition.Container.RegisterSingleton(_ => registrar);
        }

        /// <summary>
@@ -226,7 +182,7 @@ namespace Umbraco.Core.Components
        public static void SetServerMessenger<T>(this Composition composition)
            where T : IServerMessenger
        {
-            composition.RegisterUnique<IServerMessenger, T>();
+            composition.Container.RegisterSingleton<IServerMessenger, T>();
        }

        /// <summary>
@@ -234,9 +190,9 @@ namespace Umbraco.Core.Components
        /// </summary>
        /// <param name="composition">The composition.</param>
        /// <param name="factory">A function creating a server messenger.</param>
-        public static void SetServerMessenger(this Composition composition, Func<IFactory, IServerMessenger> factory)
+        public static void SetServerMessenger(this Composition composition, Func<IServiceFactory, IServerMessenger> factory)
        {
-            composition.RegisterUnique(factory);
+            composition.Container.RegisterSingleton(factory);
        }

        /// <summary>
@@ -246,7 +202,7 @@ namespace Umbraco.Core.Components
        /// <param name="registrar">A server messenger.</param>
        public static void SetServerMessenger(this Composition composition, IServerMessenger registrar)
        {
-            composition.RegisterUnique(_ => registrar);
+            composition.Container.RegisterSingleton(_ => registrar);
        }

        /// <summary>
@@ -257,7 +213,7 @@ namespace Umbraco.Core.Components
        public static void SetShortStringHelper<T>(this Composition composition)
            where T : IShortStringHelper
        {
-            composition.RegisterUnique<IShortStringHelper, T>();
+            composition.Container.RegisterSingleton<IShortStringHelper, T>();
        }

        /// <summary>
@@ -265,9 +221,9 @@ namespace Umbraco.Core.Components
        /// </summary>
        /// <param name="composition">The composition.</param>
        /// <param name="factory">A function creating a short string helper.</param>
-        public static void SetShortStringHelper(this Composition composition, Func<IFactory, IShortStringHelper> factory)
+        public static void SetShortStringHelper(this Composition composition, Func<IServiceFactory, IShortStringHelper> factory)
        {
-            composition.RegisterUnique(factory);
+            composition.Container.RegisterSingleton(factory);
        }

        /// <summary>
@@ -277,7 +233,7 @@ namespace Umbraco.Core.Components
        /// <param name="helper">A short string helper.</param>
        public static void SetShortStringHelper(this Composition composition, IShortStringHelper helper)
        {
-            composition.RegisterUnique(_ => helper);
+            composition.Container.RegisterSingleton(_ => helper);
        }

        #endregion
@@ -1,38 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Indicates that a composer should be disabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>If a type is specified, disables the composer of that type, else disables the composer marked with the attribute.</para>
-    /// <para>This attribute is *not* inherited.</para>
-    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>If a composer ends up being both enabled and disabled: attributes marking the composer itself have lower priority
-    /// than attributes on *other* composers, eg if a composer declares itself as disabled it is possible to enable it from
-    /// another composer. Anything else is unspecified.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-    public class DisableAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisableAttribute"/> class.
-        /// </summary>
-        public DisableAttribute()
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisableAttribute"/> class.
-        /// </summary>
-        public DisableAttribute(Type disabledType)
-        {
-            DisabledType = disabledType;
-        }
-
-        /// <summary>
-        /// Gets the disabled type, or null if it is the composer marked with the attribute.
-        /// </summary>
-        public Type DisabledType { get; }
-    }
-}
@@ -0,0 +1,38 @@
+using System;
+
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Indicates that a component should be disabled.
+    /// </summary>
+    /// <remarks>
+    /// <para>If a type is specified, disables the component of that type, else disables the component marked with the attribute.</para>
+    /// <para>This attribute is *not* inherited.</para>
+    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
+    /// <para>If a component ends up being both enabled and disabled: attributes marking the component itself have lower priority
+    /// than attributes on *other* components, eg if a component declares itself as disabled it is possible to enable it from
+    /// another component. Anything else is unspecified.</para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
+    public class DisableComponentAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DisableComponentAttribute"/> class.
+        /// </summary>
+        public DisableComponentAttribute()
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DisableComponentAttribute"/> class.
+        /// </summary>
+        public DisableComponentAttribute(Type disabledType)
+        {
+            DisabledType = disabledType;
+        }
+
+        /// <summary>
+        /// Gets the disabled type, or null if it is the component marked with the attribute.
+        /// </summary>
+        public Type DisabledType { get; }
+    }
+}
@@ -1,38 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Indicates that a composer should be enabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>If a type is specified, enables the composer of that type, else enables the composer marked with the attribute.</para>
-    /// <para>This attribute is *not* inherited.</para>
-    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
-    /// <para>If a composer ends up being both enabled and disabled: attributes marking the composer itself have lower priority
-    /// than attributes on *other* composers, eg if a composer declares itself as disabled it is possible to enable it from
-    /// another composer. Anything else is unspecified.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-    public class EnableAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableAttribute"/> class.
-        /// </summary>
-        public EnableAttribute()
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableAttribute"/> class.
-        /// </summary>
-        public EnableAttribute(Type enabledType)
-        {
-            EnabledType = enabledType;
-        }
-
-        /// <summary>
-        /// Gets the enabled type, or null if it is the composer marked with the attribute.
-        /// </summary>
-        public Type EnabledType { get; }
-    }
-}
@@ -0,0 +1,38 @@
+using System;
+
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Indicates that a component should be enabled.
+    /// </summary>
+    /// <remarks>
+    /// <para>If a type is specified, enables the component of that type, else enables the component marked with the attribute.</para>
+    /// <para>This attribute is *not* inherited.</para>
+    /// <para>This attribute applies to classes only, it is not possible to enable/disable interfaces.</para>
+    /// <para>If a component ends up being both enabled and disabled: attributes marking the component itself have lower priority
+    /// than attributes on *other* components, eg if a component declares itself as disabled it is possible to enable it from
+    /// another component. Anything else is unspecified.</para>
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
+    public class EnableComponentAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnableComponentAttribute"/> class.
+        /// </summary>
+        public EnableComponentAttribute()
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnableComponentAttribute"/> class.
+        /// </summary>
+        public EnableComponentAttribute(Type enabledType)
+        {
+            EnabledType = enabledType;
+        }
+
+        /// <summary>
+        /// Gets the enabled type, or null if it is the component marked with the attribute.
+        /// </summary>
+        public Type EnabledType { get; }
+    }
+}
@@ -1,25 +0,0 @@
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Represents a component.
-    /// </summary>
-    /// <remarks>
-    /// <para>Components are created by DI and therefore must have a public constructor.</para>
-    /// <para>All components are terminated in reverse order when Umbraco terminates, and
-    /// disposable components are disposed.</para>
-    /// <para>The Dispose method may be invoked more than once, and components
-    /// should ensure they support this.</para>
-    /// </remarks>
-    public interface IComponent
-    {
-        /// <summary>
-        /// Initializes the component.
-        /// </summary>
-        void Initialize();
-
-        /// <summary>
-        /// Terminates the component.
-        /// </summary>
-        void Terminate();
-    }
-}
@@ -1,16 +0,0 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Represents a composer.
-    /// </summary>
-    public interface IComposer : IDiscoverable
-    {
-        /// <summary>
-        /// Compose.
-        /// </summary>
-        /// <param name="composition"></param>
-        void Compose(Composition composition);
-    }
-}
@@ -1,13 +0,0 @@
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Represents a core <see cref="IComposer"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>All core composers are required by (compose before) all user composers,
-    /// and require (compose after) all runtime composers.</para>
-    /// </remarks>
-    [ComposeAfter(typeof(IRuntimeComposer))]
-    public interface ICoreComposer : IComposer
-    { }
-}
@@ -0,0 +1,5 @@
+namespace Umbraco.Core.Components
+{
+    public interface IRuntimeComponent : IUmbracoComponent
+    { }
+}
@@ -1,11 +0,0 @@
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Represents a runtime <see cref="IComposer"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>All runtime composers are required by (compose before) all core composers</para>
-    /// </remarks>
-    public interface IRuntimeComposer : IComposer
-    { }
-}
@@ -0,0 +1,21 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Represents an Umbraco component.
+    /// </summary>
+    public interface IUmbracoComponent : IDiscoverable
+    {
+        /// <summary>
+        /// Composes the component.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        void Compose(Composition composition);
+
+        /// <summary>
+        /// Terminates the component.
+        /// </summary>
+        void Terminate();
+    }
+}
@@ -0,0 +1,6 @@
+namespace Umbraco.Core.Components
+{
+    [RequireComponent(typeof(IRuntimeComponent))]
+    public interface IUmbracoCoreComponent : IUmbracoComponent
+    { }
+}
@@ -0,0 +1,6 @@
+namespace Umbraco.Core.Components
+{
+    [RequireComponent(typeof(UmbracoCoreComponent))]
+    public interface IUmbracoUserComponent : IUmbracoComponent
+    { }
+}
@@ -1,12 +0,0 @@
-namespace Umbraco.Core.Components
-{
-    /// <summary>
-    /// Represents a user <see cref="IComposer"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>All user composers require (compose after) all core composers.</para>
-    /// </remarks>
-    [ComposeAfter(typeof(ICoreComposer))]
-    public interface IUserComposer : IComposer
-    { }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lars-Erik Aabech	350f60c056	Grid 2: All current tests pass! \o/	2018-05-22 10:47:33 +02:00
Lars-Erik Aabech	954b5ac296	Merge branch 'temp8-grid2-extended' into temp8-grid2	2018-05-21 18:31:57 +02:00
Lars-Erik Aabech	12787f0bd2	Grid 2: UniqueIDs on rows and items for events.	2018-05-21 18:30:03 +02:00
Shannon	6cf15f42a8	icon placeholder for controls with no inline view	2018-05-21 16:50:23 +02:00
Shannon	b5b971a189	Fixes the editors that load	2018-05-21 16:32:13 +02:00
Lars-Erik Aabech	26a026b17a	Extension points for the grid	2018-05-21 15:55:15 +02:00
leekelleher	9054b84c50	Grid2: Amends to the value-converter	2018-05-21 14:36:26 +01:00
Lars-Erik Aabech	5cb5f13d08	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-21 12:54:36 +02:00
Lars-Erik Aabech	89468fce97	Grid 2: Respecting allowed editors by udi	2018-05-21 12:54:04 +02:00
leekelleher	a1997291ab	Grid2: Switch to using Bootstrap4 grid layout #opinionated	2018-05-21 11:47:22 +01:00
Lars-Erik Aabech	1f8fae0dd4	Grid 2: Switching for UDI for scaffold	2018-05-21 12:39:48 +02:00
Lars-Erik Aabech	3bd2f766ef	Grid 2: Fixed typo in tests	2018-05-21 12:39:48 +02:00
Shannon	f8ed341eec	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-21 12:39:21 +02:00
Shannon	f3b745f5b3	change to udi	2018-05-21 12:39:04 +02:00
Callum Whyte	8d23a9b480	Changing grid editor picker on row settings in prevalue to show doctype details	2018-05-21 11:13:51 +01:00
Shannon	c2e89ed955	Grid 2: Refactored grid editor to use new model and property editors w/ @lars-erik	2018-05-21 11:54:13 +02:00
mattbrailsford	782fc26723	A working grid value converter	2018-05-21 10:49:51 +01:00
Callum Whyte	378c2f727c	Changing Id to UDI on Grid Content Type to follow convention	2018-05-21 10:33:49 +01:00
Callum Whyte	5c983bce5f	Cleanup of Grid Controller	2018-05-21 10:03:47 +01:00
Callum Whyte	4eb18855e9	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-21 10:02:18 +01:00
Callum Whyte	2200839bfa	Restricting grid cells to selected available editors	2018-05-21 10:01:36 +01:00
Mads Rasmussen	796cb9c35b	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-21 10:49:25 +02:00
Mads Rasmussen	ac0d21cb3d	load only grid editors in grid editor picker	2018-05-21 10:48:47 +02:00
leekelleher	70951317c5	Grid2: Refactored the GridTemplateExtensions methods - Put the default property-alias and framework in a local constant - Removed the obsolete methods	2018-05-21 09:32:28 +01:00
Mads Rasmussen	4270a6c440	add grid editor picker	2018-05-21 10:31:22 +02:00
mattbrailsford	030688f1a2	Fleshed out Grid2 Value Converter (untested)	2018-05-21 08:50:00 +01:00
Callum Whyte	b11b2c0a71	Adjusting grid prevalue editor layout for a better user experience	2018-05-21 08:46:06 +01:00
Callum Whyte	7680ce4ef1	Fixing issue with storing content type UDIs for allowed types in Grid v2 prevalue editor	2018-05-21 08:41:41 +01:00
leekelleher	ab872b7ca4	Grid2: Refactored the `GetGridHtml` methods The entry point for the "Grid" partial-view folder was defined in multiple places, now they all ultimately go through a single entry point, (the `GetGridHtml` with HtmlHelper, IPublishedProperty and framework) Easier to maintain if/when the partial-view path changes.	2018-05-20 18:03:20 +01:00
leekelleher	8533210761	Grid2: Refactored the partial-view templates	2018-05-20 17:42:56 +01:00
leekelleher	673575594d	Grid2: More work on the the partial-view templates	2018-05-20 17:42:56 +01:00
leekelleher	4702bdab33	Grid2: Reverted `GridValue` amends, as this is used specifically for Grid v1 with Deploy.	2018-05-20 17:42:56 +01:00
leekelleher	ab08f1fc06	Grid2: Made a start with strongly-typed partial-view templates Copied over the partial-views from the "Grid" folder (renamed to "Grid2")	2018-05-20 17:42:56 +01:00
Lars-Erik Aabech	6b29bbc9e7	Simple grid 2 tests pass.	2018-05-20 18:42:09 +02:00
Lars-Erik Aabech	80f92311dc	Stubbed gridresource w/scaffold	2018-05-20 18:25:08 +02:00
Callum Whyte	c1723cbda6	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-20 17:24:11 +01:00
Callum Whyte	5ee0311371	Updating grid v2 prevalue editor config to use doctypes	2018-05-20 17:23:12 +01:00
Callum Whyte	d6c7ba03e6	Changing grid v2 row config editor to use correct namespaces	2018-05-20 17:21:23 +01:00
Callum Whyte	32ecf932a6	Changing Grid content types to use UDIs	2018-05-20 17:16:49 +01:00
Lars-Erik Aabech	26d16e3897	Mapping in the controller	2018-05-20 18:14:31 +02:00
Lars-Erik Aabech	ab0074e07c	Added *.log to gitignore	2018-05-20 18:11:29 +02:00
Lars-Erik Aabech	71c8e20a79	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-20 18:10:33 +02:00
Lars-Erik Aabech	58bd7e8453	Modifying models in the tests	2018-05-20 18:10:14 +02:00
Shannon	d57c168f82	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-20 18:09:09 +02:00
Shannon	4a5a7068bc	Allows rendering property editors inside the grid	2018-05-20 18:08:59 +02:00
Lars-Erik Aabech	d34649ab1a	Mapping from grid view model to persistable model (in spec for now)	2018-05-20 17:44:25 +02:00
mattbrailsford	24407ead18	Merge remote-tracking branch 'origin/temp8-grid2' into temp8-grid2	2018-05-20 16:39:58 +01:00
mattbrailsford	ad4f0cf9d1	Merge remote-tracking branch 'origin/temp8-grid2' into temp8-grid2 # Conflicts: # src/Umbraco.Core/PropertyEditors/ValueConverters/Grid2ValueConverter.cs # src/Umbraco.Core/Umbraco.Core.csproj	2018-05-20 16:38:43 +01:00
mattbrailsford	f5efb7609a	Added todo reminders	2018-05-20 16:29:20 +01:00
mattbrailsford	ab82d3b053	Added Grid2Value model	2018-05-20 16:23:15 +01:00
Mads Rasmussen	36e0673c83	set row name and alias through editor header	2018-05-20 16:48:32 +02:00
Mads Rasmussen	9d27e7386e	convert row configuration dialog into an infinite editor	2018-05-20 16:29:23 +02:00
Lars-Erik Aabech	8502e10900	changed schema for grid data in spec to what we're aiming at	2018-05-20 16:14:22 +02:00
Lars-Erik Aabech	0a701d0c64	Tests adding editors to cells	2018-05-20 16:14:22 +02:00
Lars-Erik Aabech	ceaa15aa82	Tests adding default layout and row.	2018-05-20 16:14:22 +02:00
Lars-Erik Aabech	2445e0cbcb	Grid controller initial test	2018-05-20 16:14:22 +02:00
Shannon	5a5ad350d6	oops	2018-05-20 15:57:58 +02:00
Shannon	40e986d5dc	Adds grid.resource	2018-05-20 15:56:40 +02:00
Shannon	c81b68e9a8	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-20 15:43:18 +02:00
Shannon	8e9f1bc949	Updates controller to check for special inline.html views for property editors	2018-05-20 15:43:09 +02:00
leekelleher	e8b7ffd6f5	Grid2: initial commit for the strongly-typed model - value converter	2018-05-20 14:26:54 +01:00
Callum Whyte	b12eecfb1d	Refactoring out legacy grid default config and RTE styles	2018-05-20 14:25:05 +01:00
Callum Whyte	06ca34f434	Removing RTE settings from grid v2 prevalue editor	2018-05-20 14:09:26 +01:00
Mads Rasmussen	5880b1b612	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-20 15:00:14 +02:00
Mads Rasmussen	12fc88aca9	load correct views and controller for grid2	2018-05-20 14:59:45 +02:00
Shannon	e56db8baa4	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-20 14:50:54 +02:00
Shannon	c7aae533ad	Creates c# controller for getting grid cell scaffold and meta data	2018-05-20 14:47:20 +02:00
Mads Rasmussen	acaa062b7d	remove config of layouts	2018-05-20 12:41:07 +02:00
Shannon	f9928906fa	changes pre value path	2018-05-20 12:34:22 +02:00
Callum Whyte	d3719122ce	Merge branch 'temp8-grid2' of https://github.com/umbraco/Umbraco-CMS into temp8-grid2	2018-05-20 11:19:51 +01:00
Mads Rasmussen	1e3fbf4e2f	Merge	2018-05-20 12:16:50 +02:00
Shannon	fc8130987c	fixes view path	2018-05-20 12:15:41 +02:00
Shannon	f3dc8f592b	removes grid editor files	2018-05-20 12:14:20 +02:00
Shannon	8fda46f0ad	Deprecates old grid editor	2018-05-20 12:12:18 +02:00
Mads Rasmussen	8d3c9caafb	add one layout by default	2018-05-20 12:09:55 +02:00
Callum Whyte	23031a64d1	Fixing issue with serialising Grid Configuration	2018-05-20 11:09:54 +01:00
Shannon	37b27f5e73	copies new grid editor	2018-05-20 12:02:11 +02:00