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
4987 changed files with 442612 additions and 330801 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,14 +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
-
-[*.{js,less}]
-trim_trailing_whitespace = false
+dotnet_naming_style.prefix_underscore.required_prefix = _
@@ -1,212 +0,0 @@
-# Umbraco Cms Build
-
-## Are you sure?
-
-In order to use Umbraco as a CMS and build your website with it, you should not build it yourself. If you're reading this then you're trying to contribute to Umbraco or you're debugging a complex issue.
-
- Are you about to create a pull request for Umbraco?
- Are you trying to get to the bottom of a problem in your existing Umbraco installation?
-
-If the answer is yes, please read on. Otherwise, make sure to head on over [to the download page](https://our.umbraco.com/download) and start using Umbraco CMS as intended.
-
-**Table of contents**
-
-[Building from source](#building-from-source)
-  * [The quick build](#quick)
-  * [Build infrastructure](#build-infrastructure)
-    * [Properties](#properties)
-    * [GetUmbracoVersion](#getumbracoversion)
-    * [SetUmbracoVersion](#setumbracoversion)
-    * [Build](#build)
-    * [Build-UmbracoDocs](#build-umbracodocs)
-    * [Verify-NuGet](#verify-nuget)
-  * [Cleaning up](#cleaning-up)
-
-[Azure DevOps](#azure-devops)
-
-[Quirks](#quirks)
-  * [Powershell quirks](#powershell-quirks)
-  * [Git quirks](#git-quirks)
-
-
-## Building from source
-
-Did you read ["Are you sure"](#are-you-sure)?
-
-### Quick!
-
-To build Umbraco, fire up PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `LICENSE.md`...). There, trigger the build with the following command:
-
-    build/build.ps1
-    
-You might run into [Powershell quirks](#powershell-quirks).
-
-### Build Infrastructure
-
-The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
-
-    $ubuild = build/build.ps1 -get
-
-The object exposes various properties and methods that can be used to fine-grain build Umbraco. Some, but not all, of them are detailed below.
-    
-#### Properties
-
-The object exposes the following properties:
-
-* `SolutionRoot`: the absolute path to the solution root
-* `VisualStudio`: a Visual Studio object (see below)
-* `NuGet`: the absolute path to the NuGet executable
-* `Zip`: the absolute path to the 7Zip executable
-* `VsWhere`: the absolute path to the VsWhere executable
-* `NodePath`: the absolute path to the Node install
-* `NpmPath`: the absolute path to the Npm install
-
-The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
-
-* `Path`: Visual Studio installation path (eg some place under `Program Files`)
-* `Major`: Visual Studio major version (eg `15` for VS 2017)
-* `Minor`: Visual Studio minor version
-* `MsBUild`: the absolute path to the MsBuild executable
-
-#### GetUmbracoVersion
-
-Gets an object representing the current Umbraco version. Example:
-
-    $v = $ubuild.GetUmbracoVersion()
-    Write-Host $v.Semver
-
-The object exposes the following properties:
-
-* `Semver`: the semver object representing the version
-* `Release`: the main part of the version (eg `7.6.33`)
-* `Comment`: the pre release part of the version (eg `alpha02`)
-* `Build`: the build number part of the version (eg `1234`)
-
-#### SetUmbracoVersion
-
-Modifies Umbraco files with the new version.
-
->This entirely replaces the legacy `UmbracoVersion.txt` file. Do *not* edit version infos in files.
-
-The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
-
-    $ubuild.SetUmbracoVersion("7.6.33")
-    $ubuild.SetUmbracoVersion("7.6.33-alpha.2")
-    $ubuild.SetUmbracoVersion("7.6.33+1234")
-    $ubuild.SetUmbracoVersion("7.6.33-beta.5+5678")
-
-#### Build
-
-Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
-
-    $ubuild.Build()
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-**Note: web.config**
-
-Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
-
-#### Build-UmbracoDocs
-
-Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
-
-    Build-UmbracoDocs
-
-Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
-
-#### Verify-NuGet
-
-Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
-
-    Verify-NuGet
-
-### Cleaning up
-
-Once the solution has been used to run a site, one may want to "reset" the solution in order to run a fresh new site again.
-
-At the very minimum, you want
-
-    git clean -Xdf src/Umbraco.Web.UI/App_Data
-    rm src/Umbraco.Web.UI/web.config
-
-Then, a simple 'Rebuild All' in Visual Studio will recreate a fresh `web.config` but should be quite fast (since it does not really need to rebuild anything).
-
-The `clean` Git command force (`-f`) removes (`-X`, note the capital X) all files and directories (`-d`) that are ignored by Git.
-
-This will leave media files and views around, but in most cases, it will be enough.
-
-To perform a more complete clear, you will want to also delete the content of the media, views, scripts... directories.
-
-The following command will force remove all untracked files and directories, whether they are ignored by Git or not. Combined with `git reset` it can recreate a pristine working directory. 
-
-    git clean -xdf .
-    
-For git documentation see:
-* git [clean](<https://git-scm.com/docs/git-clean>)
-* git [reset](<https://git-scm.com/docs/git-reset>)
-
-## Azure DevOps
-
-Umbraco uses Azure DevOps for continuous integration, nightly builds and release builds. The Umbraco CMS project on DevOps [is available for anonymous users](https://umbraco.visualstudio.com/Umbraco%20Cms).
-
-DevOps uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
-
-* `pre-build`: prepares the build
-* `compile-belle`: compiles Belle
-* `compile-umbraco`: compiles Umbraco
-* `pre-tests`: prepares the tests
-* `compile-tests`: compiles the tests
-* `pre-packages`: prepares the packages
-* `pkg-zip`: creates the zip files
-* `pre-nuget`: prepares NuGet packages
-* `pkg-nuget`: creates NuGet packages
-
-All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated DevOps tasks. Similarly, creating the NuGet packages is also performed by dedicated DevOps tasks.
-
-Finally, the produced artifacts are published in two containers that can be downloaded from DevOps: `zips` contains the zip files while `nuget` contains the NuGet packages.
-
->During a DevOps build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in DevOps tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with DevOps at the moment.
-
-## Quirks
-
-### PowerShell Quirks
-
-There is a good chance that running `build.ps1` ends up in error, with messages such as
-
->The file ...\build.ps1 is not digitally signed. You cannot run this script on the current system. For more information about running scripts and setting execution policy, see about_Execution_Policies.
-
-PowerShell has *Execution Policies* that may prevent the script from running. You can check the current policies with:
-
-    PS> Get-ExecutionPolicy -List
-    
-            Scope ExecutionPolicy
-            ----- ---------------
-    MachinePolicy       Undefined
-       UserPolicy       Undefined
-          Process       Undefined
-      CurrentUser       Undefined
-     LocalMachine    RemoteSigned
-
-Policies can be `Restricted`, `AllSigned`, `RemoteSigned`, `Unrestricted` and `Bypass`. Scopes can be `MachinePolicy`, `UserPolicy`, `Process`, `CurrentUser`, `LocalMachine`. You need the current policy to be `RemoteSigned`&mdash;as long as it is `Undefined`, the script cannot run. You can change the current user policy with:
-
-    PS> Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy RemoteSigned
-
-Alternatively, you can do it at machine level, from within an elevated PowerShell session:
-
-    PS> Set-ExecutionPolicy -Scope LocalMachine -ExecutionPolicy RemoteSigned
-
-And *then* the script should run. It *might* however still complain about executing scripts, with messages such as:
-
->Security warning - Run only scripts that you trust. While scripts from the internet can be useful, this script can potentially harm your computer. If you trust this script, use the Unblock-File cmdlet to allow the script to run without this warning message. Do you want to run ...\build.ps1?
-[D] Do not run  [R] Run once  [S] Suspend  [?] Help (default is "D"):
-
-This is usually caused by the scripts being *blocked*. And that usually happens when the source code has been downloaded as a Zip file. When Windows downloads Zip files, they are marked as *blocked* (technically, they have a Zone.Identifier alternate data stream, with a value of "3" to indicate that they were downloaded from the Internet). And when such a Zip file is un-zipped, each and every single file is also marked as blocked.
-
-The best solution is to unblock the Zip file before un-zipping: right-click the files, open *Properties*, and there should be a *Unblock* checkbox at the bottom of the dialog. If, however, the Zip file has already been un-zipped, it is possible to recursively unblock all files from PowerShell with:
-
-    PS> Get-ChildItem -Recurse *.* | Unblock-File
-
-### Git Quirks
-
-Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
@@ -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,187 +0,0 @@
-# Contributing to Umbraco CMS
-
-👍🎉 First off, thanks for taking the time to contribute! 🎉👍
-
-The following is a set of guidelines for contributing to Umbraco CMS.
-
-These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
-
-Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
-
-**Code of conduct**
-
-This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
-
-**Table of contents**
-
-[Contributing code changes](#contributing-code-changes)
-  * [Guidelines for contributions we welcome](#guidelines-for-contributions-we-welcome)
-  * [What can I start with?](#what-can-i-start-with)
-  * [How do I begin?](#how-do-i-begin)
-  * [Pull requests](#pull-requests)
-
-[Reviews](#reviews)
-  * [Styleguides](#styleguides)
-  * [The PR team](#the-pr-team)
-  * [Questions?](#questions)
-
-[Working with the code](#working-with-the-code)
-  * [Building Umbraco from source code](#building-umbraco-from-source-code)
-  * [Working with the source code](#working-with-the-source-code)
-  * [Making changes after the PR was opened](#making-changes-after-the-pr-was-opened)
-  * [Which branch should I target for my contributions?](#which-branch-should-i-target-for-my-contributions)
-  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
-
-## Contributing code changes
-
-This document gives you a quick overview on how to get started.
-
-### Guidelines for contributions we welcome
-
-Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valuable time.
-
-We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md). Make sure to talk to us before making large changes.
-
-Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you sent us a PR, your PR will not be closed as unwanted.
-
-### What can I start with?
-
-Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` issues](https://github.com/umbraco/Umbraco-CMS/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs+)
-
-### How do I begin?
-
-Great question! The short version goes like this:
-
-  * **Fork** - create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
-
-  ![Fork the repository](img/forkrepository.png)
-
-  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
-
-  ![Clone the fork](img/clonefork.png)
-
-  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
-  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
-  * **Commit** - done? Yay! 🎉 **Important:** create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`. When you have a branch, commit your changes. Don't commit to `v8/dev`, create a new branch first.
-  * **Push** - great, now you can push the changes up to your fork on GitHub
-  * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
-
-  ![Create a pull request](img/createpullrequest.png)
-
-### Pull requests
-The most successful pull requests usually look a like this:
-
-  * Fill in the required template
-  * Include screenshots and animated GIFs in your pull request whenever possible.
-  * Unit tests, while optional are awesome, thank you!
-  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated
-
-Again, these are guidelines, not strict requirements.
-
-## Reviews
-
-You've sent us your first contribution, congratulations! Now what?
-
-The [pull request team](#the-pr-team) can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request you to make some additional changes.
-
-We have [a process in place which you can read all about](REVIEW_PROCESS.md). The very abbreviated version is:
-
- Your PR will get a reply within 48 hours
- An in-depth reply will be added within at most 2 weeks
- The PR will be either merged or rejected within at most 4 weeks
- Sometimes it is difficult to meet these timelines and we'll talk to you
-
-### Styleguides
-
-To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
-
-That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
-
-### The PR team
-
-The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members
-
- [Anders Bjerner](https://github.com/abjerner)
- [Dave Woestenborghs](https://github.com/dawoe)
- [Emma Burstow](https://github.com/emmaburstow)
- [Poornima Nayar](https://github.com/poornimanayar)
-
-These wonderful volunteers will provide you with a first reply to your PR, review and test out your changes and might ask more questions. After that they'll let Umbraco HQ know if everything seems okay.
-
-### Questions?
-
-You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love open conversations and we are a friendly bunch. No question you have is stupid. Any questions you have usually helps out multiple people with the same question. Ask away:
-
- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
-
-## Working with the code
-
-### Building Umbraco from source code
-
-In order to build the Umbraco source code locally, first make sure you have the following installed.
-
-  * Visual Studio 2017 v15.9.7+
-  * Node v10+
-  * npm v6.4.1+
-
-The easiest way to get started is to run `build.ps1` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.
-
-Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.9.7 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
-
-![Gulp build in Visual Studio](img/gulpbuild.png)
-
-After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser, follow the directions there to get a working Umbraco install up and running.
-
-### Working with the source code
-
-Some parts of our source code are over 10 years old now. And when we say "old", we mean "mature" of course!
-
-There's two big areas that you should know about:
-
-  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
-  You may need to run the following commands to set up gulp properly:
-  ```
-  npm cache clean --force
-  npm install
-  npm run build
-  ```
-  2. "The rest" is a C# based codebase, which is mostly ASP.NET MVC based. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
-
-To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.
-
-  * [The AngularJS based backoffice files](https://our.umbraco.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
-  * [The C# application](https://our.umbraco.com/apidocs/csharp/)
-
-### Which branch should I target for my contributions?
-
-We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `v8/dev`. Whatever the default is, that's where we'd like you to target your contributions.
-
-![Which branch should I target?](img/defaultbranch.png)
-
-### Making changes after the PR was opened
-
-If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
-
-### Keeping your Umbraco fork in sync with the main repository
-
-We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
-
-Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
-
-To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
-
-```
-git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
-```
-
-Then when you want to get the changes from the main repository:
-
-```
-git fetch upstream
-git rebase upstream/v8/dev
-```
-
-In this command we're syncing with the `v8/dev` branch, but you can of course choose another one if needed.
-
-(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
@@ -1,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,21 +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.
-
-    The most successful pull requests usually look a like this:
-
-    * Fill in this template with details: what did you do, why did you do it, how can we test the changes?
-    * Include screenshots and animated GIFs in your pull request whenever possible.
-    * Unit tests, while optional are awesome, thank you!
-
-    While these are guidelines and not strict requirements, they really help us evaluate your PR quicker.
-->
-
-
-<!-- Thanks for contributing to Umbraco CMS! -->
@@ -1,40 +0,0 @@
-# [Umbraco CMS](https://umbraco.com) &middot; [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](../LICENSE.md) [![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=v8/dev)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) [![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
-
-Umbraco is the friendliest, most flexible and fastest growing ASP.NET CMS, and used by more than 500,000 websites worldwide. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
-
-Learn more at [umbraco.com](https://umbraco.com)
-
-<p align="center">
-  <img src="img/logo.png" alt="Umbraco Logo" />
-</p>
-
-See the official [Umbraco website](https://umbraco.com) for an introduction, core mission and values of the product and team behind it.
-
- [Getting Started](#getting-started)
- [Documentation](#documentation)
- [Community](#join-the-umbraco-community)
- [Contributing](#contributing)
-
-Please also see our [Code of Conduct](CODE_OF_CONDUCT.md).
-
-## Getting Started
-
-[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet, with full support for all your custom .NET code and integrations. You're up and running in less than a minute, and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14-day trial, no credit card needed.
-
-If you want to DIY, you can [download Umbraco]((https://our.umbraco.com/download)) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host it yourself, and handling deployments and upgrades will be all up to you.
-
-## Documentation
-
-The documentation for Umbraco CMS can be found [on Our Umbraco](https://our.umbraco.com/documentation/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions.
-
-## Join the Umbraco community
-
-Our friendly community is available 24/7 at the community hub we call ["Our Umbraco"](https://our.umbraco.com/). Our Umbraco features forums for questions and answers, documentation, downloadable plugins for Umbraco, and a rich collection of community resources.
-
-Besides "Our", we all support each other also via Twitter: [Umbraco HQ](https://twitter.com/umbraco), [Release Updates](https://twitter.com/umbracoproject), [#umbraco](https://twitter.com/hashtag/umbraco)
-
-
-## Contributing
-
-Umbraco is contribution-focused and community-driven. If you want to contribute back to the Umbraco source code, please check out our [guide to contributing](CONTRIBUTING.md).
-
@@ -1,164 +1,173 @@
-#
-# Umbraco Cms Git Ignore
-#
-
-# common files
-*.obj
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*.orig
-*.suo
-*.vs10x
-*.ndproj
-*.ignorer.*
-
-# common directories
-.DS_Store
-._.DS_Store
-.vs/
-/local/
-
-# build directories
-[Bb]in/
-[Db]ebug*/
-[Rr]elease*/
-obj/
-
-# tools
-_ReSharper*/
-_NCrunch_*/
-*.ncrunchsolution
-*.ncrunchsolution.user
-*.ncrunchproject
-*.crunchsolution.cache
-tools/NDepend/
-
-
-
-
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-[sS]ource
-[sS]andbox
-umbraco.config
-App_Data/TEMP/*
-[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
-[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
-[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
-[Uu]mbraco/[Pp]resentation/[Ff]onts/*
-[Uu]mbraco/[Pp]resentation/[Cc]ss/*
-
-src/Umbraco.Web.UI/[Cc]ss/*
-src/Umbraco.Web.UI/App_Code/*
-src/Umbraco.Web.UI/App_Data/*
-src/Umbraco.Tests/App_Data/*
-src/Umbraco.Web.UI/[Mm]edia/*
-src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
-src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
-!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
-src/Umbraco.Web.UI/[Xx]slt/*
-src/Umbraco.Web.UI/[Ii]mages/*
-src/Umbraco.Web.UI/[Ss]cripts/*
-src/Umbraco.Web.UI/Web.*.config.transformed
-
-umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
-umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
-
-src/Umbraco.Tests/config/applications.config
-src/Umbraco.Tests/config/trees.config
-src/Umbraco.Web.UI/web.config
-src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config
-src/Umbraco.Web.UI/[Cc]onfig/serilog.config
-src/Umbraco.Web.UI/[Cc]onfig/serilog.user.config
-src/Umbraco.Tests/config/404handlers.config
-src/Umbraco.Web.UI/[Vv]iews/*.cshtml
-src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
-src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
-src/Umbraco.Web.UI/[Vv]iews/*
-src/packages/
-src/packages/repositories.config
-
-src/Umbraco.Web.UI/[Ww]eb.config
-*.transformed
-
-node_modules
-lib-bower
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/*.loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/canvasdesigner.*.js
-
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
-src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
-src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
-
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-src/Umbraco.Web.UI.Client/vwd.webinfo
-
-src/Umbraco.Web.UI/App_Plugins/*
-src/*.psess
-src/*.vspx
-
-NDependOut/*
-QueryResult.htm
-
-src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
-src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
-src/Umbraco.Web.UI/[Uu]mbraco/plugins/*
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/Umbraco.Web.UI.Client/bower_components/*
-/src/Umbraco.Web.UI/[Uu]mbraco/preview
-/src/Umbraco.Web.UI/[Uu]mbraco/preview.old
-
-# ignore rule for clearing out Belle (avoid rebuilding all the time)
-preserve.belle
-
-#Ignore Rule for output of generated documentation files from Grunt docserve
-src/Umbraco.Web.UI.Client/docs/api
-src/*.boltdata/
-src/umbraco.sln.ide/*
-src/.vs/
-
-src/Umbraco.Web.UI/[Jj]s/*
-src/Umbraco.Tests/[Mm]edia
-tools/docfx/*
-apidocs/_site/*
-src/*/project.lock.json
-src/.idea/*
-
-apidocs/api/*
-build/docs.zip
-build/ui-docs.zip
-build/csharp-docs.zip
-src/packages/
-src/PrecompiledWeb/*
-
-# build
-build.out/
-build.tmp/
-build/hooks/
-build/temp/
-
-
-
-# eof
-/src/Umbraco.Web.UI.Client/TESTS-*.xml
-/src/ApiDocs/api/*
+#
+# Umbraco Cms Git Ignore
+#
+
+# common files
+*.obj
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*.orig
+*.suo
+*.vs10x
+*.ndproj
+*.log
+
+# common directories
+.DS_Store
+._.DS_Store
+.vs/
+/local/
+
+# build directories
+[Bb]in/
+[Db]ebug*/
+[Rr]elease*/
+obj/
+
+# tools
+_ReSharper*/
+_NCrunch_*/
+*.ncrunchsolution
+*.ncrunchsolution.user
+*.ncrunchproject
+*.crunchsolution.cache
+tools/NDepend/
+
+
+
+
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+[sS]ource
+[sS]andbox
+umbraco.config
+App_Data/TEMP/*
+[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
+[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
+[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
+[Uu]mbraco/[Pp]resentation/[Ff]onts/*
+[Uu]mbraco/[Pp]resentation/[Cc]ss/*
+
+src/Umbraco.Web.UI/[Cc]ss/*
+src/Umbraco.Web.UI/App_Code/*
+src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Tests/App_Data/*
+src/Umbraco.Web.UI/[Mm]edia/*
+src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
+src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
+!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
+src/Umbraco.Web.UI/[Xx]slt/*
+src/Umbraco.Web.UI/[Ii]mages/*
+src/Umbraco.Web.UI/[Ss]cripts/*
+src/Umbraco.Web.UI/Web.*.config.transformed
+
+umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
+umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
+
+src/Umbraco.Tests/config/applications.config
+src/Umbraco.Tests/config/trees.config
+src/Umbraco.Web.UI/web.config
+src/Umbraco.Web.UI/Config/ClientDependency.config
+src/Umbraco.Tests/config/404handlers.config
+src/Umbraco.Web.UI/[Vv]iews/*.cshtml
+src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
+src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
+src/Umbraco.Web.UI/[Vv]iews/*
+src/packages/
+src/packages/repositories.config
+
+src/Umbraco.Web.UI/[Ww]eb.config
+*.transformed
+
+node_modules
+lib-bower
+
+src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
+src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/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/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
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
+src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
+src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
+src/Umbraco.Web.UI.Client/[Bb]uild/*
+src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
+
+src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+
+src/Umbraco.Web.UI/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/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/Umbraco/preview
+/src/Umbraco.Web.UI/Umbraco/preview.old
+
+# ignore rule for clearing out Belle (avoid rebuilding all the time)
+preserve.belle
+
+#Ignore Rule for output of generated documentation files from Grunt docserve
+src/Umbraco.Web.UI.Client/docs/api
+src/*.boltdata/
+/src/Umbraco.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/umbraco/js/install.loader.js
+src/Umbraco.Web.UI/js/*
+src/Umbraco.Tests/media
+tools/docfx/*
+apidocs/_site/*
+src/*/project.lock.json
+src/.idea/*
+
+apidocs/api/*
+build/docs.zip
+build/ui-docs.zip
+build/csharp-docs.zip
+src/packages/
+src/PrecompiledWeb/*
+
+# build
+build.out/
+build.tmp/
+build/hooks/
+build/temp/
+
+
+
+# eof
@@ -0,0 +1,164 @@
+Umbraco Cms Build
+--
+----
+
+# Quick!
+
+To build Umbraco, fire PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `README.md`...). There, trigger the build with the following command:
+
+    build/build.ps1
+    
+## PowerShell Quirks
+
+There is a good chance that running `build.ps1` ends up in error, with messages such as
+
+>The file ...\build.ps1 is not digitally signed. You cannot run this script on the current system. For more information about running scripts and setting execution policy, see about_Execution_Policies.
+
+PowerShell has *Execution Policies* that may prevent the script from running. You can check the current policies with:
+
+    PS> Get-ExecutionPolicy -List
+    
+            Scope ExecutionPolicy
+            ----- ---------------
+    MachinePolicy       Undefined
+       UserPolicy       Undefined
+          Process       Undefined
+      CurrentUser       Undefined
+     LocalMachine    RemoteSigned
+
+Policies can be `Restricted`, `AllSigned`, `RemoteSigned`, `Unrestricted` and `Bypass`. Scopes can be `MachinePolicy`, `UserPolicy`, `Process`, `CurrentUser`, `LocalMachine`. You need the current policy to be `RemoteSigned`&mdash;as long as it is `Undefined`, the script cannot run. You can change the current user policy with:
+
+    PS> Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy RemoteSigned
+
+Alternatively, you can do it at machine level, from within an elevated PowerShell session:
+
+    PS> Set-ExecutionPolicy -Scope LocalMachine -ExecutionPolicy RemoteSigned
+
+And *then* the script should run. It *might* however still complain about executing scripts, with messages such as:
+
+>Security warning - Run only scripts that you trust. While scripts from the internet can be useful, this script can potentially harm your computer. If you trust this script, use the Unblock-File cmdlet to allow the script to run without this warning message. Do you want to run ...\build.ps1?
+[D] Do not run  [R] Run once  [S] Suspend  [?] Help (default is "D"):
+
+This is usually caused by the scripts being *blocked*. And that usually happens when the source code has been downloaded as a Zip file. When Windows downloads Zip files, they are marked as *blocked* (technically, they have a Zone.Identifier alternate data stream, with a value of "3" to indicate that they were downloaded from the Internet). And when such a Zip file is un-zipped, each and every single file is also marked as blocked.
+
+The best solution is to unblock the Zip file before un-zipping: right-click the files, open *Properties*, and there should be a *Unblock* checkbox at the bottom of the dialog. If, however, the Zip file has already been un-zipped, it is possible to recursively unblock all files from PowerShell with:
+
+    PS> Get-ChildItem -Recurse *.* | Unblock-File
+
+## Git Quirks
+
+Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
+
+# Build Infrastructure
+
+The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
+
+    $ubuild = build/build.ps1 -get
+
+The object exposes various properties and methods that can be used to fine-grain build Umbraco. Some, but not all, of them are detailed below.
+    
+## Properties
+
+The object exposes the following properties:
+
+* `SolutionRoot`: the absolute path to the solution root
+* `VisualStudio`: a Visual Studio object (see below)
+* `NuGet`: the absolute path to the NuGet executable
+* `Zip`: the absolute path to the 7Zip executable
+* `VsWhere`: the absolute path to the VsWhere executable
+* `NodePath`: the absolute path to the Node install
+* `NpmPath`: the absolute path to the Npm install
+
+The Visual Studio object is `null` when Visual Studio has not been detected (eg on VSTS). When not null, the object exposes the following properties:
+
+* `Path`: Visual Studio installation path (eg some place under `Program Files`)
+* `Major`: Visual Studio major version (eg `15` for VS 2017)
+* `Minor`: Visual Studio minor version
+* `MsBUild`: the absolute path to the MsBuild executable
+
+## GetUmbracoVersion
+
+Gets an object representing the current Umbraco version. Example:
+
+    $v = $ubuild.GetUmbracoVersion()
+    Write-Host $v.Semver
+
+The object exposes the following properties:
+
+* `Semver`: the semver object representing the version
+* `Release`: the main part of the version (eg `7.6.33`)
+* `Comment`: the pre release part of the version (eg `alpha02`)
+* `Build`: the build number part of the version (eg `1234`)
+
+## SetUmbracoVersion
+
+Modifies Umbraco files with the new version.
+
+>This entirely replaces the legacy `UmbracoVersion.txt` file. Do *not* edit version infos in files.
+
+The version must be a valid semver version. It can include a *pre release* part (eg `alpha02`) and/or a *build number* (eg `1234`). Examples:
+
+    $ubuild.SetUmbracoVersion("7.6.33")
+    $ubuild.SetUmbracoVersion("7.6.33-alpha.2")
+    $ubuild.SetUmbracoVersion("7.6.33+1234")
+    $ubuild.SetUmbracoVersion("7.6.33-beta.5+5678")
+
+## Build
+
+Builds Umbraco. Temporary files are generated in `build.tmp` while the actual artifacts (zip files, NuGet packages...) are produced in `build.out`. Example:
+
+    $ubuild.Build()
+
+Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
+
+### web.config
+
+Building Umbraco requires a clean `web.config` file in the `Umbraco.Web.UI` project. If a `web.config` file already exists, the `pre-build` task (see below) will save it as `web.config.temp-build` and replace it with a clean copy of `web.Template.config`. The original file is replaced once it is safe to do so, by the `pre-packages` task.
+
+## Build-UmbracoDocs
+
+Builds umbraco documentation. Temporary files are generated in `build.tmp` while the actual artifacts (docs...) are produced in `build.out`. Example:
+
+    Build-UmbracoDocs
+
+Some log files, such as MsBuild logs, are produced in `build.tmp` too. The `build` directory should remain clean during a build.
+
+## Verify-NuGet
+
+Verifies that projects all require the same version of their dependencies, and that NuSpec files require versions that are consistent with projects. Example:
+
+    Verify-NuGet
+
+# VSTS
+
+Continuous integration, nightly builds and release builds run on VSTS.
+
+VSTS uses the `Build-Umbraco` command several times, each time passing a different *target* parameter. The supported targets are:
+
+* `pre-build`: prepares the build
+* `compile-belle`: compiles Belle
+* `compile-umbraco`: compiles Umbraco
+* `pre-tests`: prepares the tests
+* `compile-tests`: compiles the tests
+* `pre-packages`: prepares the packages
+* `pkg-zip`: creates the zip files
+* `pre-nuget`: prepares NuGet packages
+* `pkg-nuget`: creates NuGet packages
+
+All these targets are executed when `Build-Umbraco` is invoked without a parameter (or with the `all` parameter). On VSTS, compilations (of Umbraco and tests) are performed by dedicated VSTS tasks. Similarly, creating the NuGet packages is also performed by dedicated VSTS tasks.
+
+Finally, the produced artifacts are published in two containers that can be downloaded from VSTS: `zips` contains the zip files while `nuget` contains the NuGet packages.
+
+>During a VSTS build, some environment `UMBRACO_*` variables are exported by the `pre-build` target and can be reused in other targets *and* in VSTS tasks. The `UMBRACO_TMP` environment variable is used in `Umbraco.Tests` to disable some tests that have issues with VSTS at the moment.
+
+# Notes
+
+*This part needs to be cleaned up*
+
+Nightlies should use some sort of build number.
+
+We should increment versions as soon as a version is released. Ie, as soon as `7.6.33` is released, we should `Set-UmbracoVersion 7.6.34-alpha` and push.
+
+NuGet / NuSpec consistency checks are performed in tests. We should move it so it is done as part of the PowerShell script even before we try to compile and run the tests.
+
+/eof
@@ -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/)
@@ -0,0 +1,209 @@
+# 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 💖. 
+
+#### 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)
+  * [Your First Code Contribution](#your-first-code-contribution)
+  * [Pull Requests](#pull-requests)
+
+[Styleguides](#styleguides)
+
+[What should I know before I get started?](#what-should-i-know-before-i-get-started)
+  * [Working with the source code](#working-with-the-source-code)
+  * [What branch should I target for my contributions?](#what-branch-should-i-target-for-my-contributions)
+  * [Building Umbraco from source code](#building-umbraco-from-source-code)
+  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
+  
+[How 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](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.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 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.
+  * **Provide specific examples to demonstrate the steps**. If you wrote some code, try to provide a code sample as specific as possible to be able to reproduce the behavior.
+  * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
+  * **Explain which behavior you expected to see instead and why.**
+
+Provide more context by answering these questions:
+
+  * **Can you reproduce the problem** when `debug="false"` in your `web.config` file?
+  * **Did the problem start happening recently** (e.g. after updating to a new version of Umbraco) or was this always a problem?
+  * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
+
+Include details about your configuration and environment:
+
+  * **Which version of Umbraco are you using?** 
+  * **What is the environment you're using Umbraco in?** Is this a problem on your local machine or on a server. Tell us about your configuration: Windows version, IIS/IISExpress, database type, etc.
+  * **Which packages do you have installed?**
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for 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.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](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
+
+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.org/documentation/Reference/) is generated
+
+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. 
+
+## What should I know before I get started?
+
+### Working with the source code
+
+Some parts of our source code is over 10 years old now. And when we say "old", we mean "mature" of course!
+
+There's two big areas that you should know about:
+
+  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
+  You may need to run the following commands to set up gulp properly:
+  ```
+  npm cache clean
+  npm install -g bower
+  npm install -g gulp
+  npm install -g gulp-cli
+  npm install
+  gulp build
+  ```
+  2. "The rest" is a C# based codebase, with some traces of our WebForms past but mostly ASP.NET MVC based these days. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
+
+To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.
+
+  * [The AngularJS based backoffice files](https://our.umbraco.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?](tools/contributing/defaultbranch.png)
+
+### Building Umbraco from source code
+
+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 ([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](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.
+
+### Keeping your Umbraco fork in sync with the main repository
+
+We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
+
+Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
+
+To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
+
+```
+git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
+```
+
+Then when you want to get the changes from the main repository:
+
+```
+git fetch upstream
+git rebase upstream/dev-v7
+```
+
+In this command we're syncing with the `dev-v7` branch, but you can of course choose another one if needed.
+
+(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
+
+## 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.
+
@@ -3,57 +3,57 @@
 [string]$Directory
 )
 $workingDirectory = $Directory
-CD "$($workingDirectory)"
+CD $workingDirectory

 # Clone repo
-$fullGitUrl = "https://$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
-git clone $($fullGitUrl) $($env:GIT_REPOSITORYNAME) 2>&1 | % { $_.ToString() } 
+$fullGitUrl = "https://$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
+git clone $fullGitUrl 2>&1 | % { $_.ToString() } 

 # Remove everything so that unzipping the release later will update everything
 # Don't remove the readme file nor the git directory
 Write-Host "Cleaning up git directory before adding new version"
-Remove-Item -Recurse "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)\*" -Exclude README.md,.git
+Remove-Item -Recurse $workingDirectory\$env:GIT_REPOSITORYNAME\* -Exclude README.md,.git

 # Find release zip
-$zipsDir = "$($workingDirectory)\$($env:BUILD_DEFINITIONNAME)\zips"
+$zipsDir = "$workingDirectory\$env:BUILD_DEFINITIONNAME\zips"
 $pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip"
-Write-Host "Searching for Umbraco release files in $($zipsDir) for a file with pattern $($pattern)"
-$file = (Get-ChildItem "$($zipsDir)" | Where-Object { $_.Name -match "$($pattern)" })
+Write-Host "Searching for Umbraco release files in $workingDirectory\$zipsDir for a file with pattern $pattern"
+$file = (Get-ChildItem $zipsDir | Where-Object { $_.Name -match "$pattern" })

 if($file)
 {
    # Get release name
-    $version = [regex]::Match($($file.Name), $($pattern)).captures.groups[1].value
-    $releaseName = "Umbraco $($version)"
-    Write-Host "Found $($releaseName)"
+    $version = [regex]::Match($file.Name, $pattern).captures.groups[1].value
+    $releaseName = "Umbraco $version"
+    Write-Host "Found $releaseName"
    
    # Unzip into repository to update release
    Add-Type -AssemblyName System.IO.Compression.FileSystem
-    Write-Host "Unzipping $($file.FullName) to $($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
-    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)")
+    Write-Host "Unzipping $($file.FullName) to $workingDirectory\$env:GIT_REPOSITORYNAME"
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$workingDirectory\$env:GIT_REPOSITORYNAME")
    
    # Telling git who we are
    git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() }
    git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() }
    
    # Commit
-    CD "$($workingDirectory)\$($env:GIT_REPOSITORYNAME)"
-    Write-Host "Committing Umbraco $($version) Release from Build Output"
+    CD $env:GIT_REPOSITORYNAME
+    Write-Host "Committing Umbraco $version Release from Build Output"

    git add . 2>&1 | % { $_.ToString() } 
-    git commit -m " Release $($releaseName) from Build Output" 2>&1 | % { $_.ToString() } 
+    git commit -m " Release $releaseName from Build Output" 2>&1 | % { $_.ToString() } 

    # Tag the release
-    git tag -a "v$($version)" -m "v$($version)"
+    git tag -a "v$version" -m "v$version"

    # Push release to master
-    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$($GitHubPersonalAccessToken)@$($env:GIT_URL)/$($env:GIT_REPOSITORYNAME).git"
-    git push $($fullGitAuthUrl) 2>&1 | % { $_.ToString() } 
+    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$GitHubPersonalAccessToken@$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
+    git push $fullGitAuthUrl 2>&1 | % { $_.ToString() } 

    #Push tag to master
-    git push $($fullGitAuthUrl) --tags 2>&1 | % { $_.ToString() }
+    git push $fullGitAuthUrl --tags 2>&1 | % { $_.ToString() }
 }
 else
 {
-    Write-Error "Umbraco release file not found, searched in $($workingDirectory)\$($zipsDir) for a file with pattern $($pattern) - canceling"
+    Write-Error "Umbraco release file not found, searched in $workingDirectory\$zipsDir for a file with pattern $pattern - cancelling"
 }
@@ -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,60 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
-        <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>https://umbraco.com/dist/nuget/logo-small.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>
+  <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" />

-            <group targetFramework="net472">
-                <!--
-                  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="LightInject" version="[5.4.0,5.999999)" />
-                <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
-                <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
-                <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
-                <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
-                <dependency id="Semver" version="[2.0.4,2.999999)" />
-                <dependency id="Serilog" version="[2.8.0,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.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
-                <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
-                <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
-                <dependency id="Serilog.Sinks.Map" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Sinks.Async" version="[1.3.0,1.999999)" />
-                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
-                <dependency id="NPoco" version="[3.9.4,3.999999)" />
-            </group>
-            
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />
+    <!-- docs -->
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
+    <file src="$BuildTmp$\WebApp\bin\Umbraco.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" />

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

-        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib" />
-    </files>
+    <!-- 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,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
-        <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>https://umbraco.com/dist/nuget/logo-small.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>
-
-            <group targetFramework="net472">
-
-                <!--
-                  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="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,1.999999)" />
-                <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
-                <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
-                <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
-                <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
-                <dependency id="Markdown" version="[2.2.1,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
-                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
-
-            </group>
-            
-        </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$\bin\Umbraco.Examine.pdb" target="lib" />
-    </files>
-</package>
@@ -1,69 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
-        <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>https://umbraco.com/dist/nuget/logo-small.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>
+  <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" />

-            <group targetFramework="net472">
+    <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" />

-                <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.4.0, 2.999999)" />
-                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.0.4]" />
-                <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
-                <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
-                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
-                <dependency id="Microsoft.Net.Compilers" version="[2.10.0,2.999999)" />
-
-            </group>
-
-
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- 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\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" />
-
-        <!-- 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" />
-
-        <!-- 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\serilog.config.install.xdt" target="Content\config\serilog.config.install.xdt" />
-        <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
-        <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
-        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME: Content\ !! and then... transform?! -->
-
-        <!-- 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>
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<dashBoard xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <section alias="StartupSettingsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+    <tab caption="Welcome"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
+      <control showOnce="true" addPanel="true" panelCaption="" xdt:Transform="InsertIfMissing">
+        views/dashboard/settings/settingsdashboardintro.html
+      </control>
+    </tab>
+  </section>
+
+  <section alias="StartupFormsDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas>
+      <area>forms</area>
+    </areas>
+    <tab caption="Install Umbraco Forms">
+      <control showOnce="true" addPanel="true" panelCaption="">
+        views/dashboard/forms/formsdashboardintro.html
+      </control>
+    </tab>
+  </section>
+
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas xdt:Transform="InsertIfMissing">
+      <area xdt:Transform="InsertIfMissing">developer</area>
+    </areas>  
+  </section>
+  
+  <section alias="StartupDeveloperDashboardSection">
+    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
+      <control showOnce="true" addPanel="true" panelCaption="">
+        views/dashboard/developer/developerdashboardvideos.html
+      </control>
+    </tab>
+    <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+  </section>
+  
+  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+	<tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
+      <control>
+        views/dashboard/developer/examinemanagement.html
+      </control>
+    </tab>
+  </section>
+  
+  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing" />
+    <tab caption="Content"  xdt:Locator="Match(caption)" xdt:Transform="Replace">
+      <control showOnce="false" addPanel="false" panelCaption="">
+        views/dashboard/media/mediafolderbrowser.html
+      </control>
+    </tab>
+  </section>
+  
+  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+    <tab caption="Get Started" xdt:Transform="Insert">
+      <control showOnce="true" addPanel="true" panelCaption="">
+        views/dashboard/members/membersdashboardvideos.html
+      </control>
+    </tab>
+  </section>
+  
+  <section alias="uGoLiveDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
+  
+  <section alias="ExamineManagement" xdt:Locator="Match(alias)" xdt:Transform="Remove" />
+    
+  <section alias="StartupDashboardSection">
+	<tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+	<tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+  </section>
+
+  <section alias="RedirectUrlManagement" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas>
+      <area>content</area>
+    </areas>
+    <tab caption="Redirect URL Management">
+      <control>
+        views/dashboard/developer/redirecturls.html
+      </control>
+    </tab>
+  </section>
+
+  <section alias="UmbracoHealthCheck" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas>
+      <area>developer</area>
+    </areas>
+    <tab caption="Health Check">
+      <control>
+        views/dashboard/developer/healthcheck.html
+      </control>
+    </tab>
+  </section>
+</dashBoard>
@@ -1,27 +1,26 @@
-
-                       888                                         
-                       888                                         
-888  888 88888b.d88b.  88888b.  888d888  8888b.   .d8888b  .d88b.  
-888  888 888 "888 "88b 888 "88b 888P"       "88b d88P"    d88""88b 
-888  888 888  888  888 888  888 888     .d888888 888      888  888 
-Y88b 888 888  888  888 888 d88P 888     888  888 Y88b.    Y88..88P 
- "Y88888 888  888  888 88888P"  888     "Y888888  "Y8888P  "Y88P"  
-
------------------------------------------------------------------
-
-Don't forget to build!
-
-
-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,11 +2,19 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
  <configSections xdt:Transform="InsertIfMissing" />
  <configSections>
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+    <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="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+      <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" />
    </sectionGroup>
  </configSections>
@@ -16,18 +24,28 @@
    <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
 	<add key="Umbraco.ModelsBuilder.Enable" value="false" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
 	<add key="Umbraco.ModelsBuilder.ModelsMode" value="Nothing" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
+	<add key="umbracoDefaultUILanguage" value="en-US" xdt:Locator="Match(key)" xdt:Transform="SetAttributes(value)" />
  </appSettings>

  <umbracoConfiguration xdt:Transform="InsertIfMissing">
    <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
-    <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="Remove" />
+    <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">
      <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
+      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+      <add invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="Remove" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
+      <add invariant="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(type)" />
    </DbProviderFactories>
  </system.data>
  <clientDependency xdt:Transform="RemoveAttributes(version)" />
@@ -35,10 +53,15 @@
  <system.web xdt:Transform="InsertIfMissing" />
  <system.web>
    <siteMap xdt:Transform="Remove" />
+    <siteMap xdt:Transform="InsertIfMissing">
+      <providers xdt:Transform="InsertIfMissing">
+        <remove name="MySqlSiteMapProvider"  xdt:Transform="InsertIfMissing" />
+      </providers>
+    </siteMap>
    <httpRuntime xdt:Transform="InsertIfMissing" />
    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
-
+    <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"/>>
@@ -69,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" />
@@ -126,55 +152,69 @@
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
    </assemblyBinding>
  </runtime>

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

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

@@ -192,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>
@@ -0,0 +1,95 @@
+param($installPath, $toolsPath, $package, $project)
+
+Write-Host "installPath:" "${installPath}"
+Write-Host "toolsPath:" "${toolsPath}"
+
+Write-Host " "
+
+if ($project) {
+	$dateTime = Get-Date -Format yyyyMMdd-HHmmss
+
+	# Create paths and list them
+	$projectPath = (Get-Item $project.Properties.Item("FullPath").Value).FullName
+	Write-Host "projectPath:" "${projectPath}"		
+	$backupPath = Join-Path $projectPath "App_Data\NuGetBackup\$dateTime"
+	Write-Host "backupPath:" "${backupPath}"		
+	$copyLogsPath = Join-Path $backupPath "CopyLogs"
+	Write-Host "copyLogsPath:" "${copyLogsPath}"			
+	$umbracoBinFolder = Join-Path $projectPath "bin"
+	Write-Host "umbracoBinFolder:" "${umbracoBinFolder}"		
+
+	# Create backup folder and logs folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	New-Item -ItemType Directory -Force -Path $copyLogsPath
+	
+	# After backing up, remove all umbraco dlls from bin folder in case dll files are included in the VS project
+	# See: http://issues.umbraco.org/issue/U4-4930
+	
+	if(Test-Path $umbracoBinFolder) {
+		$umbracoBinBackupPath = Join-Path $backupPath "bin"
+		
+		New-Item -ItemType Directory -Force -Path $umbracoBinBackupPath
+		
+		robocopy $umbracoBinFolder $umbracoBinBackupPath /e /LOG:$copyLogsPath\UmbracoBinBackup.log
+		
+		# Delete files Umbraco ships with
+		if(Test-Path $umbracoBinFolder\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 }
+		if(Test-Path $umbracoBinFolder\Umbraco.Web.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Core.dll) { Remove-Item $umbracoBinFolder\Umbraco.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.Examine.dll) { Remove-Item $umbracoBinFolder\Umbraco.Examine.dll -Force -Confirm:$false }
+		
+		# Delete files Umbraco depends upon
+		$amd64Folder = Join-Path $umbracoBinFolder "amd64"
+		if(Test-Path $amd64Folder) { Remove-Item $amd64Folder -Force -Recurse -Confirm:$false }
+		$x86Folder = Join-Path $umbracoBinFolder "x86"
+		if(Test-Path $x86Folder) { Remove-Item $x86Folder -Force -Recurse -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\AutoMapper.dll) { Remove-Item $umbracoBinFolder\AutoMapper.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\AutoMapper.Net4.dll) { Remove-Item $umbracoBinFolder\AutoMapper.Net4.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ClientDependency.Core.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ClientDependency.Core.Mvc.dll) { Remove-Item $umbracoBinFolder\ClientDependency.Core.Mvc.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\CookComputing.XmlRpcV2.dll) { Remove-Item $umbracoBinFolder\CookComputing.XmlRpcV2.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Examine.dll) { Remove-Item $umbracoBinFolder\Examine.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\HtmlAgilityPack.dll) { Remove-Item $umbracoBinFolder\HtmlAgilityPack.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ICSharpCode.SharpZipLib.dll) { Remove-Item $umbracoBinFolder\ICSharpCode.SharpZipLib.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ImageProcessor.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\ImageProcessor.Web.dll) { Remove-Item $umbracoBinFolder\ImageProcessor.Web.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Lucene.Net.dll) { Remove-Item $umbracoBinFolder\Lucene.Net.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll) { Remove-Item $umbracoBinFolder\Microsoft.IO.RecyclableMemoryStream.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Core.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.AspNet.Identity.Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.CSharp.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.CodeAnalysis.dll) { Remove-Item $umbracoBinFolder\Microsoft.CodeAnalysis.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Host.SystemWeb.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.Cookies.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll) { Remove-Item $umbracoBinFolder\Microsoft.Owin.Security.OAuth.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Infrastructure.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Infrastructure.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Helpers.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll) { Remove-Item $umbracoBinFolder\Microsoft.Web.Mvc.FixedDisplayModes.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\MiniProfiler.dll) { Remove-Item $umbracoBinFolder\MiniProfiler.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\MySql.Data.dll) { Remove-Item $umbracoBinFolder\MySql.Data.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Newtonsoft.Json.dll) { Remove-Item $umbracoBinFolder\Newtonsoft.Json.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Owin.dll) { Remove-Item $umbracoBinFolder\Owin.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Semver.dll) { Remove-Item $umbracoBinFolder\Semver.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Collections.Immutable.dll) { Remove-Item $umbracoBinFolder\System.Collections.Immutable.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Reflection.Metadata.dll) { Remove-Item $umbracoBinFolder\System.Reflection.Metadata.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Extensions.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Extensions.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Formatting.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Formatting.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Net.Http.Primitives.dll) { Remove-Item $umbracoBinFolder\System.Net.Http.Primitives.dll -Force -Confirm:$false }	
+		if(Test-Path $umbracoBinFolder\System.Web.Helpers.dll) { Remove-Item $umbracoBinFolder\System.Web.Helpers.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Http.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Http.WebHost.dll) { Remove-Item $umbracoBinFolder\System.Web.Http.WebHost.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Mvc.dll) { Remove-Item $umbracoBinFolder\System.Web.Mvc.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.Razor.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Deployment.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Deployment.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\System.Web.WebPages.Razor.dll) { Remove-Item $umbracoBinFolder\System.Web.WebPages.Razor.dll -Force -Confirm:$false }		
+	}
+}
@@ -1,90 +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}"
-	$webConfigSource = Join-Path $projectPath "Web.config"
-	Write-Host "webConfigSource:" "${webConfigSource}"
-	$configFolder = Join-Path $projectPath "Config"
-	Write-Host "configFolder:" "${configFolder}"
-
-	# 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"		
-	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 "Umbraco.Core.ConfigurationStatus") 
-				{
-					# 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
-	} 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
-		}
-	}
-	
-	# 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')
+	}
+}
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<log4net xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <appender name="AsynchronousLog4NetAppender" xdt:Transform="Remove" xdt:Locator="Match(name)" /> 
+  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core" xdt:Transform="Insert" >
+    <appender-ref ref="rollingFile" />
+  </appender>
+  
+  <appender name="rollingFile" type="log4net.Appender.RollingFileAppender" xdt:Transform="InsertIfMissing">
+    <file value="App_Data\Logs\UmbracoTraceLog.txt" />
+    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    <appendToFile value="true" />
+    <rollingStyle value="Date" />
+    <maximumFileSize value="5MB" />
+    <layout type="log4net.Layout.PatternLayout">
+      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    </layout>
+    <encoding value="utf-8" />
+  </appender>
+</log4net>
+
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">>
-    <appSettings>
-
-        <add key="serilog:using:File" value="Umbraco.Core" xdt:Transform="SetAttributes(value)" xdt:Locator="Match(key)"/>
-        <add key="serilog:write-to:File.shared" xdt:Transform="Remove" xdt:Locator="Match(key)"/>
-
-    </appSettings>
-</configuration>
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<trees xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <!--Content-->
+  <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" 
+       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" 
+       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" 
+       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" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  
+  <!--Settings-->
+  <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"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="InsertIfMissing" />
+  <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" 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" 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"
+       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" sortOrder="2"
+       xdt:Locator="Match(application,alias)"
+       xdt:Transform="InsertIfMissing"  />
+  
+  <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.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" 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" iconClosed="icon-folder" iconOpen="icon-folder-open" sortOrder="7" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+
+  <!--Developer-->
+  <add alias="packager" application="developer"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <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" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="InsertIfMissing"  />
+  
+  <!-- Before 7.4 this tree had the alias 'dataType', without the 's' on the end, this is here to rename it  -->
+  <add sortOrder="1" alias="dataTypes" application="developer" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco"
+       xdt:Locator="Match(application,type)" 
+       xdt:Transform="SetAttributes(alias,sortOrder)" />
+	   
+  <!-- Yes, set the sortOrder again, like above because.. sometimes apparently we already have a dataTypes node and we can't remove more than one.. if they're equal though (same alias,application and sortOrder) it doesn't throw an error -->   
+  <add sortOrder="1" alias="dataTypes" application="developer"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes(sortOrder)" />
+
+  <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" 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"
+       xdt:Locator="Match(application,alias,type)" 
+       xdt:Transform="Remove()" />
+  <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"  />
+  
+  <add application="developer" alias="python" 
+       xdt:Locator="Match(application,alias)" 
+       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" 
+      xdt:Locator="Match(application,alias)"
+      xdt:Transform="SetAttributes()" />
+
+  <add application="users" alias="userTypes"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="Remove" />
+  <add application="users" alias="userPermissions" 
+       xdt:Locator="Match(application,alias)" 
+       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" 
+       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" 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" 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" 
+       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" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes()" />
+  <add alias="yourTasks" application="translation"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="RemoveAttributes(action)" />
+</trees>
@@ -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
@@ -1,44 +0,0 @@
-$uenv=build/build.ps1 -get
-
-$src = "$($uenv.SolutionRoot)\src"
-$tmp = $uenv.BuildTemp
-$out = $uenv.BuildOutput
-$DocFxJson = "$src\ApiDocs\docfx.json"
-$DocFxSiteOutput = "$tmp\_site\*.*"
-
-################ Do the UI docs
-$uenv.CompileBelle()
-
-"Moving to Umbraco.Web.UI.Client folder"
-cd .\src\Umbraco.Web.UI.Client
-
-"Generating the docs and waiting before executing the next commands"
-& gulp docs | Out-Null
-
-# change baseUrl
-$BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
-$IndexPath = "./docs/api/index.html"
-(Get-Content $IndexPath).replace('location.href.replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
-
-# zip it
-& $uenv.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Client\docs\api\*.*"
-
-
-################ Do the c# docs
-
-# Build the solution in debug mode
-$SolutionPath = Join-Path -Path $src -ChildPath "umbraco.sln"
-#$uenv.CompileUmbraco()
-
-#restore nuget packages
-$uenv.RestoreNuGet()
-
-# run DocFx
-$DocFx = $uenv.BuildEnv.DocFx
-
-Write-Host "$DocFxJson"
-& $DocFx metadata $DocFxJson
-& $DocFx build $DocFxJson
-
-# zip it
-& $uenv.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
@@ -11,21 +11,11 @@
    [Alias("loc")]
    [switch] $local = $false,

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

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

@@ -53,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"
@@ -64,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",
@@ -83,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",
@@ -102,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
@@ -187,7 +187,7 @@
  {
    Write-Host "Prepare Tests"

-    # FIXME: - idea is to avoid rebuilding everything for tests
+    # fixme - idea is to avoid rebuilding everything for tests
    # but because of our weird assembly versioning (with .* stuff)
    # everything gets rebuilt all the time...
    #Copy-Files "$tmp\bin" "." "$tmp\tests"
@@ -297,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")
@@ -340,6 +336,9 @@

  $ubuild.DefineMethod("PrepareBuild",
  {
+    Write-Host "Clear folders and files"
+    $this.RemoveDirectory("$($this.SolutionRoot)\src\Umbraco.Web.UI.Client\bower_components")
+
    $this.TempStoreFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config")
    Write-Host "Create clean web.config"
    $this.CopyFile("$($this.SolutionRoot)\src\Umbraco.Web.UI\web.Template.config", "$($this.SolutionRoot)\src\Umbraco.Web.UI\web.config")
@@ -392,18 +391,12 @@
    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
        -Properties BuildTmp="$($this.BuildTemp)" `
        -Version "$($this.Version.Semver.ToString())" `
-        -Symbols -SymbolPackageFormat snupkg -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
+        -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 -SymbolPackageFormat snupkg -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." }
-
    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
        -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." }

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

  $ubuild.DefineMethod("Build",
  {
-    $error.Clear()
-
    $this.PrepareBuild()
    if ($this.OnError()) { return }
    $this.RestoreNuGet()
@@ -506,21 +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." }
-    }
  })

  # ################################################################
@@ -533,11 +462,8 @@
  # run
  if (-not $get)
  {
-    if ($command.Length -eq 0)
-    {
-      $command = @( "Build" )
-    }
-    $ubuild.RunMethod($command);
+    $ubuild.Build()
    if ($ubuild.OnError()) { return }
  }
+  Write-Host "Done"
  if ($get) { return $ubuild }
@@ -2,20 +2,21 @@
  "metadata": [
    {
      "src": [
-        { 
-          "src": "../",
+        {
          "files": [
            "Umbraco.Core/Umbraco.Core.csproj",
            "Umbraco.Web/Umbraco.Web.csproj"
          ],
          "exclude": [
            "**/obj/**",
-            "**/bin/**"
-          ]
+            "**/bin/**",
+            "_site/**"
+          ],
+          "cwd": "../src"
        }
      ],
-      "dest": "api",
-      "filter": "docfx.filter.yml"
+      "dest": "../apidocs/api",
+      "filter": "../apidocs/docfx.filter.yml"
    }
  ],
  "build": {
@@ -34,7 +35,19 @@
          "*.md"
        ],
        "exclude": [
-          "obj/**"
+          "obj/**",
+          "_site/**"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "images/**"
+        ],
+        "exclude": [
+          "obj/**",
+          "_site/**"
        ]
      }
    ],
@@ -44,7 +57,8 @@
          "**.md"
        ],
        "exclude": [
-          "obj/**"
+          "obj/**",
+          "_site/**"
        ]
      }
    ],
@@ -53,9 +67,9 @@
      "_enableSearch": true,
      "_disableContribution": false
    },
-    "dest": "../../build.tmp/_site",
+    "dest": "_site",
    "template": [
      "default", "umbracotemplate"
    ]
  }
-}
+}
@@ -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 2019")]
-[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.1.0")]
-[assembly: AssemblyInformationalVersion("8.1.0")]
+
+// 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,15 +0,0 @@
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Constants storing cache keys used in caching
-    /// </summary>
-    public static class CacheKeys
-    {
-        public const string ApplicationsCacheKey = "ApplicationCache"; // used by SectionService
-
-        // TODO: this one can probably be removed
-        public const string TemplateFrontEndCacheKey = "template";
-
-        public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
-    }
-}
@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Defines an application cache.
-    /// </summary>
-    public interface IAppCache
-    {
-        /// <summary>
-        /// Gets an item identified by its key.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        /// <returns>The item, or null if the item was not found.</returns>
-        object Get(string key);
-
-        /// <summary>
-        /// Gets or creates an item identified by its key.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        /// <param name="factory">A factory function that can create the item.</param>
-        /// <returns>The item.</returns>
-        object Get(string key, Func<object> factory);
-
-        /// <summary>
-        /// Gets items with a key starting with the specified value.
-        /// </summary>
-        /// <param name="keyStartsWith">The StartsWith value to use in the search.</param>
-        /// <returns>Items matching the search.</returns>
-        IEnumerable<object> SearchByKey(string keyStartsWith);
-
-        /// <summary>
-        /// Gets items with a key matching a regular expression.
-        /// </summary>
-        /// <param name="regex">The regular expression.</param>
-        /// <returns>Items matching the search.</returns>
-        IEnumerable<object> SearchByRegex(string regex);
-
-        /// <summary>
-        /// Removes all items from the cache.
-        /// </summary>
-        void Clear();
-
-        /// <summary>
-        /// Removes an item identified by its key from the cache.
-        /// </summary>
-        /// <param name="key">The key of the item.</param>
-        void Clear(string key);
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </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 ClearOfType(string typeName);
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </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 ClearOfType<T>();
-
-        /// <summary>
-        /// Removes items of a specified type from the cache.
-        /// </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 ClearOfType<T>(Func<string, T, bool> predicate);
-
-        /// <summary>
-        /// Clears items with a key starting with the specified value.
-        /// </summary>
-        /// <param name="keyStartsWith">The StartsWith value to use in the search.</param>
-        void ClearByKey(string keyStartsWith);
-
-        /// <summary>
-        /// Clears items with a key matching a regular expression.
-        /// </summary>
-        /// <param name="regex">The regular expression.</param>
-        void ClearByRegex(string regex);
-    }
-}
@@ -1,249 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-namespace Umbraco.Core.Collections
-{
-    /// <summary>
-    /// An ObservableDictionary
-    /// </summary>
-    /// <remarks>
-    /// Assumes that the key will not change and is unique for each element in the collection.
-    /// Collection is not thread-safe, so calls should be made single-threaded.
-    /// </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>
-    {
-        protected Dictionary<TKey, int> Indecies { get; }
-        protected Func<TValue, TKey> KeySelector { get; }
-
-        /// <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)
-        {
-            KeySelector = keySelector ?? throw new ArgumentException("keySelector");
-            Indecies = new Dictionary<TKey, int>(equalityComparer);
-        }
-
-        #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)
-            {
-                foreach (var k in Indecies.Keys.Where(k => Indecies[k] >= index).ToList())
-                {
-                    Indecies[k]++;
-                }
-            }
-
-            base.InsertItem(index, item);
-            Indecies[key] = index;
-        }
-
-        protected override void ClearItems()
-        {
-            base.ClearItems();
-            Indecies.Clear();
-        }
-
-        protected override void RemoveItem(int index)
-        {
-            var item = this[index];
-            var key = KeySelector(item);
-
-            base.RemoveItem(index);
-
-            Indecies.Remove(key);
-
-            foreach (var k in Indecies.Keys.Where(k => Indecies[k] > index).ToList())
-            {
-                Indecies[k]--;
-            }
-        }
-
-        #endregion
-
-        public bool ContainsKey(TKey key)
-        {
-            return Indecies.ContainsKey(key);
-        }
-
-        /// <summary>
-        /// Gets or sets the element with the specified key.  If setting a new value, new value must have same key.
-        /// </summary>
-        /// <param name="key">Key of element to replace</param>
-        /// <returns></returns>
-        public TValue this[TKey key]
-        {
-
-            get => this[Indecies[key]];
-            set
-            {
-                //confirm key matches
-                if (!KeySelector(value).Equals(key))
-                    throw new InvalidOperationException("Key of new value does not match");
-
-                if (!Indecies.ContainsKey(key))
-                {
-                    Add(value);
-                }
-                else
-                {
-                    this[Indecies[key]] = value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Replaces element at given key with new value.  New value must have same key.
-        /// </summary>
-        /// <param name="key">Key of element to replace</param>
-        /// <param name="value">New value</param>
-        ///
-        /// <exception cref="InvalidOperationException"></exception>
-        /// <returns>False if key not found</returns>
-        public 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");
-
-            this[Indecies[key]] = value;
-            return true;
-
-        }
-
-        public void ReplaceAll(IEnumerable<TValue> values)
-        {
-            if (values == null) throw new ArgumentNullException(nameof(values));
-
-            Clear();
-
-            foreach (var value in values)
-            {
-                Add(value);
-            }
-        }
-
-        public bool Remove(TKey key)
-        {
-            if (!Indecies.ContainsKey(key)) return false;
-
-            RemoveAt(Indecies[key]);
-            return true;
-
-        }
-
-        /// <summary>
-        /// Allows us to change the key of an item
-        /// </summary>
-        /// <param name="currentKey"></param>
-        /// <param name="newKey"></param>
-        public 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());
-            }
-
-            var currentIndex = Indecies[currentKey];
-
-            Indecies.Remove(currentKey);
-            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 DuplicateKeyException(string key)
-                : base("Attempted to insert duplicate key \"" + key + "\" in collection.")
-            {
-                Key = key;
-            }
-
-            public string Key { get; }
-        }
-    }
-}
@@ -1,37 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <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>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</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; }
-    }
-}
@@ -1,28 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Indicates that a composer should be disabled.
-    /// </summary>
-    /// <remarks>
-    /// <para>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class DisableComposerAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DisableComposerAttribute"/> class.
-        /// </summary>
-        public DisableComposerAttribute(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; }
-    }
-}
@@ -1,37 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <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>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</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; }
-    }
-}
@@ -1,31 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <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>Assembly-level <see cref="DisableComposerAttribute"/> has greater priority than <see cref="DisableAttribute"/>
-    /// attribute when it is marking the composer itself, but lower priority that when it is referencing another composer.</para>
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
-    public class EnableComposerAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnableComposerAttribute"/> class.
-        /// </summary>
-        public EnableComposerAttribute(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; }
-    }
-}
@@ -1,30 +0,0 @@
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Represents a collection builder.
-    /// </summary>
-    public interface ICollectionBuilder
-    {
-        /// <summary>
-        /// Registers the builder so it can build the collection, by
-        /// registering the collection and the types.
-        /// </summary>
-        void RegisterWith(IRegister register);
-    }
-
-    /// <summary>
-    /// Represents a collection builder.
-    /// </summary>
-    /// <typeparam name="TCollection">The type of the collection.</typeparam>
-    /// <typeparam name="TItem">The type of the items.</typeparam>
-    public interface ICollectionBuilder<out TCollection, TItem> : ICollectionBuilder
-        where TCollection : IBuilderCollection<TItem>
-    {
-        /// <summary>
-        /// Creates a collection.
-        /// </summary>
-        /// <returns>A collection.</returns>
-        /// <remarks>Creates a new collection each time it is invoked.</remarks>
-        TCollection CreateCollection(IFactory factory);
-    }
-}
@@ -1,25 +0,0 @@
-namespace Umbraco.Core.Composing
-{
-    /// <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,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Defines a service factory for Umbraco.
-    /// </summary>
-    public interface IFactory
-    {
-        /// <summary>
-        /// Gets the concrete factory.
-        /// </summary>
-        object Concrete { get; }
-
-        /// <summary>
-        /// Gets an instance of a service.
-        /// </summary>
-        /// <param name="type">The type of the service.</param>
-        /// <returns>An instance of the specified type.</returns>
-        /// <remarks>Throws an exception if the container failed to get an instance of the specified type.</remarks>
-        object GetInstance(Type type);
-
-        /// <summary>
-        /// Gets a targeted instance of a service.
-        /// </summary>
-        /// <typeparam name="TService">The type of the service.</typeparam>
-        /// <typeparam name="TTarget">The type of the target.</typeparam>
-        /// <returns>The instance of the specified type for the specified target.</returns>
-        /// <remarks>Throws an exception if the container failed to get an instance of the specified type.</remarks>
-        TService GetInstanceFor<TService, TTarget>();
-
-        /// <summary>
-        /// Tries to get an instance of a service.
-        /// </summary>
-        /// <param name="type">The type of the service.</param>
-        /// <returns>An instance of the specified type, or null.</returns>
-        /// <remarks>Returns null if the container does not know how to get an instance
-        /// of the specified type. Throws an exception if the container does know how
-        /// to get an instance of the specified type, but failed to do so.</remarks>
-        object TryGetInstance(Type type);
-
-        /// <summary>
-        /// Gets all instances of a service.
-        /// </summary>
-        /// <param name="serviceType">The type of the service.</param>
-        IEnumerable<object> GetAllInstances(Type serviceType);
-
-        /// <summary>
-        /// Gets all instances of a service.
-        /// </summary>
-        /// <typeparam name="TService">The type of the service.</typeparam>
-        IEnumerable<TService> GetAllInstances<TService>()
-            where TService : class;
-
-        /// <summary>
-        /// Releases an instance.
-        /// </summary>
-        /// <param name="instance">The instance.</param>
-        /// <remarks>
-        /// See https://stackoverflow.com/questions/14072208 and http://kozmic.net/2010/08/27/must-i-release-everything-when-using-windsor/,
-        /// you only need to release instances you specifically resolved, and even then, if done right, that might never be needed. For
-        /// instance, LightInject does not require this and does not support it - should work with scopes.
-        /// </remarks>
-        void Release(object instance);
-
-        /// <summary>
-        /// Begins a scope.
-        /// </summary>
-        /// <remarks>
-        /// <para>When the scope is disposed, scoped instances that have been created during the scope are disposed.</para>
-        /// <para>Scopes can be nested. Each instance is disposed individually.</para>
-        /// </remarks>
-        IDisposable BeginScope();
-
-        /// <summary>
-        /// Enables per-request scope.
-        /// </summary>
-        /// <remarks>
-        /// <para>Ties scopes to web requests.</para>
-        /// </remarks>
-        void EnablePerWebRequestScope();
-    }
-}
@@ -1,106 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Defines a service register for Umbraco.
-    /// </summary>
-    public interface IRegister
-    {
-        /// <summary>
-        /// Gets the concrete container.
-        /// </summary>
-        object Concrete { get; }
-
-        /// <summary>
-        /// Registers a service as its own implementation.
-        /// </summary>
-        void Register(Type serviceType, Lifetime lifetime = Lifetime.Transient);
-
-        /// <summary>
-        /// Registers a service with an implementation type.
-        /// </summary>
-        void Register(Type serviceType, Type implementingType, Lifetime lifetime = Lifetime.Transient);
-
-        /// <summary>
-        /// Registers a service with an implementation factory.
-        /// </summary>
-        void Register<TService>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service with an implementing instance.
-        /// </summary>
-        void Register(Type serviceType, object instance);
-
-        /// <summary>
-        /// Registers a service for a target, as its own implementation.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementation type.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Type implementingType, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementation factory.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(Func<IFactory, TService> factory, Lifetime lifetime = Lifetime.Transient)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a service for a target, with an implementing instance.
-        /// </summary>
-        /// <remarks>
-        /// There can only be one implementation or instanced registered for a service and target;
-        /// what happens if many are registered is not specified.
-        /// </remarks>
-        void RegisterFor<TService, TTarget>(TService instance)
-            where TService : class;
-
-        /// <summary>
-        /// Registers a base type for auto-registration.
-        /// </summary>
-        /// <remarks>
-        /// <para>Auto-registration means that anytime the container is asked to create an instance
-        /// of a type deriving from <paramref name="serviceBaseType"/>, it will first register that
-        /// type automatically.</para>
-        /// <para>This can be used for instance for views or controllers. Then, one just needs to
-        /// register a common base class or interface, and the container knows how to create instances.</para>
-        /// </remarks>
-        void RegisterAuto(Type serviceBaseType);
-
-        #region Control
-
-        /// <summary>
-        /// Configures the container for web support.
-        /// </summary>
-        /// <remarks>
-        /// <para>Enables support for MVC, WebAPI, but *not* per-request scope. This is used early in the boot
-        /// process, where anything "scoped" should not be linked to a web request.</para>
-        /// </remarks>
-        void ConfigureForWeb();
-
-        /// <summary>
-        /// Creates the factory.
-        /// </summary>
-        IFactory CreateFactory();
-
-        #endregion
-    }
-}
@@ -1,49 +0,0 @@
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Specifies the lifetime of a registered instance.
-    /// </summary>
-    public enum Lifetime
-    {
-        /// <summary>
-        /// Always get a new instance.
-        /// </summary>
-        /// <remarks>Corresponds to Transient in LightInject, Castle Windsor
-        /// or MS.DI, PerDependency in Autofac.</remarks>
-        Transient,
-
-        /// <summary>
-        /// One unique instance per request.
-        /// </summary>
-        // TODO: review lifetimes for LightInject vs other containers
-        // currently, corresponds to 'Request' in LightInject which is 'Transient + disposed by Scope'
-        // but NOT (in LightInject) a per-web-request lifetime, more a TransientScoped
-        //
-        // we use it for controllers, httpContextBase and umbracoContext
-        // - so that they are automatically disposed at the end of the scope (ie request)
-        // - not sure they should not be simply 'scoped'?
-        //
-        // Castle has an extra PerWebRequest something, and others use scope
-        // what about Request before first request ie during application startup?
-        // see http://blog.ploeh.dk/2009/11/17/UsingCastleWindsor'sPerWebRequestlifestylewithASP.NETMVConIIS7/
-        // Castle ends up requiring a special scope manager too
-        // see https://groups.google.com/forum/#!topic/castle-project-users/1E2W9LVIYR4
-        //
-        // but maybe also - why are we requiring scoped services at startup?
-        Request,
-
-        /// <summary>
-        /// One unique instance per container scope.
-        /// </summary>
-        /// <remarks>Corresponds to Scope in LightInject, Scoped in MS.DI
-        /// or Castle Windsor, PerLifetimeScope in Autofac.</remarks>
-        Scope,
-
-        /// <summary>
-        /// One unique instance per container.
-        /// </summary>
-        /// <remarks>Corresponds to Singleton in LightInject, Castle Windsor
-        /// or MS.DI and to SingleInstance in Autofac.</remarks>
-        Singleton
-    }
-}
@@ -1,21 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Composing
-{
-    /// <summary>
-    /// Marks a composer to indicate a minimum and/or maximum runtime level for which the composer would compose.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class /*, AllowMultiple = false, Inherited = true*/)]
-    public class RuntimeLevelAttribute : Attribute
-    {
-        /// <summary>
-        /// Gets or sets the minimum runtime level for which the composer would compose.
-        /// </summary>
-        public RuntimeLevel MinLevel { get; set; } = RuntimeLevel.Install;
-
-        /// <summary>
-        /// Gets or sets the maximum runtime level for which the composer would compose.
-        /// </summary>
-        public RuntimeLevel MaxLevel { get; set; } = RuntimeLevel.Run;
-    }
-}
@@ -1,10 +0,0 @@
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// Represents an Umbraco configuration section which can be used to pass to UmbracoConfiguration.For{T}
-    /// </summary>
-    public interface IUmbracoConfigurationSection
-    {
-
-    }
-}
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using Umbraco.Core.Macros;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IContentSection : IUmbracoConfigurationSection
-    {
-        string NotificationEmailAddress { get; }
-
-        bool DisableHtmlEmail { get; }
-
-        IEnumerable<string> ImageFileTypes { get; }
-
-        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
-        
-        bool ResolveUrlsFromTextString { get; }
-
-        IEnumerable<IContentErrorPage> Error404Collection { get; }
-        
-        string PreviewBadge { get; }
-
-        MacroErrorBehaviour MacroErrorBehaviour { get; }
-
-        IEnumerable<string> DisallowedUploadFiles { get; }
-
-        IEnumerable<string> AllowedUploadFiles { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether to show deprecated property editors in
-        /// a datatype list of available editors.
-        /// </summary>
-        bool ShowDeprecatedPropertyEditors { get; }
-
-        string LoginBackgroundImage { get; }
-    }
-}
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILoggingSection : IUmbracoConfigurationSection
-    {
-        int MaxLogAge { get; }
-    }
-}
@@ -1,19 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
-    {
-        IBackOfficeSection BackOffice { get; }
-
-        IContentSection Content { get; }
-
-        ISecuritySection Security { get; }
-
-        IRequestHandlerSection RequestHandler { get; }
-        
-        ILoggingSection Logging { get; }
-
-        IWebRoutingSection WebRouting { get; }
-    }
-}
@@ -1,14 +0,0 @@
-namespace Umbraco.Core.Dashboards
-{
-    /// <summary>
-    /// Implements <see cref="IAccessRule"/>.
-    /// </summary>
-    public class AccessRule : IAccessRule
-    {
-        /// <inheritdoc />
-        public AccessRuleType Type { get; set; }
-
-        /// <inheritdoc />
-        public string Value { get; set; }
-    }
-}
@@ -1,28 +0,0 @@
-namespace Umbraco.Core.Dashboards
-{
-    /// <summary>
-    /// Defines dashboard access rules type.
-    /// </summary>
-    public enum AccessRuleType
-    {
-        /// <summary>
-        /// Unknown (default value).
-        /// </summary>
-        Unknown = 0,
-
-        /// <summary>
-        /// Grant access to the dashboard if user belongs to the specified user group.
-        /// </summary>
-        Grant,
-
-        /// <summary>
-        /// Deny access to the dashboard if user belongs to the specified user group.
-        /// </summary>
-        Deny,
-
-        /// <summary>
-        /// Grant access to the dashboard if user has access to the specified section.
-        /// </summary>
-        GrantBySection
-    }
-}
@@ -1,12 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Dashboards
-{
-    [DataContract(IsReference = true)]
-    public class DashboardSlim : IDashboardSlim
-    {
-        public string Alias { get; set; }
-
-        public string View { get; set; }
-    }
-}
@@ -1,18 +0,0 @@
-namespace Umbraco.Core.Dashboards
-{
-    /// <summary>
-    /// Represents an access rule.
-    /// </summary>
-    public interface IAccessRule
-    {
-        /// <summary>
-        /// Gets or sets the rule type.
-        /// </summary>
-        AccessRuleType Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the value for the rule.
-        /// </summary>
-        string Value { get; set; }
-    }
-}
@@ -1,38 +0,0 @@
-using System.Runtime.Serialization;
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Dashboards
-{
-    /// <summary>
-    /// Represents a dashboard.
-    /// </summary>
-    public interface IDashboard : IDashboardSlim, IDiscoverable
-    {
-        /// <summary>
-        /// Gets the aliases of sections/applications where this dashboard appears.
-        /// </summary>
-        /// <remarks>
-        /// <para>This field is *not* needed by the UI and therefore we want to exclude
-        /// it from serialization, but it is deserialized as part of the manifest,
-        /// therefore we cannot plainly ignore it.</para>
-        /// <para>So, it has to remain a data member, plus we use our special
-        /// JsonDontSerialize attribute (see attribute for more details).</para>
-        /// </remarks>
-        [DataMember(Name = "sections")]
-        string[] Sections { get; }
-
-
-        /// <summary>
-        /// Gets the access rule determining the visibility of the dashboard.
-        /// </summary>
-        /// <remarks>
-        /// <para>This field is *not* needed by the UI and therefore we want to exclude
-        /// it from serialization, but it is deserialized as part of the manifest,
-        /// therefore we cannot plainly ignore it.</para>
-        /// <para>So, it has to remain a data member, plus we use our special
-        /// JsonDontSerialize attribute (see attribute for more details).</para>
-        /// </remarks>
-        [DataMember(Name = "access")]
-        IAccessRule[] AccessRules { get; }
-    }
-}
@@ -1,22 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Dashboards
-{
-    /// <summary>
-    /// Represents a dashboard with only minimal data.
-    /// </summary>
-    public interface IDashboardSlim
-    {
-        /// <summary>
-        /// Gets the alias of the dashboard.
-        /// </summary>
-        [DataMember(Name = "alias")]
-        string Alias { get; }
-
-        /// <summary>
-        /// Gets the view used to render the dashboard.
-        /// </summary>
-        [DataMember(Name = "view")]
-        string View { get; }
-    }
-}
@@ -1,8 +0,0 @@
-namespace Umbraco.Core
-{
-    public enum Direction
-    {
-        Ascending = 0,
-        Descending = 1
-    }
-}
@@ -1,45 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides extension methods to enums.
-    /// </summary>
-    public static class EnumExtensions
-    {
-        // note:
-        // - no need to HasFlagExact, that's basically an == test
-        // - HasFlagAll cannot be named HasFlag because ext. methods never take priority over instance methods
-
-        /// <summary>
-        /// Determines whether a flag enum has all the specified values.
-        /// </summary>
-        /// <remarks>
-        /// <para>True when all bits set in <paramref name="uses"/> are set in <paramref name="use"/>, though other bits may be set too.</para>
-        /// <para>This is the behavior of the original <see cref="Enum.HasFlag"/> method.</para>
-        /// </remarks>
-        public static bool HasFlagAll<T>(this T use, T uses)
-            where T : Enum
-        {
-            var num = Convert.ToUInt64(use);
-            var nums = Convert.ToUInt64(uses);
-
-            return (num & nums) == nums;
-        }
-
-        /// <summary>
-        /// Determines whether a flag enum has any of the specified values.
-        /// </summary>
-        /// <remarks>
-        /// <para>True when at least one of the bits set in <paramref name="uses"/> is set in <paramref name="use"/>.</para>
-        /// </remarks>
-        public static bool HasFlagAny<T>(this T use, T uses)
-            where T : Enum
-        {
-            var num = Convert.ToUInt64(use);
-            var nums = Convert.ToUInt64(uses);
-
-            return (num & nums) > 0;
-        }
-    }
-}
@@ -1,397 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Umbraco.Core
-{
-    ///<summary>
-    /// Extensions for enumerable sources
-    ///</summary>
-    public static class EnumerableExtensions
-    {
-        // based upon the original Zip<T1, T2, TResult> method
-        public static IEnumerable<TResult> Zip<T1, T2, T3, TResult>(this IEnumerable<T1> e1, IEnumerable<T2> e2, IEnumerable<T3> e3,
-            Func<T1, T2, T3, TResult> resultSelector)
-        {
-            if (e1 == null) throw new ArgumentNullException("e1");
-            if (e2 == null) throw new ArgumentNullException("e2");
-            if (e3 == null) throw new ArgumentNullException("e3");
-            if (resultSelector == null) throw new ArgumentNullException("resultSelector");
-            return ZipIterator(e1, e2, e3, resultSelector);
-        }
-
-        private static IEnumerable<TResult> ZipIterator<T1, T2, T3, TResult>(IEnumerable<T1> ie1, IEnumerable<T2> ie2, IEnumerable<T3> ie3,
-            Func<T1, T2, T3, TResult> resultSelector)
-        {
-            var e1 = ie1.GetEnumerator();
-            try
-            {
-                var e2 = ie2.GetEnumerator();
-                var e3 = ie3.GetEnumerator();
-                try
-                {
-                    while (e1.MoveNext() && e2.MoveNext() && e3.MoveNext())
-                        yield return resultSelector(e1.Current, e2.Current, e3.Current);
-                }
-                finally
-                {
-                    if (e2 != null)
-                        e2.Dispose();
-                    if (e3 != null)
-                        e3.Dispose();
-                }
-            }
-            finally
-            {
-                if (e1 != null)
-                    e1.Dispose();
-            }
-        }
-
-        internal static bool HasDuplicates<T>(this IEnumerable<T> items, bool includeNull)
-        {
-            var hs = new HashSet<T>();
-            foreach (var item in items)
-            {
-                if ((item != null || includeNull) && !hs.Add(item))
-                    return true;
-            }
-            return false;
-        }
-
-
-        /// <summary>
-        /// Wraps this object instance into an IEnumerable{T} consisting of a single item.
-        /// </summary>
-        /// <typeparam name="T"> Type of the object. </typeparam>
-        /// <param name="item"> The instance that will be wrapped. </param>
-        /// <returns> An IEnumerable{T} consisting of a single item. </returns>
-        public static IEnumerable<T> Yield<T>(this T item)
-        {
-            // see EnumeratorBenchmarks - this is faster, and allocates less, than returning an array
-            yield return item;
-        }
-
-        public static IEnumerable<IEnumerable<T>> InGroupsOf<T>(this IEnumerable<T> source, int groupSize)
-        {
-            if (source == null)
-                throw new ArgumentNullException("source");
-            if (groupSize <= 0)
-                throw new ArgumentException("Must be greater than zero.", "groupSize");
-
-
-            // following code derived from MoreLinq and does not allocate bazillions of tuples
-
-            T[] temp = null;
-            var count = 0;
-
-            foreach (var item in source)
-            {
-                if (temp == null) temp = new T[groupSize];
-                temp[count++] = item;
-                if (count != groupSize) continue;
-                yield return temp/*.Select(x => x)*/;
-                temp = null;
-                count = 0;
-            }
-
-            if (temp != null && count > 0)
-                yield return temp.Take(count);
-        }
-
-        public static IEnumerable<TResult> SelectByGroups<TResult, TSource>(this IEnumerable<TSource> source, Func<IEnumerable<TSource>, IEnumerable<TResult>> selector, int groupSize)
-        {
-            // don't want to use a SelectMany(x => x) here - isn't this better?
-            // ReSharper disable once LoopCanBeConvertedToQuery
-            foreach (var resultGroup in source.InGroupsOf(groupSize).Select(selector))
-                foreach (var result in resultGroup)
-                    yield return result;
-        }
-
-        /// <summary>The distinct by.</summary>
-        /// <param name="source">The source.</param>
-        /// <param name="keySelector">The key selector.</param>
-        /// <typeparam name="TSource">Source type</typeparam>
-        /// <typeparam name="TKey">Key type</typeparam>
-        /// <returns>the unique list</returns>
-        public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
-            where TKey : IEquatable<TKey>
-        {
-            return source.Distinct(DelegateEqualityComparer<TSource>.CompareMember(keySelector));
-        }
-
-        /// <summary>
-        /// Returns a sequence of length <paramref name="count"/> whose elements are the result of invoking <paramref name="factory"/>.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="factory">The factory.</param>
-        /// <param name="count">The count.</param>
-        /// <returns></returns>
-        public static IEnumerable<T> Range<T>(Func<int, T> factory, int count)
-        {
-            for (int i = 1; i <= count; i++)
-            {
-                yield return factory.Invoke(i - 1);
-            }
-        }
-
-        /// <summary>The if not null.</summary>
-        /// <param name="items">The items.</param>
-        /// <param name="action">The action.</param>
-        /// <typeparam name="TItem">The type</typeparam>
-        public static void IfNotNull<TItem>(this IEnumerable<TItem> items, Action<TItem> action) where TItem : class
-        {
-            if (items != null)
-            {
-                foreach (TItem item in items)
-                {
-                    item.IfNotNull(action);
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// Returns true if all items in the other collection exist in this collection
-        /// </summary>
-        /// <typeparam name="TSource"></typeparam>
-        /// <param name="source"></param>
-        /// <param name="other"></param>
-        /// <returns></returns>
-        public static bool ContainsAll<TSource>(this IEnumerable<TSource> source, IEnumerable<TSource> other)
-        {
-            if (source == null) throw new ArgumentNullException("source");
-            if (other == null) throw new ArgumentNullException("other");
-
-            return other.Except(source).Any() == false;
-        }
-
-        /// <summary>
-        /// Returns true if the source contains any of the items in the other list
-        /// </summary>
-        /// <typeparam name="TSource"></typeparam>
-        /// <param name="source"></param>
-        /// <param name="other"></param>
-        /// <returns></returns>
-        public static bool ContainsAny<TSource>(this IEnumerable<TSource> source, IEnumerable<TSource> other)
-        {
-            return other.Any(source.Contains);
-        }
-
-        /// <summary>
-        /// Removes all matching items from an <see cref="IList{T}"/>.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="list">The list.</param>
-        /// <param name="predicate">The predicate.</param>
-        /// <remarks></remarks>
-        public static void RemoveAll<T>(this IList<T> list, Func<T, bool> predicate)
-        {
-            for (var i = 0; i < list.Count; i++)
-            {
-                if (predicate(list[i]))
-                {
-                    list.RemoveAt(i--);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Removes all matching items from an <see cref="ICollection{T}"/>.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="list">The list.</param>
-        /// <param name="predicate">The predicate.</param>
-        /// <remarks></remarks>
-        public static void RemoveAll<T>(this ICollection<T> list, Func<T, bool> predicate)
-        {
-            var matches = list.Where(predicate).ToArray();
-            foreach (var match in matches)
-            {
-                list.Remove(match);
-            }
-        }
-
-        public static IEnumerable<TSource> SelectRecursive<TSource>(
-          this IEnumerable<TSource> source,
-          Func<TSource, IEnumerable<TSource>> recursiveSelector, int maxRecusionDepth = 100)
-        {
-            var stack = new Stack<IEnumerator<TSource>>();
-            stack.Push(source.GetEnumerator());
-
-            try
-            {
-                while (stack.Count > 0)
-                {
-                    if (stack.Count > maxRecusionDepth)
-                        throw new InvalidOperationException("Maximum recursion depth reached of " + maxRecusionDepth);
-
-                    if (stack.Peek().MoveNext())
-                    {
-                        var current = stack.Peek().Current;
-
-                        yield return current;
-
-                        stack.Push(recursiveSelector(current).GetEnumerator());
-                    }
-                    else
-                    {
-                        stack.Pop().Dispose();
-                    }
-                }
-            }
-            finally
-            {
-                while (stack.Count > 0)
-                {
-                    stack.Pop().Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Filters a sequence of values to ignore those which are null.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="coll">The coll.</param>
-        /// <returns></returns>
-        /// <remarks></remarks>
-        public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T> coll) where T : class
-        {
-            return coll.Where(x => x != null);
-        }
-
-        public static IEnumerable<TBase> ForAllThatAre<TBase, TActual>(this IEnumerable<TBase> sequence, Action<TActual> projection)
-            where TActual : class
-        {
-            return sequence.Select(
-                x =>
-                {
-                    if (x is TActual)
-                    {
-                        var casted = x as TActual;
-                        projection.Invoke(casted);
-                    }
-                    return x;
-                });
-        }
-
-        /// <summary>
-        /// Finds the index of the first item matching an expression in an enumerable.
-        /// </summary>
-        /// <typeparam name="T">The type of the enumerated objects.</typeparam>
-        /// <param name="items">The enumerable to search.</param>
-        /// <param name="predicate">The expression to test the items against.</param>
-        /// <returns>The index of the first matching item, or -1.</returns>
-        public static int FindIndex<T>(this IEnumerable<T> items, Func<T, bool> predicate)
-        {
-            return FindIndex(items, 0, predicate);
-        }
-
-        /// <summary>
-        /// Finds the index of the first item matching an expression in an enumerable.
-        /// </summary>
-        /// <typeparam name="T">The type of the enumerated objects.</typeparam>
-        /// <param name="items">The enumerable to search.</param>
-        /// <param name="startIndex">The index to start at.</param>
-        /// <param name="predicate">The expression to test the items against.</param>
-        /// <returns>The index of the first matching item, or -1.</returns>
-        public static int FindIndex<T>(this IEnumerable<T> items, int startIndex, Func<T, bool> predicate)
-        {
-            if (items == null) throw new ArgumentNullException("items");
-            if (predicate == null) throw new ArgumentNullException("predicate");
-            if (startIndex < 0) throw new ArgumentOutOfRangeException("startIndex");
-
-            var index = startIndex;
-            if (index > 0)
-                items = items.Skip(index);
-
-            foreach (var item in items)
-            {
-                if (predicate(item)) return index;
-                index++;
-            }
-
-            return -1;
-        }
-
-        ///<summary>Finds the index of the first occurrence of an item in an enumerable.</summary>
-        ///<param name="items">The enumerable to search.</param>
-        ///<param name="item">The item to find.</param>
-        ///<returns>The index of the first matching item, or -1 if the item was not found.</returns>
-        public static int IndexOf<T>(this IEnumerable<T> items, T item)
-        {
-            return items.FindIndex(i => EqualityComparer<T>.Default.Equals(item, i));
-        }
-
-        /// <summary>
-        /// Determines if 2 lists have equal elements within them regardless of how they are sorted
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="source"></param>
-        /// <param name="other"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// The logic for this is taken from:
-        /// http://stackoverflow.com/questions/4576723/test-whether-two-ienumerablet-have-the-same-values-with-the-same-frequencies
-        ///
-        /// There's a few answers, this one seems the best for it's simplicity and based on the comment of Eamon
-        /// </remarks>
-        public static bool UnsortedSequenceEqual<T>(this IEnumerable<T> source, IEnumerable<T> other)
-        {
-            if (source == null && other == null) return true;
-            if (source == null || other == null) return false;
-
-            var list1Groups = source.ToLookup(i => i);
-            var list2Groups = other.ToLookup(i => i);
-            return list1Groups.Count == list2Groups.Count
-               && list1Groups.All(g => g.Count() == list2Groups[g.Key].Count());
-        }
-
-        /// <summary>
-        /// Transforms an enumerable.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="source"></param>
-        /// <param name="transform"></param>
-        /// <returns></returns>
-        public static IEnumerable<TTarget> Transform<TSource, TTarget>(this IEnumerable<TSource> source, Func<IEnumerable<TSource>, IEnumerable<TTarget>> transform)
-        {
-            return transform(source);
-        }
-
-        /// <summary>
-        /// Gets a null IEnumerable as an empty IEnumerable.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="items"></param>
-        /// <returns></returns>
-        public static IEnumerable<T> EmptyNull<T>(this IEnumerable<T> items)
-        {
-            return items ?? Enumerable.Empty<T>();
-        }
-
-        // the .OfType<T>() filter is nice when there's only one type
-        // this is to support filtering with multiple types
-        public static IEnumerable<T> OfTypes<T>(this IEnumerable<T> contents, params Type[] types)
-        {
-            return contents.Where(x => types.Contains(x.GetType()));
-        }
-
-        public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source)
-        {
-            using (var e = source.GetEnumerator())
-            {
-                if (e.MoveNext() == false) yield break;
-
-                for (var value = e.Current; e.MoveNext(); value = e.Current)
-                    yield return value;
-            }
-        }
-
-        public static IOrderedEnumerable<TSource> OrderBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Direction sortOrder)
-        {
-            return sortOrder == Direction.Ascending ? source.OrderBy(keySelector) : source.OrderByDescending(keySelector);
-        }
-    }
-}
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Events
-{
-    /// <summary>
-    /// Provides a base class for classes representing event data, for events that support cancellation, and expose an impacted object.
-    /// </summary>
-    public abstract class CancellableObjectEventArgs : CancellableEventArgs
-    {
-        protected CancellableObjectEventArgs(object eventObject, bool canCancel, EventMessages messages, IDictionary<string, object> additionalData)
-            : base(canCancel, messages, additionalData)
-        {
-            EventObject = eventObject;
-        }
-
-        protected CancellableObjectEventArgs(object eventObject, bool canCancel, EventMessages eventMessages)
-            : base(canCancel, eventMessages)
-        {
-            EventObject = eventObject;
-        }
-
-        protected CancellableObjectEventArgs(object eventObject, EventMessages eventMessages)
-            : this(eventObject, true, eventMessages)
-        {
-        }
-
-        protected CancellableObjectEventArgs(object eventObject, bool canCancel)
-            : base(canCancel)
-        {
-            EventObject = eventObject;
-        }
-
-        protected CancellableObjectEventArgs(object eventObject)
-            : this(eventObject, true)
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the impacted object.
-        /// </summary>
-        /// <remarks>
-        /// This is protected so that inheritors can expose it with their own name
-        /// </remarks>
-        public object EventObject { get; set; }
-    }
-}
@@ -1,4 +0,0 @@
-namespace Umbraco.Core.Events
-{
-    public class DatabaseCreationEventArgs : System.ComponentModel.CancelEventArgs{}
-}
@@ -1,8 +0,0 @@
-namespace Umbraco.Core.Events
-{
-    public enum EventNameExtractorError
-    {
-        NoneFound,
-        Ambiguous
-    }
-}
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Events
-{
-    public interface IDeletingMediaFilesEventArgs
-    {
-        List<string> MediaFilesToDelete { get; }
-    }
-}
@@ -1,60 +0,0 @@
-using System;
-using System.Text;
-
-namespace Umbraco.Core.Exceptions
-{
-    /// <summary>
-    /// An exception that is thrown if the Umbraco application cannot boot.
-    /// </summary>
-    public class BootFailedException : Exception
-    {
-        /// <summary>
-        /// Defines the default boot failed exception message.
-        /// </summary>
-        public const string DefaultMessage = "Boot failed: Umbraco cannot run. See Umbraco's log file for more details.";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Exception"/> class with a specified error message.
-        /// </summary>
-        /// <param name="message">The message that describes the error. </param>
-        public BootFailedException(string message)
-            : base(message)
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Exception"/> class with a specified error message
-        /// and a reference to the inner exception which is the cause of this exception.
-        /// </summary>
-        /// <param name="message">The message that describes the error. </param>
-        /// <param name="inner">The inner exception, or null.</param>
-        public BootFailedException(string message, Exception inner)
-            : base(message, inner)
-        { }
-
-        /// <summary>
-        /// Rethrows a captured <see cref="BootFailedException"/>.
-        /// </summary>
-        /// <remarks>The exception can be null, in which case a default message is used.</remarks>
-        public static void Rethrow(BootFailedException bootFailedException)
-        {
-            if (bootFailedException == null)
-                throw new BootFailedException(DefaultMessage);
-
-            // see https://stackoverflow.com/questions/57383
-            // would that be the correct way to do it?
-            //ExceptionDispatchInfo.Capture(bootFailedException).Throw();
-
-            Exception e = bootFailedException;
-            var m = new StringBuilder();
-            m.Append(DefaultMessage);
-            while (e != null)
-            {
-                m.Append($"\n\n-> {e.GetType().FullName}: {e.Message}");
-                if (string.IsNullOrWhiteSpace(e.StackTrace) == false)
-                    m.Append($"\n{e.StackTrace}");
-                e = e.InnerException;
-            }
-            throw new BootFailedException(m.ToString());
-        }
-    }
-}
@@ -1,84 +0,0 @@
-using System.Linq;
-using System.Runtime.CompilerServices;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides methods for encoding byte arrays into hexadecimal strings.
-    /// </summary>
-    public static class HexEncoder
-    {
-        // LUT's that provide the hexadecimal representation of each possible byte value.
-        private static readonly char[] HexLutBase = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
-        // The base LUT arranged in 16x each item order. 0 * 16, 1 * 16, .... F * 16
-        private static readonly char[] HexLutHi = Enumerable.Range(0, 256).Select(x => HexLutBase[x / 0x10]).ToArray();
-
-        // The base LUT repeated 16x.
-        private static readonly char[] HexLutLo = Enumerable.Range(0, 256).Select(x => HexLutBase[x % 0x10]).ToArray();
-
-        /// <summary>
-        /// Converts a <see cref="T:byte[]"/> to a hexadecimal formatted <see cref="string"/> padded to 2 digits.
-        /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        /// <returns>The <see cref="string"/>.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string Encode(byte[] bytes)
-        {
-            var length = bytes.Length;
-            var chars = new char[length * 2];
-
-            var index = 0;
-            for (var i = 0; i < length; i++)
-            {
-                var byteIndex = bytes[i];
-                chars[index++] = HexLutHi[byteIndex];
-                chars[index++] = HexLutLo[byteIndex];
-            }
-
-            return new string(chars, 0, chars.Length);
-        }
-
-        /// <summary>
-        /// Converts a <see cref="T:byte[]"/> to a hexadecimal formatted <see cref="string"/> padded to 2 digits
-        /// and split into blocks with the given char separator.
-        /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        /// <param name="separator">The separator.</param>
-        /// <param name="blockSize">The block size.</param>
-        /// <param name="blockCount">The block count.</param>
-        /// <returns></returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string Encode(byte[] bytes, char separator, int blockSize, int blockCount)
-        {
-            var length = bytes.Length;
-            var chars = new char[(length * 2) + blockCount];
-            var count = 0;
-            var size = 0;
-            var index = 0;
-
-            for (var i = 0; i < length; i++)
-            {
-                var byteIndex = bytes[i];
-                chars[index++] = HexLutHi[byteIndex];
-                chars[index++] = HexLutLo[byteIndex];
-
-                if (count == blockCount)
-                {
-                    continue;
-                }
-
-                if (++size < blockSize)
-                {
-                    continue;
-                }
-
-                chars[index++] = separator;
-                size = 0;
-                count++;
-            }
-
-            return new string(chars, 0, chars.Length);
-        }
-    }
-}
@@ -1,38 +0,0 @@
-using System;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Represents the main AppDomain running for a given application.
-    /// </summary>
-    /// <remarks>
-    /// <para>There can be only one "main" AppDomain running for a given application at a time.</para>
-    /// <para>It is possible to register against the MainDom and be notified when it is released.</para>
-    /// </remarks>
-    public interface IMainDom
-    {
-        /// <summary>
-        /// Gets a value indicating whether the current domain is the main domain.
-        /// </summary>
-        bool IsMainDom { get; }
-
-        /// <summary>
-        /// Registers a resource that requires the current AppDomain to be the main domain to function.
-        /// </summary>
-        /// <param name="release">An action to execute before the AppDomain releases the main domain status.</param>
-        /// <param name="weight">An optional weight (lower goes first).</param>
-        /// <returns>A value indicating whether it was possible to register.</returns>
-        bool Register(Action release, int weight = 100);
-
-        /// <summary>
-        /// Registers a resource that requires the current AppDomain to be the main domain to function.
-        /// </summary>
-        /// <param name="install">An action to execute when registering.</param>
-        /// <param name="release">An action to execute before the AppDomain releases the main domain status.</param>
-        /// <param name="weight">An optional weight (lower goes first).</param>
-        /// <returns>A value indicating whether it was possible to register.</returns>
-        /// <remarks>If registering is successful, then the <paramref name="install"/> action
-        /// is guaranteed to execute before the AppDomain releases the main domain status.</remarks>
-        bool Register(Action install, Action release, int weight = 100);
-    }
-}
@@ -1,104 +0,0 @@
-using System;
-using System.Diagnostics;
-
-namespace Umbraco.Core.Logging
-{
-    /// <summary>
-    /// Starts the timer and invokes a  callback upon disposal. Provides a simple way of timing an operation by wrapping it in a <code>using</code> (C#) statement.
-    /// </summary>
-	public class DisposableTimer : DisposableObjectSlim
-    {
-        private readonly ILogger _logger;
-        private readonly LogLevel _level;
-        private readonly Type _loggerType;
-        private readonly int _thresholdMilliseconds;
-        private readonly IDisposable _profilerStep;
-        private readonly string _endMessage;
-        private string _failMessage;
-        private Exception _failException;
-        private bool _failed;
-        private readonly string _timingId;
-
-        // internal - created by profiling logger
-        internal DisposableTimer(ILogger logger, LogLevel level, IProfiler profiler, Type loggerType,
-            string startMessage, string endMessage, string failMessage = null,
-            int thresholdMilliseconds = 0)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _level = level;
-            _loggerType = loggerType ?? throw new ArgumentNullException(nameof(loggerType));
-            _endMessage = endMessage;
-            _failMessage = failMessage;
-            _thresholdMilliseconds = thresholdMilliseconds < 0 ? 0 : thresholdMilliseconds;
-            _timingId = Guid.NewGuid().ToString("N").Substring(0, 7); // keep it short-ish
-
-            if (thresholdMilliseconds == 0)
-            {
-                switch (_level)
-                {
-                    case LogLevel.Debug:
-                        logger.Debug(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
-                        break;
-                    case LogLevel.Information:
-                        logger.Info(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(level));
-                }
-            }
-
-            // else aren't logging the start message, this is output to the profiler but not the log,
-            // we just want the log to contain the result if it's more than the minimum ms threshold.
-
-            _profilerStep = profiler?.Step(loggerType, startMessage);
-        }
-
-        /// <summary>
-        /// Reports a failure.
-        /// </summary>
-        /// <param name="failMessage">The fail message.</param>
-        /// <param name="exception">The exception.</param>
-        /// <remarks>Completion of the timer will be reported as an error, with the specified message and exception.</remarks>
-        public void Fail(string failMessage = null, Exception exception = null)
-        {
-            _failed = true;
-            _failMessage = failMessage ?? _failMessage ?? "Failed.";
-            _failException = exception;
-        }
-
-        public Stopwatch Stopwatch { get; } = Stopwatch.StartNew();
-
-        /// <summary>
-        ///Disposes resources.
-        /// </summary>
-        /// <remarks>Overrides abstract class <see cref="DisposableObject"/> which handles required locking.</remarks>
-        protected override void DisposeResources()
-        {
-            Stopwatch.Stop();
-
-            _profilerStep?.Dispose();
-
-            if ((Stopwatch.ElapsedMilliseconds >= _thresholdMilliseconds || _failed)
-                && _loggerType != null && _logger != null
-                && (string.IsNullOrWhiteSpace(_endMessage) == false || _failed))
-            {
-                if (_failed)
-                {
-                    _logger.Error(_loggerType, _failException, "{FailMessage} ({Duration}ms) [Timing {TimingId}]", _failMessage, Stopwatch.ElapsedMilliseconds, _timingId);
-                }
-                else switch (_level)
-                {
-                    case LogLevel.Debug:
-                        _logger.Debug(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
-                        break;
-                    case LogLevel.Information:
-                        _logger.Info(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
-                        break;
-                    // filtered in the ctor
-                    //default:
-                    //    throw new Exception();
-                }
-            }
-        }
-    }
-}
@@ -1,181 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Logging
-{
-    /// <summary>
-    /// Defines the logging service.
-    /// </summary>
-    /// <remarks>
-    /// <para>Message templates in logging methods follow the Message Templates specification
-    /// available at https://messagetemplates.org/ in order to support structured logging.</para>
-    /// <para>Implementations must ensure that they support these templates. Note that the
-    /// specification includes support for traditional C# numeric placeholders.</para>
-    /// <para>For instance, "Processed {Input} in {Time}ms."</para>
-    /// </remarks>
-    public interface ILogger
-    {
-        /// <summary>
-        /// Determines if logging is enabled at a specified level, for a reporting type.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="level">The level.</param>
-        bool IsEnabled(Type reporting, LogLevel level);
-
-        /// <summary>
-        /// Logs a fatal message with an exception.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="message">A message.</param>
-        void Fatal(Type reporting, Exception exception, string message);
-
-        /// <summary>
-        /// Logs a fatal exception.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="exception">An exception.</param>
-        /// <remarks>The message string is unspecified and is implementation-specific.</remarks>
-        void Fatal(Type reporting, Exception exception);
-
-        /// <summary>
-        /// Logs a fatal message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="message">A message.</param>
-        void Fatal(Type reporting, string message);
-
-        /// <summary>
-        /// Logs a fatal message with an exception.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
-
-        /// <summary>
-        /// Logs a fatal message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Fatal(Type reporting, string messageTemplate, params object[] propertyValues);
-
-        /// <summary>
-        /// Logs an error message with an exception.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="message">A message.</param>
-        void Error(Type reporting, Exception exception, string message);
-
-        /// <summary>
-        /// Logs an error exception.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="exception">An exception.</param>
-        /// <remarks>The message string is unspecified and is implementation-specific.</remarks>
-        void Error(Type reporting, Exception exception);
-
-        /// <summary>
-        /// Logs an error message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="message">A message.</param>
-        void Error(Type reporting, string message);
-
-        /// <summary>
-        /// Logs an error message with an exception.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Error(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
-
-        /// <summary>
-        /// Logs an error message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Error(Type reporting, string messageTemplate, params object[] propertyValues);
-
-        /// <summary>
-        /// Logs a warning message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="message">A message.</param>
-        void Warn(Type reporting, string message);
-
-        /// <summary>
-        /// Logs a warning message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Warn(Type reporting, string messageTemplate, params object[] propertyValues);
-
-        /// <summary>
-        /// Logs a warning message with an exception.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="message">A message.</param>
-        void Warn(Type reporting, Exception exception, string message);
-
-        /// <summary>
-        /// Logs a warning message with an exception.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Warn(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
-
-        /// <summary>
-        /// Logs an information message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="message">A message.</param>
-        void Info(Type reporting, string message);
-
-        /// <summary>
-        /// Logs a info message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Info(Type reporting, string messageTemplate, params object[] propertyValues);
-
-        /// <summary>
-        /// Logs a debugging message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="message">A message.</param>
-        void Debug(Type reporting, string message);
-
-        /// <summary>
-        /// Logs a debug message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Debug(Type reporting, string messageTemplate, params object[] propertyValues);
-
-        /// <summary>
-        /// Logs a verbose message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="message">A message.</param>
-        void Verbose(Type reporting, string message);
-
-        /// <summary>
-        /// Logs a verbose message.
-        /// </summary>
-        /// <param name="reporting">The reporting type.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        void Verbose(Type reporting, string messageTemplate, params object[] propertyValues);
-    }
-}
@@ -1,40 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Logging
-{
-    /// <summary>
-    /// Defines the profiling logging service.
-    /// </summary>
-    public interface IProfilingLogger : ILogger
-    {
-        /// <summary>
-        /// Profiles an action and log as information messages.
-        /// </summary>
-        DisposableTimer TraceDuration<T>(string startMessage);
-
-        /// <summary>
-        /// Profiles an action and log as information messages.
-        /// </summary>
-        DisposableTimer TraceDuration<T>(string startMessage, string completeMessage, string failMessage = null);
-
-        /// <summary>
-        /// Profiles an action and log as information messages.
-        /// </summary>
-        DisposableTimer TraceDuration(Type loggerType, string startMessage, string completeMessage, string failMessage = null);
-
-        /// <summary>
-        /// Profiles an action and log as debug messages.
-        /// </summary>
-        DisposableTimer DebugDuration<T>(string startMessage);
-
-        /// <summary>
-        /// Profiles an action and log as debug messages.
-        /// </summary>
-        DisposableTimer DebugDuration<T>(string startMessage, string completeMessage, string failMessage = null, int thresholdMilliseconds = 0);
-
-        /// <summary>
-        /// Profiles an action and log as debug messages.
-        /// </summary>
-        DisposableTimer DebugDuration(Type loggerType, string startMessage, string completeMessage, string failMessage = null, int thresholdMilliseconds = 0);
-    }
-}
@@ -1,15 +0,0 @@
-namespace Umbraco.Core.Logging
-{
-    /// <summary>
-    /// Specifies the level of a log event.
-    /// </summary>
-    public enum LogLevel
-    {
-        Verbose,
-        Debug,
-        Information,
-        Warning,
-        Error,
-        Fatal
-    }
-}
@@ -1,186 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Logging
-{
-    /// <summary>
-    /// Provides extension methods for the <see cref="ILogger"/> interface.
-    /// </summary>
-    public static class LoggerExtensions
-    {
-        /// <summary>
-        /// Determines if logging is enabled at a specified level, for a reporting type.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="level">The level.</param>
-        public static bool IsEnabled<T>(this ILogger logger, LogLevel level)
-            => logger.IsEnabled(typeof(T), level);
-
-        /// <summary>
-        /// Logs an error message with an exception.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">A message.</param>
-        /// <param name="exception">An exception.</param>
-        public static void Error<T>(this ILogger logger, Exception exception, string message)
-            => logger.Error(typeof(T), exception, message);
-
-        /// <summary>
-        /// Logs an error message with an exception.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        public static void Error<T>(this ILogger logger, Exception exception, string messageTemplate, params object[] propertyValues)
-            => logger.Error(typeof(T), exception, messageTemplate, propertyValues);
-
-        /// <summary>
-        /// Logs an error exception.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="exception">An exception.</param>
-        public static void Error<T>(this ILogger logger, Exception exception)
-            => logger.Error(typeof(T), exception);
-
-        /// <summary>
-        /// Logs an error message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">A message.</param>
-        public static void Error<T>(this ILogger logger, string message)
-            => logger.Error(typeof(T), message);
-
-        /// <summary>
-        /// Logs an error message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        public static void Error<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
-            => logger.Error(typeof(T), messageTemplate, propertyValues);
-
-        /// <summary>
-        /// Logs a warning message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">A message.</param>
-        public static void Warn<T>(this ILogger logger, string message)
-            => logger.Warn(typeof(T), message);
-
-        /// <summary>
-        /// Logs a warning message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        public static void Warn<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
-            => logger.Warn(typeof(T), messageTemplate, propertyValues);
-
-        /// <summary>
-        /// Logs a warning message with an exception.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="message">A message.</param>
-        public static void Warn<T>(this ILogger logger, Exception exception, string message)
-            => logger.Warn(typeof(T), exception, message);
-
-        /// <summary>
-        /// Logs a warning message with an exception.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        public static void Warn<T>(this ILogger logger, Exception exception, string messageTemplate, params object[] propertyValues)
-            => logger.Warn(typeof(T), exception, messageTemplate, propertyValues);
-
-        /// <summary>
-        /// Logs an information message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">A message.</param>
-        public static void Info<T>(this ILogger logger, string message)
-            => logger.Info(typeof(T), message);
-
-        /// <summary>
-        /// Logs a information message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        public static void Info<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
-            => logger.Info(typeof(T), messageTemplate, propertyValues);
-
-        /// <summary>
-        /// Logs a debugging message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">A message.</param>
-        public static void Debug<T>(this ILogger logger, string message)
-            => logger.Debug(typeof(T), message);
-
-        /// <summary>
-        /// Logs a debugging message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        public static void Debug<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
-            => logger.Debug(typeof(T), messageTemplate, propertyValues);
-
-        /// <summary>
-        /// Logs a verbose message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="message">A message.</param>
-        public static void Verbose<T>(this ILogger logger, string message)
-            => logger.Verbose(typeof(T), message);
-
-        /// <summary>
-        /// Logs a verbose message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        public static void Verbose<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
-            => logger.Verbose(typeof(T), messageTemplate, propertyValues);
-
-        /// <summary>
-        /// Logs a fatal message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="message">A message.</param>
-        public static void Fatal<T>(this ILogger logger, Exception exception, string message)
-            => logger.Fatal(typeof(T), exception, message);
-
-        /// <summary>
-        /// Logs a fatal message.
-        /// </summary>
-        /// <typeparam name="T">The reporting type.</typeparam>
-        /// <param name="logger">The logger.</param>
-        /// <param name="exception">An exception.</param>
-        /// <param name="messageTemplate">A message template.</param>
-        /// <param name="propertyValues">Property values.</param>
-        public static void Fatal<T>(this ILogger logger, Exception exception, string messageTemplate, params object[] propertyValues)
-            => logger.Fatal(typeof(T), exception, messageTemplate, propertyValues);
-    }
-}
@@ -1,132 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Logging
-{
-    /// <summary>
-    /// Provides logging and profiling services.
-    /// </summary>
-    public sealed class ProfilingLogger : IProfilingLogger
-    {
-        /// <summary>
-        /// Gets the underlying <see cref="ILogger"/> implementation.
-        /// </summary>
-        public ILogger Logger { get; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="IProfiler"/> implementation.
-        /// </summary>
-        public IProfiler Profiler { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProfilingLogger"/> class.
-        /// </summary>
-        public ProfilingLogger(ILogger logger, IProfiler profiler)
-        {
-            Logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            Profiler = profiler ?? throw new ArgumentNullException(nameof(profiler));
-        }
-
-        public DisposableTimer TraceDuration<T>(string startMessage)
-        {
-            return TraceDuration<T>(startMessage, "Completed.");
-        }
-
-        public DisposableTimer TraceDuration<T>(string startMessage, string completeMessage, string failMessage = null)
-        {
-            return new DisposableTimer(Logger, LogLevel.Information, Profiler, typeof(T), startMessage, completeMessage, failMessage);
-        }
-
-        public DisposableTimer TraceDuration(Type loggerType, string startMessage, string completeMessage, string failMessage = null)
-        {
-            return new DisposableTimer(Logger, LogLevel.Information, Profiler, loggerType, startMessage, completeMessage, failMessage);
-        }
-
-        public DisposableTimer DebugDuration<T>(string startMessage)
-        {
-            return Logger.IsEnabled<T>(LogLevel.Debug)
-                ? DebugDuration<T>(startMessage, "Completed.")
-                : null;
-        }
-
-        public DisposableTimer DebugDuration<T>(string startMessage, string completeMessage, string failMessage = null, int thresholdMilliseconds = 0)
-        {
-            return Logger.IsEnabled<T>(LogLevel.Debug)
-                ? new DisposableTimer(Logger, LogLevel.Debug, Profiler, typeof(T), startMessage, completeMessage, failMessage, thresholdMilliseconds)
-                : null;
-        }
-
-        public DisposableTimer DebugDuration(Type loggerType, string startMessage, string completeMessage, string failMessage = null, int thresholdMilliseconds = 0)
-        {
-            return Logger.IsEnabled(loggerType, LogLevel.Debug)
-                ? new DisposableTimer(Logger, LogLevel.Debug, Profiler, loggerType, startMessage, completeMessage, failMessage, thresholdMilliseconds)
-                : null;
-        }
-
-        #region ILogger
-
-        public bool IsEnabled(Type reporting, LogLevel level)
-            => Logger.IsEnabled(reporting, level);
-
-        public void Fatal(Type reporting, Exception exception, string message)
-            => Logger.Fatal(reporting, exception, message);
-
-        public void Fatal(Type reporting, Exception exception)
-            => Logger.Fatal(reporting, exception);
-
-        public void Fatal(Type reporting, string message)
-            => Logger.Fatal(reporting, message);
-
-        public void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
-            => Logger.Fatal(reporting, exception, messageTemplate, propertyValues);
-
-        public void Fatal(Type reporting, string messageTemplate, params object[] propertyValues)
-            => Logger.Fatal(reporting, messageTemplate, propertyValues);
-
-        public void Error(Type reporting, Exception exception, string message)
-            => Logger.Error(reporting, exception, message);
-
-        public void Error(Type reporting, Exception exception)
-            => Logger.Error(reporting, exception);
-
-        public void Error(Type reporting, string message)
-            => Logger.Error(reporting, message);
-
-        public void Error(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
-            => Logger.Error(reporting, exception, messageTemplate, propertyValues);
-
-        public void Error(Type reporting, string messageTemplate, params object[] propertyValues)
-            => Logger.Error(reporting, messageTemplate, propertyValues);
-
-        public void Warn(Type reporting, string message)
-            => Logger.Warn(reporting, message);
-
-        public void Warn(Type reporting, string messageTemplate, params object[] propertyValues)
-            => Logger.Warn(reporting, messageTemplate, propertyValues);
-
-        public void Warn(Type reporting, Exception exception, string message)
-            => Logger.Warn(reporting, exception, message);
-
-        public void Warn(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
-            => Logger.Warn(reporting, exception, messageTemplate, propertyValues);
-
-        public void Info(Type reporting, string message)
-            => Logger.Info(reporting, message);
-
-        public void Info(Type reporting, string messageTemplate, params object[] propertyValues)
-            => Logger.Info(reporting, messageTemplate, propertyValues);
-
-        public void Debug(Type reporting, string message)
-            => Logger.Debug(reporting, message);
-
-        public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
-            => Logger.Debug(reporting, messageTemplate, propertyValues);
-
-        public void Verbose(Type reporting, string message)
-            => Logger.Verbose(reporting, message);
-
-        public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
-            => Logger.Verbose(reporting, messageTemplate, propertyValues);
-
-        #endregion
-    }
-}
@@ -1,25 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Media
-{
-    public interface IEmbedProvider
-    {
-        /// <summary>
-        /// The OEmbed API Endpoint
-        /// </summary>
-        string ApiEndpoint { get; }
-
-        /// <summary>
-        /// A string array of Regex patterns to match against the pasted OEmbed URL
-        /// </summary>
-        string[] UrlSchemeRegex { get; }
-
-        /// <summary>
-        /// A collection of querystring request parameters to append to the API Url
-        /// </summary>
-        /// <example>?key=value&key2=value2</example>
-        Dictionary<string, string> RequestParams { get; }
-
-        string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0);
-    }
-}
@@ -1,9 +0,0 @@
-namespace Umbraco.Core.Media
-{
-    public class OEmbedResult
-    {
-        public OEmbedStatus OEmbedStatus { get; set; }
-        public bool SupportsDimensions { get; set; }
-        public string Markup { get; set; }
-    }
-}
@@ -1,9 +0,0 @@
-namespace Umbraco.Core.Media
-{
-    public enum OEmbedStatus
-    {
-        NotSupported,
-        Error,
-        Success
-    }
-}
@@ -1,78 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-using Umbraco.Core.Models.Entities;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Represents an audited event.
-    /// </summary>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    public class AuditEntry : EntityBase, IAuditEntry
-    {
-        private int _performingUserId;
-        private string _performingDetails;
-        private string _performingIp;
-        private int _affectedUserId;
-        private string _affectedDetails;
-        private string _eventType;
-        private string _eventDetails;
-
-        /// <inheritdoc />
-        public int PerformingUserId
-        {
-            get => _performingUserId;
-            set => SetPropertyValueAndDetectChanges(value, ref _performingUserId, nameof(PerformingUserId));
-        }
-
-        /// <inheritdoc />
-        public string PerformingDetails
-        {
-            get => _performingDetails;
-            set => SetPropertyValueAndDetectChanges(value, ref _performingDetails, nameof(PerformingDetails));
-        }
-
-        /// <inheritdoc />
-        public string PerformingIp
-        {
-            get => _performingIp;
-            set => SetPropertyValueAndDetectChanges(value, ref _performingIp, nameof(PerformingIp));
-        }
-
-        /// <inheritdoc />
-        public DateTime EventDateUtc
-        {
-            get => CreateDate;
-            set => CreateDate = value;
-        }
-
-        /// <inheritdoc />
-        public int AffectedUserId
-        {
-            get => _affectedUserId;
-            set => SetPropertyValueAndDetectChanges(value, ref _affectedUserId, nameof(AffectedUserId));
-        }
-
-        /// <inheritdoc />
-        public string AffectedDetails
-        {
-            get => _affectedDetails;
-            set => SetPropertyValueAndDetectChanges(value, ref _affectedDetails, nameof(AffectedDetails));
-        }
-
-        /// <inheritdoc />
-        public string EventType
-        {
-            get => _eventType;
-            set => SetPropertyValueAndDetectChanges(value, ref _eventType, nameof(EventType));
-        }
-
-        /// <inheritdoc />
-        public string EventDetails
-        {
-            get => _eventDetails;
-            set => SetPropertyValueAndDetectChanges(value, ref _eventDetails, nameof(EventDetails));
-        }
-    }
-}
@@ -1,39 +0,0 @@
-using Umbraco.Core.Models.Entities;
-
-namespace Umbraco.Core.Models
-{
-    public sealed class AuditItem : EntityBase, IAuditItem
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuditItem"/> class.
-        /// </summary>
-        public AuditItem(int objectId, AuditType type, int userId, string entityType, string comment = null, string parameters = null)
-        {
-            DisableChangeTracking();
-
-            Id = objectId;
-            Comment = comment;
-            AuditType = type;
-            UserId = userId;
-            EntityType = entityType;
-            Parameters = parameters;
-
-            EnableChangeTracking();
-        }
-
-        /// <inheritdoc/>
-        public AuditType AuditType { get; }
-
-        /// <inheritdoc/>
-        public string EntityType { get; }
-
-        /// <inheritdoc/>
-        public int UserId { get; }
-
-        /// <inheritdoc/>
-        public string Comment { get; }
-
-        /// <inheritdoc/>
-        public string Parameters { get; }
-    }
-}
@@ -1,118 +0,0 @@
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Defines audit types.
-    /// </summary>
-    public enum AuditType
-    {
-        /// <summary>
-        /// New node(s) being added.
-        /// </summary>
-        New,
-
-        /// <summary>
-        /// Node(s) being saved.
-        /// </summary>
-        Save,
-
-        /// <summary>
-        /// Variant(s) being saved.
-        /// </summary>
-        SaveVariant,
-
-        /// <summary>
-        /// Node(s) being opened.
-        /// </summary>
-        Open,
-
-        /// <summary>
-        /// Node(s) being deleted.
-        /// </summary>
-        Delete,
-
-        /// <summary>
-        /// Node(s) being published.
-        /// </summary>
-        Publish,
-
-        /// <summary>
-        /// Variant(s) being published.
-        /// </summary>
-        PublishVariant,
-
-        /// <summary>
-        /// Node(s) being sent to publishing.
-        /// </summary>
-        SendToPublish,
-
-        /// <summary>
-        /// Variant(s) being sent to publishing.
-        /// </summary>        
-        SendToPublishVariant,
-
-        /// <summary>
-        /// Node(s) being unpublished.
-        /// </summary>
-        Unpublish,
-
-        /// <summary>
-        /// Variant(s) being unpublished.
-        /// </summary>
-        UnpublishVariant,
-
-        /// <summary>
-        /// Node(s) being moved.
-        /// </summary>
-        Move,
-
-        /// <summary>
-        /// Node(s) being copied.
-        /// </summary>
-        Copy,
-
-        /// <summary>
-        /// Node(s) being assigned domains.
-        /// </summary>
-        AssignDomain,
-
-        /// <summary>
-        /// Node(s) public access changing.
-        /// </summary>
-        PublicAccess,
-
-        /// <summary>
-        /// Node(s) being sorted.
-        /// </summary>
-        Sort,
-
-        /// <summary>
-        /// Notification(s) being sent to user.
-        /// </summary>
-        Notify,
-
-        /// <summary>
-        /// General system audit message.
-        /// </summary>
-        System,
-
-        /// <summary>
-        /// Node's content being rolled back to a previous version.
-        /// </summary>
-        RollBack,
-
-        /// <summary>
-        /// Package being installed.
-        /// </summary>
-        PackagerInstall,
-
-        /// <summary>
-        /// Package being uninstalled.
-        /// </summary>
-        PackagerUninstall,
-        
-        /// <summary>
-        /// Custom audit message.
-        /// </summary>
-        Custom
-    }
-}
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using Umbraco.Core.Models.Entities;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Represents a consent.
-    /// </summary>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    public class Consent : EntityBase, IConsent
-    {
-        private bool _current;
-        private string _source;
-        private string _context;
-        private string _action;
-        private ConsentState _state;
-        private string _comment;
-
-        /// <inheritdoc />
-        public bool Current
-        {
-            get => _current;
-            set => SetPropertyValueAndDetectChanges(value, ref _current, nameof(Current));
-        }
-
-        /// <inheritdoc />
-        public string Source
-        {
-            get => _source;
-            set
-            {
-                if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException(nameof(value));
-                SetPropertyValueAndDetectChanges(value, ref _source, nameof(Source));
-            }
-        }
-
-        /// <inheritdoc />
-        public string Context
-        {
-            get => _context;
-            set
-            {
-                if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException(nameof(value));
-                SetPropertyValueAndDetectChanges(value, ref _context, nameof(Context));
-            }
-        }
-
-        /// <inheritdoc />
-        public string Action
-        {
-            get => _action;
-            set
-            {
-                if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException(nameof(value));
-                SetPropertyValueAndDetectChanges(value, ref _action, nameof(Action));
-            }
-        }
-
-        /// <inheritdoc />
-        public ConsentState State
-        {
-            get => _state;
-            // note: we probably should validate the state here, but since the
-            //  enum is [Flags] with many combinations, this could be expensive
-            set => SetPropertyValueAndDetectChanges(value, ref _state, nameof(State));
-        }
-
-        /// <inheritdoc />
-        public string Comment
-        {
-            get => _comment;
-            set => SetPropertyValueAndDetectChanges(value, ref _comment, nameof(Comment));
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<IConsent> History => HistoryInternal;
-
-        /// <summary>
-        /// Gets the previous states of this consent.
-        /// </summary>
-        public List<IConsent> HistoryInternal { get; set; }
-    }
-}
@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.Models.Entities;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// The name of a content variant for a given culture
-    /// </summary>
-    public class ContentCultureInfos : BeingDirtyBase, IDeepCloneable, IEquatable<ContentCultureInfos>
-    {
-        private DateTime _date;
-        private string _name;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContentCultureInfos"/> class.
-        /// </summary>
-        public ContentCultureInfos(string culture)
-        {
-            if (culture.IsNullOrWhiteSpace()) throw new ArgumentNullOrEmptyException(nameof(culture));
-            Culture = culture;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContentCultureInfos"/> class.
-        /// </summary>
-        /// <remarks>Used for cloning, without change tracking.</remarks>
-        internal ContentCultureInfos(ContentCultureInfos other)
-            : this(other.Culture)
-        {
-            _name = other.Name;
-            _date = other.Date;
-        }
-
-        /// <summary>
-        /// Gets the culture.
-        /// </summary>
-        public string Culture { get; }
-
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        public string Name
-        {
-            get => _name;
-            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
-        }
-
-        /// <summary>
-        /// Gets the date.
-        /// </summary>
-        public DateTime Date
-        {
-            get => _date;
-            set => SetPropertyValueAndDetectChanges(value, ref _date, nameof(Date));
-        }
-
-        /// <inheritdoc />
-        public object DeepClone()
-        {
-            return new ContentCultureInfos(this);
-        }
-
-        /// <inheritdoc />
-        public override bool Equals(object obj)
-        {
-            return obj is ContentCultureInfos other && Equals(other);
-        }
-
-        /// <inheritdoc />
-        public bool Equals(ContentCultureInfos other)
-        {
-            return other != null && Culture == other.Culture && Name == other.Name;
-        }
-
-        /// <inheritdoc />
-        public override int GetHashCode()
-        {
-            var hashCode = 479558943;
-            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Culture);
-            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);
-            return hashCode;
-        }
-
-        /// <summary>
-        /// Deconstructs into culture and name.
-        /// </summary>
-        public void Deconstruct(out string culture, out string name)
-        {
-            culture = Culture;
-            name = Name;
-        }
-
-        /// <summary>
-        /// Deconstructs into culture, name and date.
-        /// </summary>
-        public void Deconstruct(out string culture, out string name, out DateTime date)
-        {
-            Deconstruct(out culture, out name);
-            date = Date;
-        }
-    }
-}
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using Umbraco.Core.Collections;
-using Umbraco.Core.Exceptions;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// The culture names of a content's variants
-    /// </summary>
-    public class ContentCultureInfosCollection : ObservableDictionary<string, ContentCultureInfos>, IDeepCloneable
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContentCultureInfosCollection"/> class.
-        /// </summary>
-        public ContentCultureInfosCollection()
-            : base(x => x.Culture, StringComparer.InvariantCultureIgnoreCase)
-        { }
-
-        /// <summary>
-        /// Adds or updates a <see cref="ContentCultureInfos"/> instance.
-        /// </summary>
-        public void AddOrUpdate(string culture, string name, DateTime date)
-        {
-            if (culture.IsNullOrWhiteSpace()) throw new ArgumentNullOrEmptyException(nameof(culture));
-            culture = culture.ToLowerInvariant();
-
-            if (TryGetValue(culture, out var item))
-            {
-                item.Name = name;
-                item.Date = date;
-                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, item, item));
-            }
-            else
-            {
-                Add(new ContentCultureInfos(culture)
-                {
-                    Name = name,
-                    Date = date
-                });
-            }
-        }
-
-        /// <inheritdoc />
-        public object DeepClone()
-        {
-            var clone = new ContentCultureInfosCollection();
-
-            foreach (var item in this)
-            {
-                var itemClone = (ContentCultureInfos) item.DeepClone();
-                itemClone.ResetDirtyProperties(false);
-                clone.Add(itemClone);
-            }
-
-            return clone;
-        }
-    }
-}
@@ -1,72 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Models.ContentEditing
-{
-    /// <summary>
-    /// Represents a content app.
-    /// </summary>
-    /// <remarks>
-    /// <para>Content apps are editor extensions.</para>
-    /// </remarks>
-    [DataContract(Name = "app", Namespace = "")]
-    public class ContentApp
-    {
-        /// <summary>
-        /// Gets the name of the content app.
-        /// </summary>
-        [DataMember(Name = "name")]
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Gets the unique alias of the content app.
-        /// </summary>
-        /// <remarks>
-        /// <para>Must be a valid javascript identifier, ie no spaces etc.</para>
-        /// </remarks>
-        [DataMember(Name = "alias")]
-        public string Alias { get; set; }
-
-        /// <summary>
-        /// Gets or sets the weight of the content app.
-        /// </summary>
-        /// <remarks>
-        /// <para>Content apps are ordered by weight, from left (lowest values) to right (highest values).</para>
-        /// <para>Some built-in apps have special weights: listview is -666, content is -100 and infos is +100.</para>
-        /// <para>The default weight is 0, meaning somewhere in-between content and infos, but weight could
-        /// be used for ordering between user-level apps, or anything really.</para>
-        /// </remarks>
-        [DataMember(Name = "weight")]
-        public int Weight { get; set; }
-
-        /// <summary>
-        /// Gets the icon of the content app.
-        /// </summary>
-        /// <remarks>
-        /// <para>Must be a valid helveticons class name (see http://hlvticons.ch/).</para>
-        /// </remarks>
-        [DataMember(Name = "icon")]
-        public string Icon { get; set; }
-
-        /// <summary>
-        /// Gets the view for rendering the content app.
-        /// </summary>
-        [DataMember(Name = "view")]
-        public string View { get; set; }
-
-        /// <summary>
-        /// The view model specific to this app
-        /// </summary>
-        [DataMember(Name = "viewModel")]
-        public object ViewModel { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the app is active.
-        /// </summary>
-        /// <remarks>
-        /// <para>Normally reserved for Angular to deal with but in some cases this can be set on the server side.</para>
-        /// </remarks>
-        [DataMember(Name = "active")]
-        public bool Active { get; set; }
-    }
-}
-
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using Umbraco.Core.Models.Membership;
-
-namespace Umbraco.Core.Models.ContentEditing
-{
-    /// <summary>
-    /// Represents a content app factory.
-    /// </summary>
-    public interface IContentAppFactory
-    {
-        /// <summary>
-        /// Gets the content app for an object.
-        /// </summary>
-        /// <param name="source">The source object.</param>
-        /// <returns>The content app for the object, or null.</returns>
-        /// <remarks>
-        /// <para>The definition must determine, based on <paramref name="source"/>, whether
-        /// the content app should be displayed or not, and return either a <see cref="ContentApp"/>
-        /// instance, or null.</para>
-        /// </remarks>
-        ContentApp GetContentAppFor(object source, IEnumerable<IReadOnlyUserGroup> userGroups);
-    }
-}
@@ -1,46 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Describes the states of a document, with regard to (schedule) publishing.
-    /// </summary>
-    [Serializable]
-    [DataContract]
-    public enum ContentStatus
-    {
-        // typical flow:
-        // Unpublished (add release date)-> AwaitingRelease (release)-> Published (expire)-> Expired
-
-        /// <summary>
-        /// The document is not trashed, and not published. 
-        /// </summary>
-        [EnumMember]
-        Unpublished,
-
-        /// <summary>
-        /// The document is published.
-        /// </summary>
-        [EnumMember]
-        Published,
-
-        /// <summary>
-        /// The document is not trashed, not published, after being unpublished by a scheduled action.
-        /// </summary>
-        [EnumMember]
-        Expired,
-
-        /// <summary>
-        /// The document is trashed.
-        /// </summary>
-        [EnumMember]
-        Trashed,
-
-        /// <summary>
-        /// The document is not trashed, not published, and pending publication by a scheduled action.
-        /// </summary>
-        [EnumMember]
-        AwaitingRelease
-    }
-}
@@ -1,37 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Indicates how values can vary.
-    /// </summary>
-    /// <remarks>
-    /// <para>Values can vary by nothing, or culture, or segment, or both.</para>
-    /// <para>Varying by culture implies that each culture version of a document can
-    /// be available or not, and published or not, individually. Varying by segment
-    /// is a property-level thing.</para>
-    /// </remarks>
-    [Flags]
-    public enum ContentVariation : byte
-    {
-        /// <summary>
-        /// Values do not vary.
-        /// </summary>
-        Nothing = 0,
-
-        /// <summary>
-        /// Values vary by culture.
-        /// </summary>
-        Culture = 1,
-
-        /// <summary>
-        /// Values vary by segment.
-        /// </summary>
-        Segment = 2,
-
-        /// <summary>
-        /// Values vary by culture and segment.
-        /// </summary>
-        CultureAndSegment = Culture | Segment
-    }
-}
--- 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