Reload the node when publishing all unpublished children

* Make the focus effect on the toggle use the same box-shadow as is already being used in the color picker instead of doing it differently

* Use the color variables instead of hard coded color and also make use of LESS' fade function outputting an rgba() color

.editorconfig

@@ -1,10 +1,16 @@
-root=true
+# editorconfig.org
 
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
 [*]
-end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace = true
 
-[*.{cs,cshtml,csx,vb,vbx,vbhtml,fs,fsx,txt,ps1,sql}]
-indent_size = 4
+# Trim trailing whitespace, limited support.
+# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
+trim_trailing_whitespace = true

.gitattributes

@@ -0,0 +1,49 @@
+*.doc  diff=astextplain
+*.DOC	diff=astextplain
+*.docx	diff=astextplain
+*.DOCX	diff=astextplain
+*.dot	diff=astextplain
+*.DOT	diff=astextplain
+*.pdf	diff=astextplain
+*.PDF	diff=astextplain
+*.rtf	diff=astextplain
+*.RTF	diff=astextplain
+
+*.jpg  	binary
+*.png 	binary
+*.gif 	binary
+
+*.cs text=auto diff=csharp 
+*.vb text=auto
+*.c text=auto
+*.cpp text=auto
+*.cxx text=auto
+*.h text=auto
+*.hxx text=auto
+*.py text=auto
+*.rb text=auto
+*.java text=auto
+*.html text=auto
+*.htm text=auto
+*.css text=auto
+*.scss text=auto
+*.sass text=auto
+*.less text=auto
+*.js text=auto
+*.lisp text=auto
+*.clj text=auto
+*.sql text=auto
+*.php text=auto
+*.lua text=auto
+*.m text=auto
+*.asm text=auto
+*.erl text=auto
+*.fs text=auto
+*.fsx text=auto
+*.hs text=auto
+
+*.csproj text=auto merge=union 
+*.vbproj text=auto merge=union 
+*.fsproj text=auto merge=union 
+*.dbproj text=auto merge=union 
+*.sln text=auto eol=crlf merge=union 

.github/BUILD.md

@@ -14,6 +14,43 @@ By default, this builds the current version. It is possible to specify a differe
 
 Valid version strings are defined in the `Set-UmbracoVersion` documentation below.
 
+## PowerShell Quirks
+
+There is a good chance that running `build.ps1` ends up in error, with messages such as
+
+>The file ...\build\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`—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\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
+
 ## Notes
 
 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).

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,32 @@
+# 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.

.github/CONTRIBUTING.md

@@ -0,0 +1,99 @@
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/docs/CONTRIBUTING.md) to go to the v8 branch_
+# Contributing to Umbraco CMS
+
+👍🎉 First off, thanks for taking the time to contribute! 🎉👍
+
+The following is a set of guidelines for contributing to Umbraco CMS.
+
+These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+
+Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
+
+## Contributing code changes
+
+This document gives you a quick overview on how to get started, we will link to in-depth documentation throughout if you need some more background info.
+
+
+## Guidelines for contributions we welcome
+
+Not all changes are wanted so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valueable time.
+
+We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md), make sure to talk to us before making large changes.
+
+Remember, if an issue is in the `Up for grabs` list or you've asked for some feedback before you sent us a PR, your PR will not be closed as unwanted.
+
+## How do I begin?
+
+Great question! The short version goes like this:
+
+  * **Fork** - create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
+
+  ![Fork the repository](img/forkrepository.png)
+
+  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
+  
+  ![Clone the fork](img/clonefork.png)
+
+  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
+  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
+  * **Commit** - done? Yay! 🎉 It is recommended to create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-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](img/createpullrequest.png)
+
+### Further reading
+
+At this point you might want to [read on about contributing in depth](CONTRIBUTING_DETAILED.md). 
+
+### Reviews
+
+You've sent us your first contribution, congratulations! Now what?
+
+The [pull request team](#the-pr-team) can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request you to make some additional changes.
+
+We have [a process in place which you can read all about](REVIEW_PROCESS.md). The very abbreviated version is:
+
+- Your PR will get a reply within 48 hours
+- An in-depth reply will be added within at most 2 weeks
+- The PR will be either merged or rejected within at most 4 weeks
+- Sometimes it is difficult to meet these timelines and we'll talk to you
+
+## Styleguides
+
+To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
+
+That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
+
+## The PR team
+
+The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members
+
+- [Anders Bjerner](https://github.com/abjerner)
+- [Dave Woestenborghs](https://github.com/dawoe)
+- [Emma Burstow](https://github.com/emmaburstow)
+- [Kyle Weems](https://github.com/cssquirrel)
+- [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
+- We're also [active in the Gitter chatroom](https://gitter.im/umbraco/Umbraco-CMS)
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the [our Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [Sebastiaan Janssen - sj@umbraco.dk](mailto:sj@umbraco.dk).
+
+
+## Contributing to Umbraco, in depth
+
+There are other ways to contribute, and there's a few more things that you might be wondering about. We will answer the [most common questions and ways to contribute in our detailed documentation](CONTRIBUTING_DETAILED.md).
+
+## Credits
+
+This contribution guide borrows heavily from the excellent work on [the Atom contribution guide](https://github.com/atom/atom/blob/master/CONTRIBUTING.md). A big [#h5yr](http://h5yr.com/) to them!

.github/CONTRIBUTING_DETAILED.md

@@ -0,0 +1,159 @@
+# Contributing in detail
+
+There's more than one way to contribute to Umbraco, there's some more suggestions below.
+
+When contributing code to Umbraco there's plenty of things you'll want to know, skip down to [What should I know before I get started](#what-should-i-know-before-i-get-started) for the answers to your burning questions.
+
+#### Table Of Contents
+
+[How Can I Contribute?](#how-can-i-contribute)
+  * [Reporting Bugs](#reporting-bugs)
+  * [Suggesting Enhancements](#suggesting-enhancements)
+  * [Your First Code Contribution](#your-first-code-contribution)
+  * [Pull Requests](#pull-requests)
+
+[Styleguides](#styleguides)
+
+[What should I know before I get started?](#what-should-i-know-before-i-get-started)
+  * [Working with the source code](#working-with-the-source-code)
+  * [What branch should I target for my contributions?](#what-branch-should-i-target-for-my-contributions)
+  * [Building Umbraco from source code](#building-umbraco-from-source-code)
+  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
+  
+## How Can I Contribute?
+
+### Reporting Bugs
+This section guides you through submitting a bug report for Umbraco CMS. Following these guidelines helps maintainers and the community understand your report 📝, reproduce the behavior 💻 💻, and find related reports 🔎.
+
+Before creating bug reports, please check [this list](#before-submitting-a-bug-report) as you might find out that you don't need to create one. When you are creating a bug report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](http://issues.umbraco.org/issues#newissue=61-30118), the information it asks for helps us resolve issues faster.
+
+> **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
+
+##### Before Submitting A Bug Report
+
+  * Most importantly, check **if you can reproduce the problem** in the [latest version of Umbraco](https://our.umbraco.com/download/). We might have already fixed your particular problem.
+  * It also helps tremendously to check if the issue you're experiencing is present in **a clean install** of the Umbraco version you're currently using. Custom code can have side-effects that don't occur in a clean install.
+  * **Use the Google**. Whatever you're experiencing, Google it plus "Umbraco" - usually you can get some pretty good hints from the search results, including open issues and further troubleshooting hints.
+  * If you do find and existing issue has **and the issue is still open**, add a comment to the existing issue if you have additional information. If you have the same problem and no new info to add, just "star" the issue.
+
+Explain the problem and include additional details to help maintainers reproduce the problem. The following is a long description which we've boiled down into a few very simple questions in the issue tracker when you create a new issue. We're listing the following hints to indicate that the most successful reports usually have a lot of this ground covered:
+
+  * **Use a clear and descriptive title** for the issue to identify the problem.
+  * **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining which steps you took in the backoffice to get to a certain undesireable result, e.g. you created a document type, inherting 3 levels deep, added a certain datatype, tried to save it and you got an error.
+  * **Provide specific examples to demonstrate the steps**. If you wrote some code, try to provide a code sample as specific as possible to be able to reproduce the behavior.
+  * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
+  * **Explain which behavior you expected to see instead and why.**
+
+Provide more context by answering these questions:
+
+  * **Can you reproduce the problem** when `debug="false"` in your `web.config` file?
+  * **Did the problem start happening recently** (e.g. after updating to a new version of Umbraco) or was this always a problem?
+  * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
+
+Include details about your configuration and environment:
+
+  * **Which version of Umbraco are you using?** 
+  * **What is the environment you're using Umbraco in?** Is this a problem on your local machine or on a server. Tell us about your configuration: Windows version, IIS/IISExpress, database type, etc.
+  * **Which packages do you have installed?**
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for Umbraco, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion 📝 and find related suggestions 🔎.
+
+Most of the suggestions in the [reporting bugs](#reporting-bugs) section also count for suggesting enhancements.
+
+Some additional hints that may be helpful:
+
+  * **Include screenshots and animated GIFs** which help you demonstrate the steps or point out the part of Umbraco which the suggestion is related to.
+  * **Explain why this enhancement would be useful to most Umbraco users** and isn't something that can or should be implemented as a [community package](https://our.umbraco.com/projects/).
+
+### Your First Code Contribution
+
+Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` and issues](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.com/documentation/Reference/) is generated
+
+Again, these are guidelines, not strict requirements. 
+
+## Making changes after the PR was opened
+
+If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
+
+## Styleguides
+
+To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
+
+That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc. 
+
+## What should I know before I get started?
+
+### Working with the source code
+
+Some parts of our source code is over 10 years old now. And when we say "old", we mean "mature" of course!
+
+There's two big areas that you should know about:
+
+  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
+  You may need to run the following commands to set up gulp properly:
+  ```
+  npm cache clean
+  npm install -g 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.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
+  * [The rest](https://our.umbraco.com/apidocs/csharp/)
+
+### What branch should I target for my contributions?
+
+We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `dev-v7`. Whatever the default is, that's where we'd like you to target your contributions.
+
+![What branch do you want me to target?](img/defaultbranch.png)
+
+### Building Umbraco from source code
+
+The easiest way to get started is to run `build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.
+
+Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.3 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
+
+![Gulp build in Visual Studio](img/gulpbuild.png)
+
+After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser, follow the directions there to get a working Umbraco install up and running.
+
+### Keeping your Umbraco fork in sync with the main repository
+
+We recommend you sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
+
+Also, if you've submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
+
+To sync your fork with this original one, you'll have to add the upstream url, you only have to do this once:
+
+```
+git remote add upstream https://github.com/umbraco/Umbraco-CMS.git
+```
+
+Then when you want to get the changes from the main repository:
+
+```
+git fetch upstream
+git rebase upstream/dev-v7
+```
+
+In this command we're syncing with the `dev-v7` branch, but you can of course choose another one if needed.
+
+(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))

.github/CONTRIBUTION_GUIDELINES.md

@@ -0,0 +1,33 @@
+# Contributing to Umbraco CMS
+
+When you’re considering creating a pull request for Umbraco CMS, we will categorize them in two different sizes, small and large.
+
+The process for both sizes is very similar, as [explained in the contribution document](CONTRIBUTING.md#how-do-i-begin).
+
+## Small PRs
+Bug fixes and small improvements - can be recognized by seeing a small number of changes and possibly a small number of new files.
+
+We’re usually able to handle small PRs pretty quickly. A community volunteer will do the initial review and flag it for Umbraco HQ as “community tested”. If everything looks good, it will be merged pretty quickly [as per the described process](REVIEW_PROCESS.md).
+
+### Up for grabs
+
+Umbraco HQ will regularly mark newly created issues on the issue tracker with the `Up for grabs` tag. This means that the proposed changes are wanted in Umbraco but the HQ does not have the time to make them at this time. These issues are usually small enough to fit in the "Small PRs" category and we encourage anyone to pick them up and help out.  
+
+If you do start working on something, make sure leave a small comment on the issue saying something like: "I'm working on this". That way other people stumbling upon the issue know they don't need to pick it up, someone already has.
+
+## Large PRs
+New features and large refactorings - can be recognized by seeing a large number of changes, plenty of new files, updates to package manager files (NuGet’s packages.config, NPM’s packages.json, etc.).  
+
+We would love to follow the same process for larger PRs but this is not always possible due to time limitations and priorities that need to be aligned. We don’t want to put up any barriers, but this document should set the correct expectations.  
+
+Please make sure to describe your idea in an issue, it helps to put in mockup screenshots or videos.  
+
+If the change makes sense for HQ to include in Umbraco CMS we will leave you some feedback on how we’d like to see it being implemented. 
+
+If a larger pull request is encouraged by Umbraco HQ, the process will be similar to what is described in the [small PRs process](#small-prs) above, we’ll get feedback to you within 14 days. Finalizing and merging the PR might take longer though as it will likely need to be picked up by the development team to make sure everything is in order. We’ll keep you posted on the progress.
+
+### Pull request or package?
+
+If it doesn’t fit in CMS right now, we will likely encourage you to make it into a package instead. A package is a great way to check out popularity of a feature, learn how people use it, validate good usability and to fix bugs.  
+
+Eventually, a package could "graduate" to be included in the CMS.  

.github/ISSUE_TEMPLATE/1_Bug.md

@@ -0,0 +1,66 @@
+---
+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.
+-->

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -0,0 +1,31 @@
+---
+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.
+-->

.github/ISSUE_TEMPLATE/3_Support_question.md

@@ -0,0 +1,9 @@
+---
+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!

.github/ISSUE_TEMPLATE/4_Documentation_issue.md

@@ -0,0 +1,9 @@
+---
+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!

.github/ISSUE_TEMPLATE/5_Security_issue.md

@@ -0,0 +1,31 @@
+---
+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!

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+### Prerequisites
+
+- [ ] I have [created an issue](https://github.com/umbraco/Umbraco-CMS/issues) for the proposed changes in this PR, the link is:
+- [ ] I have added steps to test this contribution in the description below
+
+### Description
+<!-- A description of the changes proposed in the pull-request -->
+<!-- Make sure to link to the related issue number so we can easily find it in the issue tracker -->
+
+
+<!-- Thanks for contributing to Umbraco CMS! -->

.github/README.md

@@ -0,0 +1,50 @@
+[![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7)
+
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/tree/temp8) to go to the v8 branch_
+
+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](img/vimeo.png)](https://vimeo.com/172382998/)
+
+## Umbraco CMS
+Umbraco is a free open source Content Management System built on the ASP.NET platform. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
+
+## Watch an introduction video
+
+[![ScreenShot](https://shop.umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
+
+## Umbraco - The Friendly CMS
+
+For the first time on the Microsoft platform, there is a free user and developer friendly CMS that makes it quick and easy to create websites - 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/case-studies-testimonials/](https://umbraco.com/case-studies-testimonials/)
+
+## Why Open Source?
+As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible and community contributions and packages are available for all to use.
+
+## Trying out Umbraco CMS
+
+[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet with full support for all your custom .NET code and 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.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 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.com). 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://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md).
+
+You can comment and report issues on the [github issue tracker](https://github.com/umbraco/Umbraco-CMS/issues).
+Since [September 2018](https://umbraco.com/blog/a-second-take-on-umbraco-issue-tracker-hello-github-issues/) the old issue tracker is in read only mode, but can still be found at [http://issues.umbraco.org](http://issues.umbraco.org).

.github/REVIEW_PROCESS.md

@@ -0,0 +1,25 @@
+# Review process
+
+You're an awesome person and have sent us your contribution in the form of a pull request! It's now time to relax for a bit and wait for our response. 
+
+In order to set some expectations, here's what happens next.
+
+## Review process
+
+You will get an initial reply within 48 hours (workdays) to acknowledge that we’ve seen your PR and we’ll pick it up as soon as we can.
+
+You will get feedback within at most 14 days after opening the PR. You’ll most likely get feedback sooner though. Then there are a few possible outcomes:
+
+- Your proposed change is awesome! We merge it in and it will be included in the next minor release of Umbraco
+- If the change is a high priority bug fix, we will cherry-pick it into the next patch release as well so that we can release it as soon as possible
+- Your proposed change is awesome but needs a bit more work, we’ll give you feedback on the changes we’d like to see
+- Your proposed change is awesome but.. not something we’re looking to include at this point. We’ll close your PR and the related issue (we’ll be nice about it!)
+
+## Are you still available?
+
+We understand you have other things to do and can't just drop everything to help us out.   
+So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.  
+
+If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.  
+
+There will be times that we really like your proposed changes and we’ll finish the final improvements we’d like to see ourselves. You still get the credits and your commits will live on in the git repository.

.gitignore

@@ -113,6 +113,7 @@ 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 output of generated documentation files from Grunt docserve
 src/Umbraco.Web.UI.Client/docs/api
@@ -139,4 +140,5 @@ src/PrecompiledWeb/*
 
 build.out/
 build.tmp/
-build/Modules/*/temp/
+build/Modules/*/temp/
+/src/.idea/*

LICENSE.md

@@ -1,6 +1,6 @@
 # The MIT License (MIT) #
 
-Copyright (c) 2013 Umbraco
+Copyright (c) 2013-present 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:
 

README.md

@@ -1,52 +0,0 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7)
-
-Umbraco CMS
-===========
-The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 390,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
-
-[![ScreenShot](vimeo.png)](https://vimeo.com/172382998/)
-
-## Umbraco CMS ##
-Umbraco is a free open source Content Management System built on the ASP.NET platform. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
-
-
-## Building Umbraco from source ##
-
-The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`.
-
-Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
-
-## Watch an introduction video ##
-
-[![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 350,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 200,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
-
-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.
-
-## Downloading ##
-
-The downloadable Umbraco releases live at [https://our.umbraco.org/download](https://our.umbraco.org/download).
-
-## Forums ##
-
-Peer-to-peer support is available 24/7 at the community forum on [https://our.umbraco.org](https://our.umbraco.org). 
-
-## Contribute to Umbraco ##
-
-Umbraco is contribution focused and community driven. If you want to contribute back to Umbraco please check out our [guide to contributing](https://our.umbraco.org/contribute).
-
-## 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).

apidocs/toc.yml

@@ -1,5 +1,5 @@
 
 - name: Umbraco.Core Documentation
-  href: https://our.umbraco.org/apidocs/csharp/api/Umbraco.Core.html
+  href: https://our.umbraco.com/apidocs/csharp/api/Umbraco.Core.html
 - name: Umbraco.Web Documentation
-  href: https://our.umbraco.org/apidocs/csharp/api/Umbraco.Web.html
+  href: https://our.umbraco.com/apidocs/csharp/api/Umbraco.Web.html

apidocs/umbracotemplate/partials/head.tmpl.partial

@@ -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.org/assets/images/app-icons/favicon.png">
+  <link rel="icon" type="image/png" href="https://our.umbraco.com/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">

apidocs/umbracotemplate/styles/main.css

@@ -63,7 +63,7 @@ a:focus {
 }
 
 .navbar-header .navbar-brand {
-    background: url(https://our.umbraco.org/assets/images/logo.svg) left center no-repeat;
+    background: url(https://our.umbraco.com/assets/images/logo.svg) left center no-repeat;
     background-size: 40px auto;
     width:50px;
 }

build.bat

@@ -10,6 +10,5 @@ IF ERRORLEVEL 1 (
 :error
 ECHO.
 ECHO Can not run build\build.ps1.
-ECHO If this is due to a SecurityError then make sure to run the following command from an administrator command prompt:
+ECHO If this is due to a SecurityError then please refer to BUILD.md for help!
 ECHO.
-ECHO powershell Set-ExecutionPolicy -ExecutionPolicy RemoteSigned

build/InstallGit.cmd

@@ -1,63 +0,0 @@
-@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"

build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1

@@ -42,9 +42,9 @@ function Build-UmbracoDocs
   #get-content .\build.tmp\belle-docs.log | %{ if ($_ -match "build") { write $_}}
   
   # change baseUrl
-  $baseUrl = "https://our.umbraco.org/apidocs/ui/"
+  $baseUrl = "https://our.umbraco.com/apidocs/ui/"
   $indexPath = "$src/Umbraco.Web.UI.Client/docs/api/index.html"
-  (Get-Content $indexPath).Replace("location.href.replace(rUrl, indexFile)", "'$baseUrl'") `
+  (Get-Content $indexPath).Replace("origin + location.href.substr(origin.length).replace(rUrl, indexFile)", "'$baseUrl'") `
     | Set-Content $indexPath
     
   # restore
@@ -100,8 +100,9 @@ function Get-DocFx($uenv, $buildTemp)
   $docFx = "$buildTemp\docfx"
   if (-not (test-path $docFx))
   {
-    Write-Host "Download DocFx..."
     $source = "https://github.com/dotnet/docfx/releases/download/v2.19.2/docfx.zip"
+    Write-Host "Download DocFx from $source"
+    
     Invoke-WebRequest $source -OutFile "$buildTemp\docfx.zip"
     
     &$uenv.Zip x "$buildTemp\docfx.zip" -o"$buildTemp\docfx" -aos > $nul

build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1

@@ -8,6 +8,7 @@ function Get-UmbracoBuildEnv
   # store tools in the module's directory
   # and cache them for two days
   $path = "$PSScriptRoot\temp"
+  $src = "$PSScriptRoot\..\..\..\src"
   $cache = 2
   
   if (-not (test-path $path))
@@ -37,9 +38,10 @@ function Get-UmbracoBuildEnv
   if (-not (test-path $sevenZip))
   {
     Write-Host "Download 7-Zip..."
-    &$nuget install 7-Zip.CommandLine -OutputDirectory $path -Verbosity quiet
+    &$nuget install 7-Zip.CommandLine -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
     $dir = ls "$path\7-Zip.CommandLine.*" | sort -property Name -descending | select -first 1
     $file = ls -path "$dir" -name 7za.exe -recurse
+    $file = ls -path "$dir" -name 7za.exe -recurse | select -first 1 #A select is because there is tools\7za.exe & tools\x64\7za.exe
     mv "$dir\$file" $sevenZip
     Remove-Directory $dir
   }
@@ -53,7 +55,7 @@ function Get-UmbracoBuildEnv
   if (-not (test-path $vswhere))
   {
     Write-Host "Download VsWhere..."
-    &$nuget install vswhere -OutputDirectory $path -Verbosity quiet
+    &$nuget install vswhere -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
     $dir = ls "$path\vswhere.*" | sort -property Name -descending | select -first 1
     $file = ls -path "$dir" -name vswhere.exe -recurse
     mv "$dir\$file" $vswhere
@@ -69,7 +71,7 @@ function Get-UmbracoBuildEnv
   if (-not (test-path $semver))
   {
     Write-Host "Download Semver..."
-    &$nuget install semver -OutputDirectory $path -Verbosity quiet
+    &$nuget install semver -configFile "$src\NuGet.config" -OutputDirectory $path -Verbosity quiet
     $dir = ls "$path\semver.*" | sort -property Name -descending | select -first 1
     $file = "$dir\lib\net452\Semver.dll"
     if (-not (test-path $file))
@@ -92,14 +94,14 @@ function Get-UmbracoBuildEnv
   }
   
   # ensure we have node
-  $node = "$path\node-v6.9.1-win-x86"
-  $source = "http://nodejs.org/dist/v6.9.1/node-v6.9.1-win-x86.7z"
+  $node = "$path\node-v8.12.0-win-x86"
+  $source = "http://nodejs.org/dist/v8.12.0/node-v8.12.0-win-x86.7z "
   if (-not (test-path $node))
   {
     Write-Host "Download Node..."
-    Invoke-WebRequest $source -OutFile "$path\node-v6.9.1-win-x86.7z"
-    &$sevenZip x "$path\node-v6.9.1-win-x86.7z" -o"$path" -aos > $nul
-    Remove-File "$path\node-v6.9.1-win-x86.7z"    
+    Invoke-WebRequest $source -OutFile "$path\node-v8.12.0-win-x86.7z"
+    &$sevenZip x "$path\node-v8.12.0-win-x86.7z" -o"$path" -aos > $nul
+    Remove-File "$path\node-v8.12.0-win-x86.7z"    
   }
   
   # note: why? node already brings everything we need!

build/Modules/Umbraco.Build/Umbraco.Build.psm1

@@ -239,18 +239,18 @@ function Prepare-Tests
   
   # data
   Write-Host "Copy data files"
-  if( -Not (Test-Path -Path "$tmp\tests\Packaging" ) )
+  if (-Not (Test-Path -Path "$tmp\tests\Packaging" ) )
   {
     Write-Host "Create packaging directory"
-    New-Item -ItemType directory -Path "$tmp\tests\Packaging"
+    mkdir "$tmp\tests\Packaging" > $null
   }
   Copy-Files "$src\Umbraco.Tests\Packaging\Packages" "*" "$tmp\tests\Packaging\Packages"
   
   # required for package install tests  
-  if( -Not (Test-Path -Path "$tmp\tests\bin" ) )
+  if (-Not (Test-Path -Path "$tmp\tests\bin" ) )
   {
     Write-Host "Create bin directory"
-    New-Item -ItemType directory -Path "$tmp\tests\bin"
+    mkdir "$tmp\tests\bin" > $null
   }
 }
 
@@ -376,7 +376,7 @@ function Prepare-Packages
   Copy-Files "$src\Umbraco.Web.UI\umbraco\js" "*" "$tmp\WebApp\umbraco\js"
   Copy-Files "$src\Umbraco.Web.UI\umbraco\lib" "*" "$tmp\WebApp\umbraco\lib"
   Copy-Files "$src\Umbraco.Web.UI\umbraco\views" "*" "$tmp\WebApp\umbraco\views"
-  Copy-Files "$src\Umbraco.Web.UI\umbraco\preview" "*" "$tmp\WebApp\umbraco\preview"
+
 }
 
 #
@@ -445,7 +445,7 @@ function Restore-NuGet
   Write-Host ">> Restore NuGet"
   Write-Host "Logging to $tmp\nuget.restore.log" 
   
-  &$uenv.NuGet restore "$src\Umbraco.sln" > "$tmp\nuget.restore.log"
+  &$uenv.NuGet restore "$src\Umbraco.sln" -configfile "$src\NuGet.config" > "$tmp\nuget.restore.log"
 }
 
 #

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -27,19 +27,19 @@
       <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
       <dependency id="HtmlAgilityPack" version="[1.4.9.5, 2.0.0)" />
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
-      <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
       <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.7, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
       <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Examine" version="[0.1.85, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.3, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.3, 5.0.0)" />
+      <dependency id="Examine" version="[0.1.89, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 3.0.0)" />
 	    <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
       <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
+      <dependency id="System.ValueTuple" version="[4.4.0, 5.0.0)" />
     </dependencies>
   </metadata>
   <files>

build/NuSpecs/UmbracoCms.nuspec

@@ -17,9 +17,10 @@
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.7, 4.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.10, 4.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-	  <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
+	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
+      <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.0, 3.0.0)" />
     </dependencies>
   </metadata>
   <files>
@@ -32,6 +33,7 @@
     <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
     <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
     <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" />

build/NuSpecs/tools/Readme.txt

@@ -20,7 +20,7 @@ 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
+Please read the release notes on our.umbraco.com:
+https://our.umbraco.com/download/releases
 
-- Umbraco
+- Umbraco

build/NuSpecs/tools/ReadmeUpgrade.txt

@@ -8,10 +8,10 @@
                                                    
 ----------------------------------------------------
 
-*** IMPORTANT NOTICE FOR 7.7 UPGRADES ***
+*** 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
+https://our.umbraco.com/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.
@@ -33,7 +33,7 @@ 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
+Please read the release notes on our.umbraco.com:
+http://our.umbraco.com/contribute/releases
 
 - Umbraco

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

@@ -1,42 +1,32 @@
 <?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>

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

@@ -1,419 +1,420 @@
 <?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections xdt:Transform="InsertIfMissing" />
-  <configSections>
-    <section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
+    <configSections xdt:Transform="InsertIfMissing" />
+    <configSections>
+        <section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
 
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
-      <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </sectionGroup>
-    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
-      <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </sectionGroup>
-  </configSections>
+        <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
+            <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        </sectionGroup>
+        <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
+            <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="BaseRestExtensions" type="Umbraco.Core.Configuration.BaseRest.BaseRestSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </sectionGroup>
+    </configSections>
 
-  <appSettings xdt:Transform="InsertIfMissing" />
-  <appSettings>
-    <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>
+    <appSettings xdt:Transform="InsertIfMissing" />
+    <appSettings>
+        <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" />
-    <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>
+    <umbracoConfiguration xdt:Transform="InsertIfMissing">
+        <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <FileSystemProviders configSource="config\FileSystemProviders.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <dashBoard configSource="config\Dashboard.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+        <HealthChecks configSource="config\HealthChecks.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
+    </umbracoConfiguration>
 
-  <FileSystemProviders xdt:Transform="Remove" />
-  <BaseRestExtensions xdt:Transform="Remove" />
+    <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)" />
+    <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>
 
-  <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.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    <clientDependency xdt:Transform="RemoveAttributes(version)" />
 
-    <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"/>>
-    <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
-    <compilation xdt:Transform="InsertIfMissing" />
-    <compilation>
-      <assemblies xdt:Transform="InsertIfMissing" />
-      <assemblies>
-        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Collections.Concurrent, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel.Annotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ComponentModel.EventBasedAsync, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Contracts, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Debug, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Tools, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Dynamic.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Globalization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Expressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Linq.Queryable, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.NetworkInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Net.Requests, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ObjectModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit.ILGeneration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Emit.Lightweight, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.InteropServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.InteropServices.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Runtime.Serialization.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Duplex, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.ServiceModel.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.Encoding.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Text.RegularExpressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.ReaderWriter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-        <add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
-      </assemblies>
-    </compilation>
+    <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.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
 
-    <compilation>
-      <assemblies>
-        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-        <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
-      </assemblies>
-    </compilation>
-    <compilation>
-      <assemblies>
-        <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-        <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
-      </assemblies>
-    </compilation>
+        <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"/>>
+        <sessionState customProvider="DefaultSessionProvider" xdt:Locator="Match(customProvider)" xdt:Transform="Remove"/>
+        <compilation xdt:Transform="InsertIfMissing" />
+        <compilation>
+            <assemblies xdt:Transform="InsertIfMissing" />
+            <assemblies>
+                <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Collections.Concurrent, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ComponentModel.Annotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ComponentModel.EventBasedAsync, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Diagnostics.Contracts, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Diagnostics.Debug, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Diagnostics.Tools, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Dynamic.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Globalization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Linq.Expressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Linq.Queryable, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Net.NetworkInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Net.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Net.Requests, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ObjectModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Emit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Emit.ILGeneration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Emit.Lightweight, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.InteropServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.InteropServices.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Serialization.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Runtime.Serialization.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.Duplex, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.ServiceModel.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Text.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Text.Encoding.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Text.RegularExpressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Xml.ReaderWriter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+                <add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+            </assemblies>
+        </compilation>
 
-    <xhtmlConformance xdt:Transform="Remove" />
+        <compilation>
+            <assemblies>
+                <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+                <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+            </assemblies>
+        </compilation>
+        <compilation>
+            <assemblies>
+                <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+                <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+            </assemblies>
+        </compilation>
 
-    <httpModules xdt:Transform="InsertIfMissing" />
-    <httpModules>
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </httpModules>
+        <xhtmlConformance xdt:Transform="Remove" />
 
-    <httpHandlers xdt:Transform="InsertIfMissing" />
-    <httpHandlers>
-      <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
-    </httpHandlers>
-  </system.web>
+        <httpModules xdt:Transform="InsertIfMissing" />
+        <httpModules>
+            <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </httpModules>
 
-  <system.webServer xdt:Transform="InsertIfMissing" />
-  <system.webServer>
-    <modules xdt:Transform="InsertIfMissing" />
-    <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)">
-      <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" />
+        <httpHandlers xdt:Transform="InsertIfMissing" />
+        <httpHandlers>
+            <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
+        </httpHandlers>
+    </system.web>
 
-      <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <!-- Note, we're removing the one that starts with a space here, don't correct it -->
-      <!-- This to fix a quirk we for a lot of releases where we added it with the space by default -->
-      <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </modules>
+    <system.webServer xdt:Transform="InsertIfMissing" />
+    <system.webServer>
+        <modules xdt:Transform="InsertIfMissing" />
+        <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)">
+            <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" />
 
-    <staticContent xdt:Transform="InsertIfMissing" />
-    <staticContent>
-      <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-      <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
-    </staticContent>
+            <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <!-- Note, we're removing the one that starts with a space here, don't correct it -->
+            <!-- This to fix a quirk we for a lot of releases where we added it with the space by default -->
+            <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </modules>
 
-    <handlers>
-      <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </handlers>
+        <staticContent xdt:Transform="InsertIfMissing" />
+        <staticContent>
+            <remove fileExtension=".svg" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+        </staticContent>
 
-    <security xdt:Transform="InsertIfMissing">
-      <requestFiltering xdt:Transform="InsertIfMissing">
-        <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
-      </requestFiltering>
-    </security>
+        <handlers>
+            <remove name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <add name="SpellChecker" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        </handlers>
 
-  </system.webServer>
+        <security xdt:Transform="InsertIfMissing">
+            <requestFiltering xdt:Transform="InsertIfMissing">
+                <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
+            </requestFiltering>
+        </security>
 
-  <runtime xdt:Transform="InsertIfMissing" />
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
-  </runtime>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-      <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" />
-    </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.4.9.5" newVersion="1.4.9.5" />
-      </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" />
-
-  <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="umbraco" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
     </system.webServer>
-  </location>
 
-  <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
-  <location path="App_Plugins" xdt:Locator="Match(path)">
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
-    </system.webServer>
-  </location>
+    <runtime xdt:Transform="InsertIfMissing" />
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
+    </runtime>
 
-</configuration>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='AutoMapper')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Newtonsoft.Json')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Mvc')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.WebPages.Razor')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Web.Http')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+            <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" />
+        </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.4.9.5" newVersion="1.4.9.5" />
+            </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" />
+
+    <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="umbraco" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing">
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>
+
+    <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="App_Plugins" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing">
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>
+
+</configuration>

build/NuSpecs/tools/install.ps1

@@ -98,10 +98,51 @@ if ($project) {
 		$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"

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

@@ -46,7 +46,7 @@
   <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" 
+  <add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" 
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
   <add alias="dictionary" application="settings"
@@ -79,14 +79,14 @@
   <add sortOrder="1" alias="dataTypes" application="developer"
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes(sortOrder)" />
-	   
-  <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" 
+
+  <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="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" 
+  <add initialize="true" sortOrder="5" alias="xslt" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.XsltTreeController, umbraco"
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
   

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

@@ -5,4 +5,6 @@
   </content>
   
   <webservices xdt:Transform="Remove" />
+  
+  <repositories xdt:Transform="Remove" />
 </settings>

build/RevertToCleanInstall.bat

@@ -1,127 +0,0 @@
-@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

build/RevertToEmptyInstall.bat

@@ -1,163 +0,0 @@
-@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
-%windir%\Microsoft.NET\Framework\v4.0.30319\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
-%windir%\Microsoft.NET\Framework\v4.0.30319\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

src/NuGet.Config

@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
-    <add key="umbracocore" value="http://www.myget.org/f/umbracocore/" />
+    <add key="umbracocore" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
   </packageSources>
 </configuration>

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

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

src/SolutionInfo.cs

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

src/Umbraco.Core/ApplicationContext.cs

@@ -1,4 +1,6 @@
-using System;
+using Semver;
+using System;
+using System.Collections.Concurrent;
 using System.Configuration;
 using System.Threading;
 using Umbraco.Core.Configuration;
@@ -11,7 +13,7 @@ using Umbraco.Core.Sync;
 
 namespace Umbraco.Core
 {
-	/// <summary>
+    /// <summary>
     /// the Umbraco Application context
     /// </summary>
     /// <remarks>
@@ -260,7 +262,7 @@ namespace Umbraco.Core
         /// - http://issues.umbraco.org/issue/U4-5728
         /// - http://issues.umbraco.org/issue/U4-5391
         /// </remarks>
-        internal string UmbracoApplicationUrl
+        public string UmbracoApplicationUrl
         {
             get
             {
@@ -269,9 +271,21 @@ namespace Umbraco.Core
             }
         }
 
+        /// <summary>
+        /// Resets the url.
+        /// </summary>
+        public void ResetUmbracoApplicationUrl()
+        {
+            _umbracoApplicationUrl = null;
+        }
+
 	    // ReSharper disable once InconsistentNaming
 	    internal string _umbracoApplicationUrl;
 
+        internal ConcurrentDictionary<string, string> _umbracoApplicationDomains = new ConcurrentDictionary<string, string>();
+
+        internal string _umbracoApplicationDeploymentId;
+
         private Lazy<bool> _configured;
         internal MainDom MainDom { get; private set; }
 
@@ -341,6 +355,52 @@ namespace Umbraco.Core
 			}
 		}
 
+        /// <summary>
+        /// Gets the Current Version of the Umbraco Site before an upgrade
+        /// by using the last/most recent Umbraco Migration that has been run
+        /// </summary>
+        /// <returns>A SemVersion of the latest Umbraco DB Migration run</returns>
+        /// <remarks>
+        /// NOTE: This existed in the InstallHelper previously but should really be here so it can be re-used if necessary
+        /// </remarks>
+        internal SemVersion CurrentVersion()
+        {
+            //Set a default version of 0.0.0
+            var version = new SemVersion(0);
+
+            //If we have a db context available, if we don't then we are not installed anyways
+            if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.CanConnect)
+                version = DatabaseContext.ValidateDatabaseSchema().DetermineInstalledVersionByMigrations(Services.MigrationEntryService);
+
+            if (version != new SemVersion(0))
+                return version;
+
+            // If we aren't able to get a result from the umbracoMigrations table then use the version in web.config, if it's available
+            if (string.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus))
+                return version;
+
+            var configuredVersion = GlobalSettings.ConfigurationStatus;
+
+            string currentComment = null;
+
+            var current = configuredVersion.Split('-');
+            if (current.Length > 1)
+                currentComment = current[1];
+
+            Version currentVersion;
+            if (Version.TryParse(current[0], out currentVersion))
+            {
+                version = new SemVersion(
+                    currentVersion.Major,
+                    currentVersion.Minor,
+                    currentVersion.Build,
+                    string.IsNullOrWhiteSpace(currentComment) ? null : currentComment,
+                    currentVersion.Revision > 0 ? currentVersion.Revision.ToString() : null);
+            }
+
+            return version;
+        }
+
         private void AssertIsNotReady()
         {
             if (this.IsReady)

src/Umbraco.Core/Auditing/AuditEventHandler.cs

@@ -0,0 +1,351 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Web;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Security;
+using Umbraco.Core.Services;
+
+namespace Umbraco.Core.Auditing
+{
+    public sealed class AuditEventHandler : ApplicationEventHandler
+    {
+        private IAuditService _auditServiceInstance;
+        private IUserService _userServiceInstance;
+        private IEntityService _entityServiceInstance;
+
+        private IUser CurrentPerformingUser
+        {
+            get
+            {
+                var identity = Thread.CurrentPrincipal?.GetUmbracoIdentity();
+                return identity == null
+                    ? new User { Id = 0, Name = "SYSTEM", Email = "" }
+                    : _userServiceInstance.GetUserById(Convert.ToInt32(identity.Id));
+            }
+        }
+
+        private IUser GetPerformingUser(int userId)
+        {
+            var found = userId >= 0 ? _userServiceInstance.GetUserById(userId) : null;
+            return found ?? new User {Id = 0, Name = "SYSTEM", Email = ""};
+        }
+
+        private string PerformingIp
+        {
+            get
+            {
+                var httpContext = HttpContext.Current == null ? (HttpContextBase) null : new HttpContextWrapper(HttpContext.Current);
+                var ip = httpContext.GetCurrentRequestIpAddress();
+                if (ip.ToLowerInvariant().StartsWith("unknown")) ip = "";
+                return ip;
+            }
+        }
+
+        protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
+        {
+            _auditServiceInstance = applicationContext.Services.AuditService;
+            _userServiceInstance = applicationContext.Services.UserService;
+            _entityServiceInstance = applicationContext.Services.EntityService;
+
+            //BackOfficeUserManager.AccountLocked += ;
+            //BackOfficeUserManager.AccountUnlocked += ;
+            BackOfficeUserManager.ForgotPasswordRequested += OnForgotPasswordRequest;
+            BackOfficeUserManager.ForgotPasswordChangedSuccess += OnForgotPasswordChange;
+            BackOfficeUserManager.LoginFailed += OnLoginFailed;
+            //BackOfficeUserManager.LoginRequiresVerification += ;
+            BackOfficeUserManager.LoginSuccess += OnLoginSuccess;
+            BackOfficeUserManager.LogoutSuccess += OnLogoutSuccess;
+            BackOfficeUserManager.PasswordChanged += OnPasswordChanged;
+            BackOfficeUserManager.PasswordReset += OnPasswordReset;
+            //BackOfficeUserManager.ResetAccessFailedCount += ;
+
+            UserService.SavedUserGroup2 += OnSavedUserGroupWithUsers;
+
+            UserService.SavedUser += OnSavedUser;
+            UserService.DeletedUser += OnDeletedUser;
+            UserService.UserGroupPermissionsAssigned += UserGroupPermissionAssigned;
+
+            MemberService.Saved += OnSavedMember;
+            MemberService.Deleted += OnDeletedMember;
+            MemberService.AssignedRoles += OnAssignedRoles;
+            MemberService.RemovedRoles += OnRemovedRoles;
+            MemberService.Exported += OnMemberExported;
+        }
+
+        private string FormatEmail(IMember member)
+        {
+            return member == null ? string.Empty : member.Email.IsNullOrWhiteSpace() ? "" : $"<{member.Email}>";
+        }
+
+        private string FormatEmail(IUser user)
+        {
+            return user == null ? string.Empty : user.Email.IsNullOrWhiteSpace() ? "" : $"<{user.Email}>";
+        }
+
+        private void OnRemovedRoles(IMemberService sender, RolesEventArgs args)
+        {
+            var performingUser = CurrentPerformingUser;
+            var roles = string.Join(", ", args.Roles);
+            var members = sender.GetAllMembers(args.MemberIds).ToDictionary(x => x.Id, x => x);
+            foreach (var id in args.MemberIds)
+            {
+                members.TryGetValue(id, out var member);
+                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"Member {id} \"{member?.Name ?? "(unknown)"}\" {FormatEmail(member)}",
+                    "umbraco/member/roles/removed", $"roles modified, removed {roles}");
+            }
+        }
+
+        private void OnAssignedRoles(IMemberService sender, RolesEventArgs args)
+        {
+            var performingUser = CurrentPerformingUser;
+            var roles = string.Join(", ", args.Roles);
+            var members = sender.GetAllMembers(args.MemberIds).ToDictionary(x => x.Id, x => x);
+            foreach (var id in args.MemberIds)
+            {
+                members.TryGetValue(id, out var member);
+                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"Member {id} \"{member?.Name ?? "(unknown)"}\" {FormatEmail(member)}",
+                    "umbraco/member/roles/assigned", $"roles modified, assigned {roles}");
+            }
+        }
+
+        private void OnMemberExported(IMemberService sender, ExportedMemberEventArgs exportedMemberEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var member = exportedMemberEventArgs.Member;
+
+            _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                DateTime.UtcNow,
+                -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
+                "umbraco/member/exported", "exported member data");
+        }
+
+        private void OnSavedUserGroupWithUsers(IUserService sender, SaveEventArgs<UserGroupWithUsers> saveEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            foreach (var groupWithUser in saveEventArgs.SavedEntities)
+            {
+                var group = groupWithUser.UserGroup;
+
+                var dp = string.Join(", ", ((UserGroup)group).GetPreviouslyDirtyProperties());
+                var sections = ((UserGroup)group).WasPropertyDirty("AllowedSections")
+                    ? string.Join(", ", group.AllowedSections)
+                    : null;
+                var perms = ((UserGroup)group).WasPropertyDirty("Permissions")
+                    ? string.Join(", ", group.Permissions)
+                    : null;
+
+                var sb = new StringBuilder();
+                sb.Append($"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)};");
+                if (sections != null)
+                    sb.Append($", assigned sections: {sections}");
+                if (perms != null)
+                {
+                    if (sections != null)
+                        sb.Append(", ");
+                    sb.Append($"default perms: {perms}");
+                }
+
+                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"User Group {group.Id} \"{group.Name}\" ({group.Alias})",
+                    "umbraco/user-group/save", $"{sb}");
+
+                // now audit the users that have changed
+
+                foreach (var user in groupWithUser.RemovedUsers)
+                {
+                    _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                        DateTime.UtcNow,
+                        user.Id, $"User \"{user.Name}\" {FormatEmail(user)}",
+                        "umbraco/user-group/save", $"Removed user \"{user.Name}\" {FormatEmail(user)} from group {group.Id} \"{group.Name}\" ({group.Alias})");
+                }
+
+                foreach (var user in groupWithUser.AddedUsers)
+                {
+                    _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                        DateTime.UtcNow,
+                        user.Id, $"User \"{user.Name}\" {FormatEmail(user)}",
+                        "umbraco/user-group/save", $"Added user \"{user.Name}\" {FormatEmail(user)} to group {group.Id} \"{group.Name}\" ({group.Alias})");
+                }
+            }
+        }
+
+        private void UserGroupPermissionAssigned(IUserService sender, SaveEventArgs<EntityPermission> saveEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var perms = saveEventArgs.SavedEntities;
+            foreach (var perm in perms)
+            {
+                var group = sender.GetUserGroupById(perm.UserGroupId);
+                var assigned = string.Join(", ", perm.AssignedPermissions);
+                var entity = _entityServiceInstance.Get(perm.EntityId);
+
+                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"User Group {group.Id} \"{group.Name}\" ({group.Alias})",
+                    "umbraco/user-group/permissions-change", $"assigning {(string.IsNullOrWhiteSpace(assigned) ? "(nothing)" : assigned)} on id:{perm.EntityId} \"{entity.Name}\"");
+            }
+        }
+
+        private void OnSavedMember(IMemberService sender, SaveEventArgs<IMember> saveEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var members = saveEventArgs.SavedEntities;
+            foreach (var member in members)
+            {
+                var dp = string.Join(", ", ((Member) member).GetPreviouslyDirtyProperties());
+
+                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
+                    "umbraco/member/save", $"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)}");
+            }
+        }
+
+        private void OnDeletedMember(IMemberService sender, DeleteEventArgs<IMember> deleteEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var members = deleteEventArgs.DeletedEntities;
+            foreach (var member in members)
+            {
+                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    -1, $"Member {member.Id} \"{member.Name}\" {FormatEmail(member)}",
+                    "umbraco/member/delete", $"delete member id:{member.Id} \"{member.Name}\" {FormatEmail(member)}");
+            }
+        }
+
+        private void OnSavedUser(IUserService sender, SaveEventArgs<IUser> saveEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var affectedUsers = saveEventArgs.SavedEntities;
+            foreach (var affectedUser in affectedUsers)
+            {
+                var groups = affectedUser.WasPropertyDirty("Groups")
+                    ? string.Join(", ", affectedUser.Groups.Select(x => x.Alias))
+                    : null;
+
+                var dp = string.Join(", ", ((User)affectedUser).GetPreviouslyDirtyProperties());
+
+                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    affectedUser.Id, $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}",
+                    "umbraco/user/save", $"updating {(string.IsNullOrWhiteSpace(dp) ? "(nothing)" : dp)}{(groups == null ? "" : "; groups assigned: " + groups)}");
+            }
+        }
+
+        private void OnDeletedUser(IUserService sender, DeleteEventArgs<IUser> deleteEventArgs)
+        {
+            var performingUser = CurrentPerformingUser;
+            var affectedUsers = deleteEventArgs.DeletedEntities;
+            foreach (var affectedUser in affectedUsers)
+                _auditServiceInstance.Write(performingUser.Id, $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}", PerformingIp,
+                    DateTime.UtcNow,
+                    affectedUser.Id, $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}",
+                    "umbraco/user/delete", "delete user");
+        }
+
+        private void OnLoginSuccess(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs)
+            {
+                var performingUser = GetPerformingUser(identityArgs.PerformingUser);
+                WriteAudit(performingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/sign-in/login", "login success");
+            }
+        }
+
+        private void OnLogoutSuccess(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs)
+            {
+                var performingUser = GetPerformingUser(identityArgs.PerformingUser);
+                WriteAudit(performingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/sign-in/logout", "logout success");
+            }
+        }
+
+        private void OnPasswordReset(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/reset", "password reset");
+            }
+        }
+
+        private void OnPasswordChanged(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/change", "password change");
+            }
+        }
+
+        private void OnLoginFailed(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, 0, identityArgs.IpAddress, "umbraco/user/sign-in/failed", "login failed", affectedDetails: "");
+            }
+        }
+
+        private void OnForgotPasswordChange(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/forgot/change", "password forgot/change");
+            }
+        }
+
+        private void OnForgotPasswordRequest(object sender, EventArgs args)
+        {
+            if (args is IdentityAuditEventArgs identityArgs && identityArgs.PerformingUser >= 0)
+            {
+                WriteAudit(identityArgs.PerformingUser, identityArgs.AffectedUser, identityArgs.IpAddress, "umbraco/user/password/forgot/request", "password forgot/request");
+            }
+        }
+
+        private void WriteAudit(int performingId, int affectedId, string ipAddress, string eventType, string eventDetails, string affectedDetails = null)
+        {
+            var performingUser = _userServiceInstance.GetUserById(performingId);
+
+            var performingDetails = performingUser == null
+                ? $"User UNKNOWN:{performingId}"
+                : $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}";
+
+            WriteAudit(performingId, performingDetails, affectedId, ipAddress, eventType, eventDetails, affectedDetails);
+        }
+
+        private void WriteAudit(IUser performingUser, int affectedId, string ipAddress, string eventType, string eventDetails)
+        {
+            var performingDetails = performingUser == null
+                ? $"User UNKNOWN"
+                : $"User \"{performingUser.Name}\" {FormatEmail(performingUser)}";
+
+            WriteAudit(performingUser?.Id ?? 0, performingDetails, affectedId, ipAddress, eventType, eventDetails);
+        }
+
+        private void WriteAudit(int performingId, string performingDetails, int affectedId, string ipAddress, string eventType, string eventDetails, string affectedDetails = null)
+        {
+            if (affectedDetails == null)
+            {
+                var affectedUser = _userServiceInstance.GetUserById(affectedId);
+                affectedDetails = affectedUser == null
+                    ? $"User UNKNOWN:{affectedId}"
+                    : $"User \"{affectedUser.Name}\" {FormatEmail(affectedUser)}";
+            }
+
+            _auditServiceInstance.Write(performingId, performingDetails,
+                ipAddress,
+                DateTime.UtcNow,
+                affectedId, affectedDetails,
+                eventType, eventDetails);
+        }
+    }
+}

src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Threading;
 using System.Web;
 using Umbraco.Core.Security;
@@ -45,12 +46,8 @@ namespace Umbraco.Core.Auditing
         /// </summary>
         public string Username { get; private set; }
 
-        /// <summary>
-        /// Sets the properties on the event being raised, all parameters are optional except for the action being performed
-        /// </summary>
-        /// <param name="action">An action based on the AuditEvent enum</param>
-        /// <param name="ipAddress">The client's IP address. This is usually automatically set but could be overridden if necessary</param>
-        /// <param name="performingUser">The Id of the user performing the action (if different from the user affected by the action)</param>
+        [Obsolete("Use the method that has the affectedUser parameter instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public IdentityAuditEventArgs(AuditEvent action, string ipAddress, int performingUser = -1)
         {
             DateTimeUtc = DateTime.UtcNow;
@@ -63,6 +60,35 @@ namespace Umbraco.Core.Auditing
                 : performingUser;
         }
 
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        /// <param name="action"></param>
+        /// <param name="ipAddress"></param>
+        /// <param name="comment"></param>
+        /// <param name="performingUser"></param>
+        /// <param name="affectedUser"></param>
+        public IdentityAuditEventArgs(AuditEvent action, string ipAddress, string comment = null, int performingUser = -1, int affectedUser = -1)
+        {
+            DateTimeUtc = DateTime.UtcNow;
+            Action = action;
+
+            IpAddress = ipAddress;
+            Comment = comment;
+            AffectedUser = affectedUser;
+
+            PerformingUser = performingUser == -1
+                ? GetCurrentRequestBackofficeUserId()
+                : performingUser;
+        }
+
+        /// <summary>
+        /// Creates an instance without a performing or affected user (the id will be set to -1)
+        /// </summary>
+        /// <param name="action"></param>
+        /// <param name="ipAddress"></param>
+        /// <param name="username"></param>
+        /// <param name="comment"></param>
         public IdentityAuditEventArgs(AuditEvent action, string ipAddress, string username, string comment)
         {
             DateTimeUtc = DateTime.UtcNow;
@@ -71,6 +97,22 @@ namespace Umbraco.Core.Auditing
             IpAddress = ipAddress;
             Username = username;
             Comment = comment;
+
+            PerformingUser = -1;
+        }
+
+        public IdentityAuditEventArgs(AuditEvent action, string ipAddress, string username, string comment, int performingUser)
+        {
+            DateTimeUtc = DateTime.UtcNow;
+            Action = action;
+
+            IpAddress = ipAddress;
+            Username = username;
+            Comment = comment;
+
+            PerformingUser = performingUser == -1
+                ? GetCurrentRequestBackofficeUserId()
+                : performingUser;
         }
 
         /// <summary>

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -146,7 +146,7 @@ namespace Umbraco.Core.Cache
         #region Insert
         #endregion
 
-        private class NoopLocker : DisposableObject
+        private class NoopLocker : DisposableObjectSlim
         {
             protected override void DisposeResources()
             { }

src/Umbraco.Core/Collections/CompositeTypeTypeKey.cs

@@ -0,0 +1,61 @@
+using System;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Represents a composite key of (Type, Type) for fast dictionaries.
+    /// </summary>
+    internal struct CompositeTypeTypeKey : IEquatable<CompositeTypeTypeKey>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CompositeTypeTypeKey"/> struct.
+        /// </summary>
+        public CompositeTypeTypeKey(Type type1, Type type2) : this()
+        {
+            Type1 = type1;
+            Type2 = type2;
+        }
+
+        /// <summary>
+        /// Gets the first type.
+        /// </summary>
+        public Type Type1 { get; private set; }
+
+        /// <summary>
+        /// Gets the second type.
+        /// </summary>
+        public Type Type2 { get; private set; }
+
+        /// <inheritdoc/>
+        public bool Equals(CompositeTypeTypeKey other)
+        {
+            return Type1 == other.Type1 && Type2 == other.Type2;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object obj)
+        {
+            var other = obj is CompositeTypeTypeKey ? (CompositeTypeTypeKey)obj : default(CompositeTypeTypeKey);
+            return Type1 == other.Type1 && Type2 == other.Type2;
+        }
+
+        public static bool operator ==(CompositeTypeTypeKey key1, CompositeTypeTypeKey key2)
+        {
+            return key1.Type1 == key2.Type1 && key1.Type2 == key2.Type2;
+        }
+
+        public static bool operator !=(CompositeTypeTypeKey key1, CompositeTypeTypeKey key2)
+        {
+            return key1.Type1 != key2.Type1 || key1.Type2 != key2.Type2;
+        }
+
+        /// <inheritdoc/>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Type1.GetHashCode() * 397) ^ Type2.GetHashCode();
+            }
+        }
+    }
+}

src/Umbraco.Core/Collections/TypeList.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Represents a list of types.
+    /// </summary>
+    /// <remarks>Types in the list are, or derive from, or implement, the base type.</remarks>
+    /// <typeparam name="TBase">The base type.</typeparam>
+    internal class TypeList<TBase>
+    {
+        private readonly List<Type> _list = new List<Type>();
+
+        /// <summary>
+        /// Adds a type to the list.
+        /// </summary>
+        /// <typeparam name="T">The type to add.</typeparam>
+        public void Add<T>()
+            where T : TBase
+        {
+            _list.Add(typeof(T));
+        }
+
+        /// <summary>
+        /// Determines whether a type is in the list.
+        /// </summary>
+        public bool Contains(Type type)
+        {
+            return _list.Contains(type);
+        }
+    }
+}

src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using System.Web;
 using System.Xml.Linq;
 using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
+using Semver;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
@@ -24,10 +28,74 @@ namespace Umbraco.Core.Configuration
             _logger = logger;
             _fileName = IOHelper.MapPath(string.Format("{0}/ClientDependency.config", SystemDirectories.Config));
         }
+        
+        /// <summary>
+        /// Changes the version number in ClientDependency.config to a hashed value for the version and the DateTime.Day
+        /// </summary>
+        /// <param name="version">The <see cref="SemVersion">version</see> of Umbraco we're upgrading to</param>
+        /// <param name="date">A <see cref="DateTime">date</see> value to use in the hash to prevent this method from updating the version on each startup</param>
+        /// <param name="dateFormat">Allows the developer to specify the <see cref="string">date precision</see> for the hash (i.e. "yyyyMMdd" would be a precision for the day)</param>
+        /// <returns>Boolean to indicate succesful update of the ClientDependency.config file</returns>
+        public bool UpdateVersionNumber(SemVersion version, DateTime date, string dateFormat)
+        {
+            var byteContents = Encoding.Unicode.GetBytes(version + date.ToString(dateFormat));
+            
+            //This is a way to convert a string to a long
+            //see https://www.codeproject.com/Articles/34309/Convert-String-to-bit-Integer
+            //We could much more easily use MD5 which would create us an INT but since that is not compliant with
+            //hashing standards we have to use SHA
+            int intHash;
+            using (var hash = SHA256.Create())
+            {
+                var bytes = hash.ComputeHash(byteContents);
+
+                var longResult = new[] { 0, 8, 16, 24 }
+                    .Select(i => BitConverter.ToInt64(bytes, i))
+                    .Aggregate((x, y) => x ^ y);
+
+                //CDF requires an INT, and although this isn't fail safe, it will work for our purposes. We are not hashing for crypto purposes
+                //so there could be some collisions with this conversion but it's not a problem for our purposes
+                //It's also important to note that the long.GetHashCode() implementation in .NET is this: return (int) this ^ (int) (this >> 32);
+                //which means that this value will not change per appdomain like some GetHashCode implementations.
+                intHash = longResult.GetHashCode();
+            }
+
+            try
+            {
+                var clientDependencyConfigXml = XDocument.Load(_fileName, LoadOptions.PreserveWhitespace);
+                if (clientDependencyConfigXml.Root != null)
+                {
+
+                    var versionAttribute = clientDependencyConfigXml.Root.Attribute("version");
+
+                    //Set the new version to the hashcode of now
+                    var oldVersion = versionAttribute.Value;
+                    var newVersion = Math.Abs(intHash).ToString();
+
+                    //don't update if it's the same version
+                    if (oldVersion == newVersion)
+                        return false;
+
+                    versionAttribute.SetValue(newVersion);
+                    clientDependencyConfigXml.Save(_fileName, SaveOptions.DisableFormatting);
+
+                    _logger.Info<ClientDependencyConfiguration>(string.Format("Updated version number from {0} to {1}", oldVersion, newVersion));
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error<ClientDependencyConfiguration>("Couldn't update ClientDependency version number", ex);
+            }
+
+            return false;
+        }
 
         /// <summary>
         /// Changes the version number in ClientDependency.config to a random value to avoid stale caches
         /// </summary>
+        /// <seealso cref="UpdateVersionNumber(SemVersion, DateTime, string)" />
+        [Obsolete("Use the UpdateVersionNumber method specifying the version, date and dateFormat instead")]
         public bool IncreaseVersionNumber()
         {
             try
@@ -107,4 +175,4 @@ namespace Umbraco.Core.Configuration
             return success;
         }
     }
-}
+}

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -32,10 +32,9 @@ namespace Umbraco.Core.Configuration
 
         #region Private static fields
 
-        private static Version _version;
         private static readonly object Locker = new object();
         //make this volatile so that we can ensure thread safety with a double check lock
-    	private static volatile string _reservedUrlsCache;
+        private static volatile string _reservedUrlsCache;
         private static string _reservedPathsCache;
         private static HashSet<string> _reservedList = new HashSet<string>();
         private static string _reservedPaths;
@@ -190,7 +189,7 @@ namespace Umbraco.Core.Configuration
         /// This will return the MVC area that we will route all custom routes through like surface controllers, etc...
         /// We will use the 'Path' (default ~/umbraco) to create it but since it cannot contain '/' and people may specify a path of ~/asdf/asdf/admin
         /// we will convert the '/' to '-' and use that as the path. its a bit lame but will work.
-		/// 
+        /// 
         /// We also make sure that the virtual directory (SystemDirectories.Root) is stripped off first, otherwise we'd end up with something
         /// like "MyVirtualDirectory-Umbraco" instead of just "Umbraco".
         /// </remarks>
@@ -205,7 +204,7 @@ namespace Umbraco.Core.Configuration
                 var path = Path;
                 if (path.StartsWith(SystemDirectories.Root)) // beware of TrimStart, see U4-2518
                     path = path.Substring(SystemDirectories.Root.Length);
-			    return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+                return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
             }
         }
 
@@ -312,7 +311,7 @@ namespace Umbraco.Core.Configuration
                 SetMembershipProvidersLegacyEncoding(UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider, value);
             }
         }
-		
+        
         /// <summary>
         /// Saves a setting into the configuration file.
         /// </summary>
@@ -503,7 +502,7 @@ namespace Umbraco.Core.Configuration
         }
 
         /// <summary>
-        /// Returns a string value to determine if umbraco should skip version-checking.
+        /// Returns the number of days that should take place between version checks.
         /// </summary>
         /// <value>The version check period in days (0 = never).</value>
         public static int VersionCheckPeriod
@@ -538,24 +537,41 @@ namespace Umbraco.Core.Configuration
 
         internal static bool ContentCacheXmlStoredInCodeGen
         {
-            get { return ContentCacheXmlStorageLocation == ContentXmlStorage.AspNetTemp; }
+            get { return LocalTempStorageLocation == LocalTempStorage.AspNetTemp; }
         }
-
-        internal static ContentXmlStorage ContentCacheXmlStorageLocation
+
+        /// <summary>
+        /// This is the location type to store temporary files such as cache files or other localized files for a given machine
+        /// </summary>
+        /// <remarks>
+        /// Currently used for the xml cache file and the plugin cache files
+        /// </remarks>
+        internal static LocalTempStorage LocalTempStorageLocation
         {
             get
-            {
+            {
+                //there's a bunch of backwards compat config checks here....
+
+                //This is the current one
+                if (ConfigurationManager.AppSettings.ContainsKey("umbracoLocalTempStorage"))
+                {
+                    return Enum<LocalTempStorage>.Parse(ConfigurationManager.AppSettings["umbracoLocalTempStorage"]);
+                }
+
+                //This one is old
                 if (ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLStorage"))
                 {
-                    return Enum<ContentXmlStorage>.Parse(ConfigurationManager.AppSettings["umbracoContentXMLStorage"]);
-                }
+                    return Enum<LocalTempStorage>.Parse(ConfigurationManager.AppSettings["umbracoContentXMLStorage"]);
+                }
+
+                //This one is older
                 if (ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLUseLocalTemp"))
                 {
                     return bool.Parse(ConfigurationManager.AppSettings["umbracoContentXMLUseLocalTemp"]) 
-                        ? ContentXmlStorage.AspNetTemp 
-                        : ContentXmlStorage.Default;
+                        ? LocalTempStorage.AspNetTemp 
+                        : LocalTempStorage.Default;
                 }
-                return ContentXmlStorage.Default;
+                return LocalTempStorage.Default;
             }
         }
 

src/Umbraco.Core/Configuration/LocalTempStorage.cs

@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration
 {
-    internal enum ContentXmlStorage
+    internal enum LocalTempStorage
     {
         Default,
         AspNetTemp,

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

@@ -0,0 +1,18 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class BackOfficeElement : UmbracoConfigurationElement, IBackOfficeSection
+    {
+        [ConfigurationProperty("tours")]
+        internal TourConfigElement Tours
+        {
+            get { return (TourConfigElement)this["tours"]; }
+        }
+
+        ITourSection IBackOfficeSection.Tours
+        {
+            get { return Tours; }
+        }
+    }
+}

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

@@ -112,7 +112,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get
             {
-                return GetOptionalTextElement("PreviewBadge", @"<a id=""umbracoPreviewBadge"" style=""position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>");                
+                return GetOptionalTextElement("PreviewBadge", @"<a id=""umbracoPreviewBadge"" style=""z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;"" href=""{0}/endPreview.aspx?redir={2}""><span style=""display:none;"">In Preview Mode - click to end</span></a>");                
             }
         }
 
@@ -360,4 +360,4 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         }
         
     }
-}
+}

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

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
     [Obsolete("This is no longer used and will be removed in future versions")]
     internal class HelpElement : ConfigurationElement, IHelpSection
     {
-        [ConfigurationProperty("defaultUrl", DefaultValue = "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}")]
+        [ConfigurationProperty("defaultUrl", DefaultValue = "https://our.umbraco.com/wiki/umbraco-help/{0}/{1}")]
         public string DefaultUrl
         {
             get { return (string) base["defaultUrl"]; }

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

@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IBackOfficeSection
+    {
+        ITourSection Tours { get; }
+    }
+}

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

@@ -13,7 +13,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         IEnumerable<string> ImageTagAllowedAttributes { get; }
 
         IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
-
+        
         string ScriptFolderPath { get; }
 
         IEnumerable<string> ScriptFileTypes { get; }

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

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-
-    public interface IRepositoriesSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IRepository> Repositories { get; }
-    }
-}

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

@@ -1,14 +0,0 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRepository
-    {
-        string Name { get; }
-        Guid Id { get;  }
-        string RepositoryUrl { get; }
-        string WebServiceUrl { get; }
-        bool HasCustomWebServiceUrl { get; }
-        string RestApiUrl { get; }
-    }
-}

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

@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ITourSection
+    {
+        bool EnableTours { get; }
+    }
+}

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

@@ -5,6 +5,8 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
     {
+        IBackOfficeSection BackOffice { get; }
+
         IContentSection Content { get; }
 
         ISecuritySection Security { get; }
@@ -22,9 +24,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         IScheduledTasksSection ScheduledTasks { get; }
 
         IDistributedCallSection DistributedCall { get; }
-
-        IRepositoriesSection PackageRepositories { get; }
-
+        
         IProvidersSection Providers { get; }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -35,4 +35,4 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
         IScriptingSection Scripting { get; }
     }
-}
+}

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

@@ -8,6 +8,8 @@
 
         bool DisableAlternativeTemplates { get; }
 
+        bool ValidateAlternativeTemplates { get; }
+        
         bool DisableFindContentByIdPath { get; }
 		
         bool DisableRedirectUrlTracking { get; }

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

@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class RepositoriesCollection : ConfigurationElementCollection, IEnumerable<IRepository>
-    {
-        internal void Add(RepositoryElement item)
-        {
-            BaseAdd(item);
-        }
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new RepositoryElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((RepositoryElement)element).Id;
-        }
-
-        IEnumerator<IRepository> IEnumerable<IRepository>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IRepository;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
-}

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

@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class RepositoriesElement : ConfigurationElement, IRepositoriesSection
-    {
-
-        [ConfigurationCollection(typeof(RepositoriesCollection), AddItemName = "repository")]
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        internal RepositoriesCollection Repositories
-        {
-            get { return (RepositoriesCollection) base[""]; }
-            set { base[""] = value; }
-        }
-
-        IEnumerable<IRepository> IRepositoriesSection.Repositories
-        {
-            get { return Repositories; }
-        }
-    }
-}

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

@@ -1,19 +0,0 @@
-using System;
-using System.Linq;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public static class RepositoryConfigExtensions
-    {
-        //Our package repo
-        private static readonly Guid RepoGuid = new Guid("65194810-1f85-11dd-bd0b-0800200c9a66");
-
-        public static IRepository GetDefault(this IRepositoriesSection repos)
-        {
-            var found = repos.Repositories.FirstOrDefault(x => x.Id == RepoGuid);
-            if (found == null)
-                throw new InvalidOperationException("No default package repository found with id " + RepoGuid);
-            return found;
-        }
-    }
-}

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

@@ -1,53 +0,0 @@
-using System;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class RepositoryElement : ConfigurationElement, IRepository
-    {
-        [ConfigurationProperty("name", IsRequired = true)]
-        public string Name
-        {
-            get { return (string)base["name"]; }
-            set { base["name"] = value; }
-        }
-
-        [ConfigurationProperty("guid", IsRequired = true)]
-        public Guid Id
-        {
-            get { return (Guid)base["guid"]; }
-            set { base["guid"] = value; }
-        }
-
-        [ConfigurationProperty("repositoryurl", DefaultValue = "http://packages.umbraco.org")]
-        public string RepositoryUrl
-        {
-            get { return (string)base["repositoryurl"]; }
-            set { base["repositoryurl"] = value; }
-        }
-
-        [ConfigurationProperty("webserviceurl", DefaultValue = "/umbraco/webservices/api/repository.asmx")]
-        public string WebServiceUrl
-        {
-            get { return (string)base["webserviceurl"]; }
-            set { base["webserviceurl"] = value; }
-        }
-
-        public bool HasCustomWebServiceUrl
-        {
-            get
-            {
-                var prop = Properties["webserviceurl"];
-                return (string) prop.DefaultValue != (string) this[prop];                
-            }
-        }
-
-        [ConfigurationProperty("restapiurl", DefaultValue = "https://our.umbraco.org/webapi/packages/v1")]
-        public string RestApiUrl
-        {
-            get { return (string)base["restapiurl"]; }
-            set { base["restapiurl"] = value; }
-        }
-        
-    }
-}

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

@@ -0,0 +1,17 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class TourConfigElement : UmbracoConfigurationElement, ITourSection
+    {
+        //disabled by default so that upgraders don't get it enabled by default
+        //TODO: we probably just want to disable the initial one from automatically loading ?
+        [ConfigurationProperty("enable", DefaultValue = false)]
+        public bool EnableTours
+        {
+            get { return (bool)this["enable"]; }
+        }
+
+        //TODO: We could have additional filters, etc... defined here
+    }
+}

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

@@ -8,6 +8,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
     public class UmbracoSettingsSection : ConfigurationSection, IUmbracoSettingsSection
     {
+        [ConfigurationProperty("backOffice")]
+        internal BackOfficeElement BackOffice
+        {
+            get { return (BackOfficeElement)this["backOffice"]; }
+        }
+
         [ConfigurationProperty("content")]
         internal ContentElement Content
         {
@@ -61,50 +67,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get { return (DistributedCallElement)this["distributedCall"]; }
         }
-
-        private RepositoriesElement _defaultRepositories;
-
-        [ConfigurationProperty("repositories")]
-        internal RepositoriesElement PackageRepositories
-        {
-            get
-            {
-
-                if (_defaultRepositories != null)
-                {
-                    return _defaultRepositories;
-                }
-
-                //here we need to check if this element is defined, if it is not then we'll setup the defaults
-                var prop = Properties["repositories"];
-                var repos = this[prop] as ConfigurationElement;
-                if (repos != null && repos.ElementInformation.IsPresent == false)
-                {
-                    var collection = new RepositoriesCollection
-                        {
-                            new RepositoryElement() {Name = "Umbraco package Repository", Id = new Guid("65194810-1f85-11dd-bd0b-0800200c9a66")}
-                        };
-
-                    
-                    _defaultRepositories = new RepositoriesElement()
-                        {
-                            Repositories = collection
-                        };
-
-                    return _defaultRepositories;
-                }
-
-                //now we need to ensure there is *always* our umbraco repo! its hard coded in the codebase!
-                var reposElement = (RepositoriesElement)base["repositories"];
-                if (reposElement.Repositories.All(x => x.Id != new Guid("65194810-1f85-11dd-bd0b-0800200c9a66")))
-                {
-                    reposElement.Repositories.Add(new RepositoryElement() { Name = "Umbraco package Repository", Id = new Guid("65194810-1f85-11dd-bd0b-0800200c9a66") });                    
-                }
-
-                return reposElement;
-            }
-        }
-
+        
         [ConfigurationProperty("providers")]
         internal ProvidersElement Providers
         {
@@ -149,6 +112,11 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return Templates; }
         }
 
+        IBackOfficeSection IUmbracoSettingsSection.BackOffice
+        {
+            get { return BackOffice; }
+        }
+
         IDeveloperSection IUmbracoSettingsSection.Developer
         {
             get { return Developer; }
@@ -174,11 +142,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return DistributedCall; }
         }
 
-        IRepositoriesSection IUmbracoSettingsSection.PackageRepositories
-        {
-            get { return PackageRepositories; }
-        }
-
         IProvidersSection IUmbracoSettingsSection.Providers
         {
             get { return Providers; }

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

@@ -1,4 +1,5 @@
-using System.Configuration;
+using System;
+using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
@@ -21,6 +22,13 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         {
             get { return (bool) base["disableAlternativeTemplates"]; }
         }
+
+        [ConfigurationProperty("validateAlternativeTemplates", DefaultValue = "false")]
+        public bool ValidateAlternativeTemplates
+        {
+            get { return (bool)base["validateAlternativeTemplates"]; }
+        }
+
         [ConfigurationProperty("disableFindContentByIdPath", DefaultValue = "false")]
         public bool DisableFindContentByIdPath
         {

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.7.2");
+        private static readonly Version Version = new Version("7.13.0");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/Constants-Applications.cs

@@ -73,6 +73,11 @@
             /// </summary>
             public const string Media = "media";
 
+            /// <summary>
+            /// alias for the macro tree.
+            /// </summary>
+            public const string Macros = "macros";
+            
             /// <summary>
             /// alias for the datatype tree.
             /// </summary>
@@ -87,7 +92,7 @@
 			/// alias for the dictionary tree.
 			/// </summary>
 			public const string Dictionary = "dictionary";
-
+            
             public const string Stylesheets = "stylesheets";
 
             /// <summary>
@@ -130,4 +135,4 @@
     }
 
    
-}
+}

src/Umbraco.Core/Constants-Conventions.cs

@@ -110,6 +110,11 @@ namespace Umbraco.Core
 				/// Property alias for the Media's file extension.
 				/// </summary>
 				public const string Extension = "umbracoExtension";
+
+				/// <summary>
+				/// The default height/width of an image file if the size can't be determined from the metadata
+				/// </summary>
+				public const int DefaultSize = 200;
 			}
 
 			/// <summary>
@@ -341,7 +346,17 @@ namespace Umbraco.Core
                 /// ContentType alias for default relation type "Relate Parent Document On Delete".
                 /// </summary>
                 public const string RelateParentDocumentOnDeleteAlias = "relateParentDocumentOnDelete";
+
+                /// <summary>
+                /// ContentType name for default relation type "Relate Parent Media Folder On Delete".
+                /// </summary>
+                public const string RelateParentMediaFolderOnDeleteName = "Relate Parent Media Folder On Delete";
+
+                /// <summary>
+                /// ContentType alias for default relation type "Relate Parent Media Folder On Delete".
+                /// </summary>
+                public const string RelateParentMediaFolderOnDeleteAlias = "relateParentMediaFolderOnDelete";
             }
 		}
 	}
-}
+}

src/Umbraco.Core/Constants-PackageRepository.cs

@@ -0,0 +1,15 @@
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        ///     Defines the constants used for the Umbraco package repository
+        /// </summary>
+        public static class PackageRepository
+        {
+            public const string RestApiBaseUrl = "https://our.umbraco.com/webapi/packages/v1";
+            public const string DefaultRepositoryName = "Umbraco package Repository";
+            public const string DefaultRepositoryId = "65194810-1f85-11dd-bd0b-0800200c9a66";
+        }
+    }
+}

src/Umbraco.Core/Constants-PropertyEditors.cs

@@ -122,6 +122,11 @@ namespace Umbraco.Core
             /// Alias for the Dropdown list, publishing keys datatype.
             /// </summary>
             public const string DropdownlistPublishingKeysAlias = "Umbraco.DropdownlistPublishingKeys";
+            
+            /// <summary>
+            /// Alias for the "new" Dropdown list, that replaces the old four deprecated ones and works as other list based property editors
+            /// </summary>
+            public const string DropDownListFlexibleAlias = "Umbraco.DropDown.Flexible";
 
             /// <summary>
             /// Guid for the Folder browser datatype.
@@ -452,4 +457,4 @@ namespace Umbraco.Core
             }
         }
 	}
-}
+}

src/Umbraco.Core/Constants-Security.cs

@@ -9,6 +9,7 @@ namespace Umbraco.Core
         {
 
             public const string AdminGroupAlias = "admin";
+            public const string SensitiveDataGroupAlias = "sensitiveData";
             public const string TranslatorGroupAlias = "translator";
 
             public const string BackOfficeAuthenticationType = "UmbracoBackOffice";
@@ -36,4 +37,4 @@ namespace Umbraco.Core
 
         }
     }
-}
+}

src/Umbraco.Core/Constants-System.cs

@@ -11,24 +11,61 @@
             /// The integer identifier for global system root node.
             /// </summary>
             public const int Root = -1;
+
+            /// <summary>
+            /// The string identifier for global system root node.
+            /// </summary>
+            /// <remarks>Use this instead of re-creating the string everywhere.</remarks>
+            public const string RootString = "-1";
 
             /// <summary>
             /// The integer identifier for content's recycle bin.
             /// </summary>
             public const int RecycleBinContent = -20;
+
+            /// <summary>
+            /// The string identifier for content's recycle bin.
+            /// </summary>
+            /// <remarks>Use this instead of re-creating the string everywhere.</remarks>
+            public const string RecycleBinContentString = "-20";
+
+            /// <summary>
+            /// The string path prefix of the content's recycle bin.
+            /// </summary>
+            /// <remarks>
+            /// <para>Everything that is in the content recycle bin, has a path that starts with the prefix.</para>
+            /// <para>Use this instead of re-creating the string everywhere.</para>
+            /// </remarks>
+            public const string RecycleBinContentPathPrefix = "-1,-20,";
 
             /// <summary>
             /// The integer identifier for media's recycle bin.
             /// </summary>
             public const int RecycleBinMedia = -21;
 
+            /// <summary>
+            /// The string identifier for media's recycle bin.
+            /// </summary>
+            /// <remarks>Use this instead of re-creating the string everywhere.</remarks>
+            public const string RecycleBinMediaString = "-21";
+
+            /// <summary>
+            /// The string path prefix of the media's recycle bin.
+            /// </summary>
+            /// <remarks>
+            /// <para>Everything that is in the media recycle bin, has a path that starts with the prefix.</para>
+            /// <para>Use this instead of re-creating the string everywhere.</para>
+            /// </remarks>
+            public const string RecycleBinMediaPathPrefix = "-1,-21,";
+
             public const int DefaultContentListViewDataTypeId = -95;
             public const int DefaultMediaListViewDataTypeId = -96;
             public const int DefaultMembersListViewDataTypeId = -97;
+            public const int DefaultLabelDataTypeId = -92;
 
             public const string UmbracoConnectionName = "umbracoDbDSN";
             public const string UmbracoMigrationName = "Umbraco";
         }
-        
+
     }
 }

src/Umbraco.Core/DatabaseContext.cs

@@ -279,16 +279,34 @@ namespace Umbraco.Core
         {
             get
             {
-                string dbtype = Database.Connection == null ? ProviderName : Database.Connection.GetType().Name;
+                if (Database.Connection == null)
+                {
+                    string dbtype = ProviderName;
 
-                if (dbtype.StartsWith("MySql")) return DatabaseProviders.MySql;
-                if (dbtype.StartsWith("SqlCe") || dbtype.Contains("SqlServerCe")) return DatabaseProviders.SqlServerCE;
-                if (dbtype.StartsWith("Npgsql")) return DatabaseProviders.PostgreSQL;
-                if (dbtype.StartsWith("Oracle") || dbtype.Contains("OracleClient")) return DatabaseProviders.Oracle;
-                if (dbtype.StartsWith("SQLite")) return DatabaseProviders.SQLite;
-                if (dbtype.Contains("Azure")) return DatabaseProviders.SqlAzure;
+                    if (dbtype.StartsWith("MySql")) return DatabaseProviders.MySql;
+                    if (dbtype.StartsWith("SqlCe") || dbtype.Contains("SqlServerCe")) return DatabaseProviders.SqlServerCE;
+                    if (dbtype.StartsWith("Npgsql")) return DatabaseProviders.PostgreSQL;
+                    if (dbtype.StartsWith("Oracle") || dbtype.Contains("OracleClient")) return DatabaseProviders.Oracle;
+                    if (dbtype.StartsWith("SQLite")) return DatabaseProviders.SQLite;
+                    if (dbtype.Contains("Azure")) return DatabaseProviders.SqlAzure;
 
-                return DatabaseProviders.SqlServer;
+                    return DatabaseProviders.SqlServer;
+                }
+                else
+                {
+                    Database.DBType dbType = Database.DatabaseType;
+                    
+                    switch (dbType)
+                    {
+                        case Persistence.Database.DBType.SqlServer: return DatabaseProviders.SqlServer;
+                        case Persistence.Database.DBType.SqlServerCE: return DatabaseProviders.SqlServerCE;
+                        case Persistence.Database.DBType.MySql: return DatabaseProviders.MySql;
+                        case Persistence.Database.DBType.PostgreSQL: return DatabaseProviders.PostgreSQL;
+                        case Persistence.Database.DBType.Oracle: return DatabaseProviders.Oracle;
+                        case Persistence.Database.DBType.SQLite: return DatabaseProviders.SQLite;
+                        default: return (ProviderName.Contains("Azure"))? DatabaseProviders.SqlAzure : DatabaseProviders.SqlServer;
+                    } 
+                }
             }
         }
 
@@ -459,6 +477,22 @@ namespace Umbraco.Core
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
             var connectionstrings = xml.Root.DescendantsAndSelf("connectionStrings").Single();
 
+            // honour configSource, if its set, change the xml file we are saving the configuration
+            // to the one set in the configSource attribute
+            if (connectionstrings.Attribute("configSource") != null)
+            {
+                var source = connectionstrings.Attribute("configSource").Value;
+                var configFile = IOHelper.MapPath(string.Format("{0}/{1}", SystemDirectories.Root, source));
+                LogHelper.Info<DatabaseContext>("storing ConnectionString in {0}", () => configFile);
+                if (System.IO.File.Exists(configFile))
+                {
+                    xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
+                    fileName = configFile; 
+                }
+
+                connectionstrings = xml.Root.DescendantsAndSelf("connectionStrings").Single();
+            }
+
             // Update connectionString if it exists, or else create a new appSetting for the given key and value
             var setting = connectionstrings.Descendants("add").FirstOrDefault(s => s.Attribute("name").Value == Constants.System.UmbracoConnectionName);
             if (setting == null)

src/Umbraco.Core/DateTimeExtensions.cs

@@ -21,9 +21,9 @@ namespace Umbraco.Core
         public static DateTime TruncateTo(this DateTime dt, DateTruncate truncateTo)
         {
             if (truncateTo == DateTruncate.Year)
-                return new DateTime(dt.Year, 0, 0);
+                return new DateTime(dt.Year, 1, 1);
             if (truncateTo == DateTruncate.Month)
-                return new DateTime(dt.Year, dt.Month, 0);
+                return new DateTime(dt.Year, dt.Month, 1);
             if (truncateTo == DateTruncate.Day)
                 return new DateTime(dt.Year, dt.Month, dt.Day);
             if (truncateTo == DateTruncate.Hour)
@@ -41,43 +41,43 @@ namespace Umbraco.Core
             Hour,
             Minute,
             Second
-        }
-
+        }
+
         /// <summary>
-        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
+        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
         /// date time is before the time, calculate onto next day)
         /// </summary>
         /// <param name="fromDateTime">Date to start from</param>
         /// <param name="scheduledTime">Time to compare against (in Hmm form, e.g. 330, 2200)</param>
-        /// <returns></returns>
-        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
-        {
-            // Ensure time provided is 4 digits long
-            if (scheduledTime.Length == 3)
-            {
-                scheduledTime = "0" + scheduledTime;
-            }
-
-            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
-            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
-
-            DateTime scheduledDateTime;
-            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
-            {
-                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
-            }
-            else
-            {
-                var nextDay = fromDateTime.AddDays(1);
-                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
-            }
-
-            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
-        }
-
-        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
-        {
-            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
+        /// <returns></returns>
+        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
+        {
+            // Ensure time provided is 4 digits long
+            if (scheduledTime.Length == 3)
+            {
+                scheduledTime = "0" + scheduledTime;
+            }
+
+            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
+            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
+
+            DateTime scheduledDateTime;
+            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
+            {
+                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
+            }
+            else
+            {
+                var nextDay = fromDateTime.AddDays(1);
+                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
+            }
+
+            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
+        }
+
+        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
+        {
+            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
         }
     }
 }

src/Umbraco.Core/DisposableObject.cs

@@ -2,60 +2,60 @@ using System;
 using System.Threading;
 
 namespace Umbraco.Core
-{
-	/// <summary>
-	/// Abstract implementation of IDisposable.
-	/// </summary>
-	/// <remarks>
-	/// Can also be used as a pattern for when inheriting is not possible.
-	/// 
+{
+    /// <summary>
+    /// Abstract implementation of IDisposable.
+    /// </summary>
+    /// <remarks>
+    /// Can also be used as a pattern for when inheriting is not possible.
+    /// 
     /// See also: https://msdn.microsoft.com/en-us/library/b1yfkh5e%28v=vs.110%29.aspx
     /// See also: https://lostechies.com/chrispatterson/2012/11/29/idisposable-done-right/
     /// 
     /// Note: if an object's ctor throws, it will never be disposed, and so if that ctor
     /// has allocated disposable objects, it should take care of disposing them.
-	/// </remarks>
-	public abstract class DisposableObject : IDisposable
-	{
-		private bool _disposed;
-	    private readonly object _locko = new object();
-
-		// gets a value indicating whether this instance is disposed.
+    /// </remarks>
+    public abstract class DisposableObject : IDisposable
+    {
+        private bool _disposed;
+        private readonly object _locko = new object();
+
+        // gets a value indicating whether this instance is disposed.
         // for internal tests only (not thread safe)
         //TODO make this internal + rename "Disposed" when we can break compatibility
-		public bool IsDisposed { get { return _disposed; } }
-
-		// implements IDisposable
-		public void Dispose()
-		{
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-        // finalizer
-		~DisposableObject()
-		{
-			Dispose(false);
-		}
+        public bool IsDisposed { get { return _disposed; } }
+
+        // implements IDisposable
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        // finalizer
+        ~DisposableObject()
+        {
+            Dispose(false);
+        }
 
         //TODO make this private, non-virtual when we can break compatibility
-        protected virtual void Dispose(bool disposing)
-		{
-		    lock (_locko)
-		    {
-		        if (_disposed) return;
-		        _disposed = true;
-		    }
+        protected virtual void Dispose(bool disposing)
+        {
+            lock (_locko)
+            {
+                if (_disposed) return;
+                _disposed = true;
+            }
 
             DisposeUnmanagedResources();
 
             if (disposing)
-                DisposeResources();
-		}
-
-		protected abstract void DisposeResources();
-
-		protected virtual void DisposeUnmanagedResources()
-		{ }
-	}
+                DisposeResources();
+        }
+
+        protected abstract void DisposeResources();
+
+        protected virtual void DisposeUnmanagedResources()
+        { }
+    }
 }

src/Umbraco.Core/DisposableObjectSlim.cs

@@ -0,0 +1,38 @@
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// This should not be use if there are ubmanaged resources to be disposed, use DisposableObject instead
+    /// </summary>
+    public abstract class DisposableObjectSlim : IDisposable
+    {
+        private bool _disposed;
+        private readonly object _locko = new object();
+
+        // gets a value indicating whether this instance is disposed.
+        // for internal tests only (not thread safe)
+        internal bool Disposed { get { return _disposed; } }
+
+        // implements IDisposable
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            lock (_locko)
+            {
+                if (_disposed) return;
+                _disposed = true;
+            }
+
+            if (disposing)
+                DisposeResources();
+        }
+
+        protected abstract void DisposeResources();
+    }
+}

src/Umbraco.Core/DisposableTimer.cs

@@ -11,8 +11,8 @@ namespace Umbraco.Core
 	/// <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 : DisposableObject
-	{
+	public class DisposableTimer : DisposableObjectSlim
+    {
 	    private readonly ILogger _logger;
 	    private readonly LogType? _logType;
 	    private readonly IProfiler _profiler;
@@ -209,13 +209,13 @@ namespace Umbraco.Core
                 loggerType,
                 startMessage(),
                 completeMessage());
-        } 
+        }
         #endregion
-
-		/// <summary>
-		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
-		/// </summary>
-		protected override void DisposeResources()
+
+        /// <summary>
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
+        /// </summary>
+        protected override void DisposeResources()
 		{
             if (_profiler != null)
             {

src/Umbraco.Core/Events/EventMessages.cs

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Events
     /// <summary>
     /// Event messages collection
     /// </summary>
-    public sealed class EventMessages : DisposableObject
+    public sealed class EventMessages : DisposableObjectSlim
     {
         private readonly List<EventMessage> _msgs = new List<EventMessage>();
 

src/Umbraco.Core/Events/ExportedMemberEventArgs.cs

@@ -0,0 +1,18 @@
+using System;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+
+namespace Umbraco.Core.Events
+{
+    internal class ExportedMemberEventArgs : EventArgs
+    {
+        public IMember Member { get; }
+        public MemberExportModel Exported { get; }
+
+        public ExportedMemberEventArgs(IMember member, MemberExportModel exported)
+        {
+            Member = member;
+            Exported = exported;
+        }
+    }
+}

src/Umbraco.Core/Events/ImportPackageEventArgs.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Packaging.Models;
 
 namespace Umbraco.Core.Events
@@ -7,18 +8,27 @@ namespace Umbraco.Core.Events
     public class ImportPackageEventArgs<TEntity> : CancellableEnumerableObjectEventArgs<TEntity>, IEquatable<ImportPackageEventArgs<TEntity>>
     {
         private readonly MetaData _packageMetaData;
-
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying packageMetaData instead")]
         public ImportPackageEventArgs(TEntity eventObject, bool canCancel)
             : base(new[] { eventObject }, canCancel)
         {
         }
 
-        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
-            : base(new[] { eventObject })
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData, bool canCancel)
+            : base(new[] { eventObject }, canCancel)
         {
+            if (packageMetaData == null) throw new ArgumentNullException("packageMetaData");
             _packageMetaData = packageMetaData;
         }
 
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
+            : this(eventObject, packageMetaData, true)
+        {
+            
+        }
+
         public MetaData PackageMetaData
         {
             get { return _packageMetaData; }

src/Umbraco.Core/Events/RolesEventArgs.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace Umbraco.Core.Events
+{
+    public class RolesEventArgs : EventArgs
+    {
+        public RolesEventArgs(int[] memberIds, string[] roles)
+        {
+            MemberIds = memberIds;
+            Roles = roles;
+        }
+
+        public int[] MemberIds { get; set; }
+        public string[] Roles { get; set; }
+    }
+}

src/Umbraco.Core/Events/ScopeEventDispatcherBase.cs

@@ -76,260 +76,257 @@ namespace Umbraco.Core.Events
         {
             if (_events == null)
                 return Enumerable.Empty<IEventDefinition>();
-            
+
+            IReadOnlyList<IEventDefinition> events;
             switch (filter)
             {
                 case EventDefinitionFilter.All:
-                    return FilterSupersededAndUpdateToLatestEntity(_events);
+                    events = _events;
+                    break;
                 case EventDefinitionFilter.FirstIn:
                     var l1 = new OrderedHashSet<IEventDefinition>();
                     foreach (var e in _events)
-                    {
                         l1.Add(e);
-                    }
-                    return FilterSupersededAndUpdateToLatestEntity(l1);
+                    events = l1;
+                    break;
                 case EventDefinitionFilter.LastIn:
                     var l2 = new OrderedHashSet<IEventDefinition>(keepOldest: false);
                     foreach (var e in _events)
-                    {
                         l2.Add(e);
-                    }
-                    return FilterSupersededAndUpdateToLatestEntity(l2);
+                    events = l2;
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException("filter", filter, null);
             }
+
+            return FilterSupersededAndUpdateToLatestEntity(events);
         }
-        
-        private class EventDefinitionTypeData
+
+        private class EventDefinitionInfos
         {
             public IEventDefinition EventDefinition { get; set; }
-            public Type EventArgType { get; set; }
-            public SupersedeEventAttribute[] SupersedeAttributes { get; set; }
+            public Type[] SupersedeTypes { get; set; }
         }
-        
-        /// <summary>
-        /// This will iterate over the events (latest first) and filter out any events or entities in event args that are included 
-        /// in more recent events that Supersede previous ones. For example, If an Entity has been Saved and then Deleted, we don't want
-        /// to raise the Saved event (well actually we just don't want to include it in the args for that saved event)
-        /// </summary>
-        /// <param name="events"></param>
-        /// <returns></returns>
-        private static IEnumerable<IEventDefinition> FilterSupersededAndUpdateToLatestEntity(IReadOnlyList<IEventDefinition> events)
+
+        // fixme
+        // this is way too convoluted, the superceede attribute is used only on DeleteEventargs to specify
+        // that it superceeds save, publish, move and copy - BUT - publish event args is also used for
+        // unpublishing and should NOT be superceeded - so really it should not be managed at event args
+        // level but at event level
+        //
+        // what we want is:
+        // if an entity is deleted, then all Saved, Moved, Copied, Published events prior to this should
+        // not trigger for the entity - and even though, does it make any sense? making a copy of an entity
+        // should ... trigger?
+        //
+        // not going to refactor it all - we probably want to *always* trigger event but tell people that
+        // due to scopes, they should not expected eg a saved entity to still be around - however, now,
+        // going to write a ugly condition to deal with U4-10764
+
+        // iterates over the events (latest first) and filter out any events or entities in event args that are included
+        // in more recent events that Supersede previous ones. For example, If an Entity has been Saved and then Deleted, we don't want
+        // to raise the Saved event (well actually we just don't want to include it in the args for that saved event)
+        internal static IEnumerable<IEventDefinition> FilterSupersededAndUpdateToLatestEntity(IReadOnlyList<IEventDefinition> events)
         {
-            //used to keep the 'latest' entity and associated event definition data
-            var allEntities = new List<Tuple<IEntity, EventDefinitionTypeData>>();
-
-            //tracks all CancellableObjectEventArgs instances in the events which is the only type of args we can work with
-            var cancelableArgs = new List<CancellableObjectEventArgs>();
+            // keeps the 'latest' entity and associated event data
+            var entities = new List<Tuple<IEntity, EventDefinitionInfos>>();
 
+            // collects the event definitions
+            // collects the arguments in result, that require their entities to be updated
             var result = new List<IEventDefinition>();
+            var resultArgs = new List<CancellableObjectEventArgs>();
 
-            //This will eagerly load all of the event arg types and their attributes so we don't have to continuously look this data up
-            var allArgTypesWithAttributes = events.Select(x => x.Args.GetType())
+            // eagerly fetch superceeded arg types for each arg type
+            var argTypeSuperceeding = events.Select(x => x.Args.GetType())
                 .Distinct()
-                .ToDictionary(x => x, x => x.GetCustomAttributes<SupersedeEventAttribute>(false).ToArray());
-               
-            //Iterate all events and collect the actual entities in them and relates them to their corresponding EventDefinitionTypeData
-            //we'll process the list in reverse because events are added in the order they are raised and we want to filter out
-            //any entities from event args that are not longer relevant 
-            //(i.e. if an item is Deleted after it's Saved, we won't include the item in the Saved args)
+                .ToDictionary(x => x, x => x.GetCustomAttributes<SupersedeEventAttribute>(false).Select(y => y.SupersededEventArgsType).ToArray());
+
+            // iterate over all events and filter
+            //
+            // process the list in reverse, because events are added in the order they are raised and we want to keep
+            // the latest (most recent) entities and filter out what is not relevant anymore (too old), eg if an entity
+            // is Deleted after being Saved, we want to filter out the Saved event
             for (var index = events.Count - 1; index >= 0; index--)
             {
-                var eventDefinition = events[index];
+                var def = events[index];
 
-                var argType = eventDefinition.Args.GetType();
-                var attributes = allArgTypesWithAttributes[eventDefinition.Args.GetType()];
-
-                var meta = new EventDefinitionTypeData
+                var infos = new EventDefinitionInfos
                 {
-                    EventDefinition = eventDefinition,
-                    EventArgType = argType,
-                    SupersedeAttributes = attributes
+                    EventDefinition = def,
+                    SupersedeTypes = argTypeSuperceeding[def.Args.GetType()]
                 };
 
-                var args = eventDefinition.Args as CancellableObjectEventArgs;
-                if (args != null)
+                var args = def.Args as CancellableObjectEventArgs;
+                if (args == null)
                 {
-                    var list = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
-
-                    if (list == null)
+                    // not a cancellable event arg, include event definition in result
+                    result.Add(def);
+                }
+                else
+                {
+                    // event object can either be a single object or an enumerable of objects
+                    // try to get as an enumerable, get null if it's not
+                    var eventObjects = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
+                    if (eventObjects == null)
                     {
-                        //extract the event object
-                        var obj = args.EventObject as IEntity;
-                        if (obj != null)
+                        // single object, cast as an IEntity
+                        // if cannot cast, cannot filter, nothing - just include event definition in result
+                        var eventEntity = args.EventObject as IEntity;
+                        if (eventEntity == null)
                         {
-                            //Now check if this entity already exists in other event args that supersede this current event arg type
-                            if (IsFiltered(obj, meta, allEntities) == false)
-                            {
-                                //if it's not filtered we can adde these args to the response
-                                cancelableArgs.Add(args);
-                                result.Add(eventDefinition);
-                                //track the entity
-                                allEntities.Add(Tuple.Create(obj, meta));
-                            }
+                            result.Add(def);
+                            continue;
                         }
-                        else
+
+                        // look for this entity in superceding event args
+                        // found = must be removed (ie not added), else track
+                        if (IsSuperceeded(eventEntity, infos, entities) == false)
                         {
-                            //Can't retrieve the entity so cant' filter or inspect, just add to the output
-                            result.Add(eventDefinition);                            
+                            // track
+                            entities.Add(Tuple.Create(eventEntity, infos));
+
+                            // track result arguments
+                            // include event definition in result
+                            resultArgs.Add(args);
+                            result.Add(def);
                         }
                     }
                     else
                     {
+                        // enumerable of objects
                         var toRemove = new List<IEntity>();
-                        foreach (var entity in list)
+                        foreach (var eventObject in eventObjects)
                         {
-                            //extract the event object
-                            var obj = entity as IEntity;
-                            if (obj != null)
-                            {
-                                //Now check if this entity already exists in other event args that supersede this current event arg type
-                                if (IsFiltered(obj, meta, allEntities))
-                                {
-                                    //track it to be removed
-                                    toRemove.Add(obj);
-                                }
-                                else
-                                {
-                                    //track the entity, it's not filtered
-                                    allEntities.Add(Tuple.Create(obj, meta));
-                                }
-                            }
+                            // extract the event object, cast as an IEntity
+                            // if cannot cast, cannot filter, nothing to do - just leave it in the list & continue
+                            var eventEntity = eventObject as IEntity;
+                            if (eventEntity == null)
+                                continue;
+
+                            // look for this entity in superceding event args
+                            // found = must be removed, else track
+                            if (IsSuperceeded(eventEntity, infos, entities))
+                                toRemove.Add(eventEntity);
                             else
-                            {
-                                //we don't need to do anything here, we can't cast to IEntity so we cannot filter, so it will just remain in the list
-                            }
+                                entities.Add(Tuple.Create(eventEntity, infos));
                         }
 
-                        //remove anything that has been filtered
+                        // remove superceded entities
                         foreach (var entity in toRemove)
-                        {
-                            list.Remove(entity);
-                        }
+                            eventObjects.Remove(entity);
 
-                        //track the event and include in the response if there's still entities remaining in the list
-                        if (list.Count > 0)
+                        // if there are still entities in the list, keep the event definition
+                        if (eventObjects.Count > 0)
                         {
                             if (toRemove.Count > 0)
                             {
-                                //re-assign if the items have changed
-                                args.EventObject = list;
+                                // re-assign if changed
+                                args.EventObject = eventObjects;
                             }
-                            cancelableArgs.Add(args);
-                            result.Add(eventDefinition);
+
+                            // track result arguments
+                            // include event definition in result
+                            resultArgs.Add(args);
+                            result.Add(def);
                         }
                     }
                 }
-                else
-                {
-                    //it's not a cancelable event arg so we just include it in the result
-                    result.Add(eventDefinition);
-                }
             }
 
-            //Now we'll deal with ensuring that only the latest(non stale) entities are used throughout all event args
-            UpdateToLatestEntities(allEntities, cancelableArgs);
+            // go over all args in result, and update them with the latest instanceof each entity
+            UpdateToLatestEntities(entities, resultArgs);
 
-            //we need to reverse the result since we've been adding by latest added events first!
+            // reverse, since we processed the list in reverse
             result.Reverse();
 
             return result;
         }
 
-        private static void UpdateToLatestEntities(IEnumerable<Tuple<IEntity, EventDefinitionTypeData>> allEntities, IEnumerable<CancellableObjectEventArgs> cancelableArgs)
+        // edits event args to use the latest instance of each entity
+        private static void UpdateToLatestEntities(IEnumerable<Tuple<IEntity, EventDefinitionInfos>> entities, IEnumerable<CancellableObjectEventArgs> args)
         {
-            //Now we'll deal with ensuring that only the latest(non stale) entities are used throughout all event args
-
+            // get the latest entities
+            // ordered hash set + keepOldest will keep the latest inserted entity (in case of duplicates)
             var latestEntities = new OrderedHashSet<IEntity>(keepOldest: true);
-            foreach (var entity in allEntities.OrderByDescending(entity => entity.Item1.UpdateDate))
-            {
+            foreach (var entity in entities.OrderByDescending(entity => entity.Item1.UpdateDate))
                 latestEntities.Add(entity.Item1);
-            }
 
-            foreach (var args in cancelableArgs)
+            foreach (var arg in args)
             {
-                var list = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
-                if (list == null)
+                // event object can either be a single object or an enumerable of objects
+                // try to get as an enumerable, get null if it's not
+                var eventObjects = TypeHelper.CreateGenericEnumerableFromObject(arg.EventObject);
+                if (eventObjects == null)
                 {
-                    //try to find the args entity in the latest entity - based on the equality operators, this will 
-                    //match by Id since that is the default equality checker for IEntity. If one is found, than it is 
-                    //the most recent entity instance so update the args with that instance so we don't emit a stale instance.
-                    var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, args.EventObject));
+                    // single object
+                    // look for a more recent entity for that object, and replace if any
+                    // works by "equalling" entities ie the more recent one "equals" this one (though different object)
+                    var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, arg.EventObject));
                     if (foundEntity != null)
-                    {
-                        args.EventObject = foundEntity;
-                    }
+                        arg.EventObject = foundEntity;
                 }
                 else
                 {
+                    // enumerable of objects
+                    // same as above but for each object
                     var updated = false;
-
-                    for (int i = 0; i < list.Count; i++)
+                    for (var i = 0; i < eventObjects.Count; i++)
                     {
-                        //try to find the args entity in the latest entity - based on the equality operators, this will 
-                        //match by Id since that is the default equality checker for IEntity. If one is found, than it is 
-                        //the most recent entity instance so update the args with that instance so we don't emit a stale instance.
-                        var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, list[i]));
-                        if (foundEntity != null)
-                        {
-                            list[i] = foundEntity;
-                            updated = true;
-                        }
+                        var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, eventObjects[i]));
+                        if (foundEntity == null) continue;
+                        eventObjects[i] = foundEntity;
+                        updated = true;
                     }
 
                     if (updated)
-                    {
-                        args.EventObject = list;
-                    }
+                        arg.EventObject = eventObjects;
                 }
             }
         }
 
-        /// <summary>
-        /// This will check against all of the processed entity/events (allEntities) to see if this entity already exists in 
-        /// event args that supersede the event args being passed in and if so returns true.
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="eventDef"></param>
-        /// <param name="allEntities"></param>
-        /// <returns></returns>
-        private static bool IsFiltered(
-            IEntity entity,
-            EventDefinitionTypeData eventDef,
-            List<Tuple<IEntity, EventDefinitionTypeData>> allEntities)
+        // determines if a given entity, appearing in a given event definition, should be filtered out,
+        // considering the entities that have already been visited - an entity is filtered out if it
+        // appears in another even definition, which superceedes this event definition.
+        private static bool IsSuperceeded(IEntity entity, EventDefinitionInfos infos, List<Tuple<IEntity, EventDefinitionInfos>> entities)
         {
-            var argType = eventDef.EventDefinition.Args.GetType();
+            //var argType = meta.EventArgsType;
+            var argType = infos.EventDefinition.Args.GetType();
 
-            //check if the entity is found in any processed event data that could possible supersede this one
-            var foundByEntity = allEntities
-                .Where(x => x.Item2.SupersedeAttributes.Length > 0
-                            //if it's the same arg type than it cannot supersede                
-                            && x.Item2.EventArgType != argType
-                            && Equals(x.Item1, entity))
+            // look for other instances of the same entity, coming from an event args that supercedes other event args,
+            // ie is marked with the attribute, and is not this event args (cannot supersede itself)
+            var superceeding = entities
+                .Where(x => x.Item2.SupersedeTypes.Length > 0 // has the attribute
+                    && x.Item2.EventDefinition.Args.GetType() != argType // is not the same
+                    && Equals(x.Item1, entity)) // same entity
                 .ToArray();
 
-            //no args have been processed with this entity so it should not be filtered
-            if (foundByEntity.Length == 0)
+            // first time we see this entity = not filtered
+            if (superceeding.Length == 0)
                 return false;
 
+            // fixme see notes above
+            // delete event args does NOT superceedes 'unpublished' event
+            if (argType.IsGenericType && argType.GetGenericTypeDefinition() == typeof(PublishEventArgs<>) && infos.EventDefinition.EventName == "UnPublished")
+                return false;
+
+            // found occurences, need to determine if this event args is superceded
             if (argType.IsGenericType)
             {
-                var supercededBy = foundByEntity
-                    .FirstOrDefault(x =>
-                        x.Item2.SupersedeAttributes.Any(y =>
-                            //if the attribute type is a generic type def then compare with the generic type def of the event arg
-                                (y.SupersededEventArgsType.IsGenericTypeDefinition && y.SupersededEventArgsType == argType.GetGenericTypeDefinition())
-                                //if the attribute type is not a generic type def then compare with the normal type of the event arg
-                                || (y.SupersededEventArgsType.IsGenericTypeDefinition == false && y.SupersededEventArgsType == argType)));
+                // generic, must compare type arguments
+                var supercededBy = superceeding.FirstOrDefault(x =>
+                    x.Item2.SupersedeTypes.Any(y =>
+                        // superceeding a generic type which has the same generic type definition
+                        // fixme no matter the generic type parameters? could be different?
+                        y.IsGenericTypeDefinition && y == argType.GetGenericTypeDefinition()
+                        // or superceeding a non-generic type which is ... fixme how is this ever possible? argType *is* generic?
+                        || y.IsGenericTypeDefinition == false && y == argType));
                 return supercededBy != null;
             }
             else
             {
-                var supercededBy = foundByEntity
-                    .FirstOrDefault(x =>
-                        x.Item2.SupersedeAttributes.Any(y =>
-                            //since the event arg type is not a generic type, then we just compare type 1:1
-                                y.SupersededEventArgsType == argType));
+                // non-generic, can compare types 1:1
+                var supercededBy = superceeding.FirstOrDefault(x =>
+                    x.Item2.SupersedeTypes.Any(y => y == argType));
                 return supercededBy != null;
             }
         }

src/Umbraco.Core/Events/UserGroupWithUsers.cs

@@ -0,0 +1,19 @@
+using System;
+using Umbraco.Core.Models.Membership;
+
+namespace Umbraco.Core.Events
+{
+    internal class UserGroupWithUsers
+    {
+        public UserGroupWithUsers(IUserGroup userGroup, IUser[] addedUsers, IUser[] removedUsers)
+        {
+            UserGroup = userGroup;
+            AddedUsers = addedUsers;
+            RemovedUsers = removedUsers;
+        }
+
+        public IUserGroup UserGroup { get; }
+        public IUser[] AddedUsers { get; }
+        public IUser[] RemovedUsers { get; }
+    }
+}

src/Umbraco.Core/HashGenerator.cs

@@ -14,7 +14,7 @@ namespace Umbraco.Core
     /// This will use the crypto libs to generate the hash and will try to ensure that 
     /// strings, etc... are not re-allocated so it's not consuming much memory.
     /// </remarks>
-    internal class HashGenerator : DisposableObject
+    internal class HashGenerator : DisposableObjectSlim
     {
         public HashGenerator()
         {

src/Umbraco.Core/HttpContextExtensions.cs

@@ -26,13 +26,13 @@ namespace Umbraco.Core
                 var ipAddress = httpContext.Request.ServerVariables["HTTP_X_FORWARDED_FOR"];
 
                 if (string.IsNullOrEmpty(ipAddress))
-                    return httpContext.Request.ServerVariables["REMOTE_ADDR"];
+                    return httpContext.Request.UserHostAddress;
 
                 var addresses = ipAddress.Split(',');
                 if (addresses.Length != 0)
                     return addresses[0];
 
-                return httpContext.Request.ServerVariables["REMOTE_ADDR"];
+                return httpContext.Request.UserHostAddress;
             }
             catch (System.Exception ex)
             {

src/Umbraco.Core/IO/FileSystemProviderManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using Umbraco.Core.Configuration;
@@ -26,6 +27,7 @@ namespace Umbraco.Core.IO
         private ShadowWrapper _xsltFileSystem;
         private ShadowWrapper _masterPagesFileSystem;
         private ShadowWrapper _mvcViewsFileSystem;
+        private ShadowWrapper _javaScriptLibraryFileSystem;
 
         #region Singleton & Constructor
 
@@ -113,6 +115,7 @@ namespace Umbraco.Core.IO
             var xsltFileSystem = new PhysicalFileSystem(SystemDirectories.Xslt);
             var masterPagesFileSystem = new PhysicalFileSystem(SystemDirectories.Masterpages);
             var mvcViewsFileSystem = new PhysicalFileSystem(SystemDirectories.MvcViews);
+            var javaScriptLibraryFileSystem = new PhysicalFileSystem(Path.Combine(SystemDirectories.Umbraco, "lib"));
 
             _macroPartialFileSystem = new ShadowWrapper(macroPartialFileSystem, "Views/MacroPartials", ScopeProvider);
             _partialViewsFileSystem = new ShadowWrapper(partialViewsFileSystem, "Views/Partials", ScopeProvider);
@@ -123,6 +126,7 @@ namespace Umbraco.Core.IO
             _xsltFileSystem = new ShadowWrapper(xsltFileSystem, "xslt", ScopeProvider);
             _masterPagesFileSystem = new ShadowWrapper(masterPagesFileSystem, "masterpages", ScopeProvider);
             _mvcViewsFileSystem = new ShadowWrapper(mvcViewsFileSystem, "Views", ScopeProvider);
+            _javaScriptLibraryFileSystem = new ShadowWrapper(javaScriptLibraryFileSystem, "Lib", ScopeProvider);
 
             // filesystems obtained from GetFileSystemProvider are already wrapped and do not need to be wrapped again
             MediaFileSystem = GetFileSystemProvider<MediaFileSystem>();
@@ -143,6 +147,7 @@ namespace Umbraco.Core.IO
         public IFileSystem2 XsltFileSystem { get { return _xsltFileSystem; } }
         public IFileSystem2 MasterPagesFileSystem { get { return _mvcViewsFileSystem; } }
         public IFileSystem2 MvcViewsFileSystem { get { return _mvcViewsFileSystem; } }
+        internal IFileSystem2 JavaScriptLibraryFileSystem { get { return _javaScriptLibraryFileSystem; } }
         public MediaFileSystem MediaFileSystem { get; private set; }
 
         #endregion

src/Umbraco.Core/IO/IOHelper.cs

@@ -13,11 +13,28 @@ using Umbraco.Core.Configuration;
 namespace Umbraco.Core.IO
 {
 	public static class IOHelper
-    {
+	{
+        /// <summary>
+        /// Gets or sets a value forcing Umbraco to consider it is non-hosted.
+        /// </summary>
+        /// <remarks>This should always be false, unless unit testing.</remarks>
+	    public static bool ForceNotHosted { get; set; }
+
         private static string _rootDir = "";
 
         // static compiled regex for faster performance
         private readonly static Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+
+        /// <summary>
+        /// Gets a value indicating whether Umbraco is hosted.
+        /// </summary>
+	    public static bool IsHosted
+	    {
+	        get
+	        {
+	            return ForceNotHosted == false && (HttpContext.Current != null || HostingEnvironment.IsHosted);
+            }
+	    }
 
         public static char DirSepChar
         {
@@ -72,14 +89,14 @@ namespace Umbraco.Core.IO
         internal static string ResolveUrlsFromTextString(string text)
         {
             if (UmbracoConfig.For.UmbracoSettings().Content.ResolveUrlsFromTextString)
-            {				
+            {
 				using (DisposableTimer.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete"))
 				{
 					// find all relative urls (ie. urls that contain ~)
 					var tags = ResolveUrlPattern.Matches(text);
-					
+
 					foreach (Match tag in tags)
-					{						
+					{
 						string url = "";
 						if (tag.Groups[1].Success)
 							url = tag.Groups[1].Value;
@@ -97,7 +114,8 @@ namespace Umbraco.Core.IO
 
         public static string MapPath(string path, bool useHttpContext)
         {
-            if (path == null) throw new ArgumentNullException("path");
+            if (path == null) throw new ArgumentNullException("path");
+            useHttpContext = useHttpContext && IsHosted;
 
             // Check if the path is already mapped
             if ((path.Length >= 2 && path[1] == Path.VolumeSeparatorChar)
@@ -303,7 +321,7 @@ namespace Umbraco.Core.IO
             var debugFolder = Path.Combine(binFolder, "debug");
             if (Directory.Exists(debugFolder))
                 return debugFolder;
-#endif   
+#endif
             var releaseFolder = Path.Combine(binFolder, "release");
             if (Directory.Exists(releaseFolder))
                 return releaseFolder;

src/Umbraco.Core/IO/MediaFileSystem.cs

@@ -17,15 +17,15 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.IO
 {
-	/// <summary>
-	/// A custom file system provider for media
-	/// </summary>
-	[FileSystemProvider("media")]
-	public class MediaFileSystem : FileSystemWrapper
-	{
-	    private readonly IContentSection _contentConfig;
+    /// <summary>
+    /// A custom file system provider for media
+    /// </summary>
+    [FileSystemProvider("media")]
+    public class MediaFileSystem : FileSystemWrapper
+    {
+        private readonly IContentSection _contentConfig;
         private readonly UploadAutoFillProperties _uploadAutoFillProperties;
-	    private readonly ILogger _logger;
+        private readonly ILogger _logger;
 
         private readonly object _folderCounterLock = new object();
         private long _folderCounter;
@@ -39,8 +39,8 @@ namespace Umbraco.Core.IO
         };
 
         public MediaFileSystem(IFileSystem wrapped)
-			: this(wrapped, UmbracoConfig.For.UmbracoSettings().Content, ApplicationContext.Current.ProfilingLogger.Logger)
-		{ }
+            : this(wrapped, UmbracoConfig.For.UmbracoSettings().Content, ApplicationContext.Current.ProfilingLogger.Logger)
+        { }
 
         public MediaFileSystem(IFileSystem wrapped, IContentSection contentConfig, ILogger logger)
             : base(wrapped)
@@ -60,13 +60,13 @@ namespace Umbraco.Core.IO
 
         [Obsolete("This low-level method should NOT exist.")]
         public string GetRelativePath(int propertyId, string fileName)
-		{
+        {
             var sep = _contentConfig.UploadAllowDirectories
-				? Path.DirectorySeparatorChar
-				: '-';
+                ? Path.DirectorySeparatorChar
+                : '-';
 
-			return propertyId.ToString(CultureInfo.InvariantCulture) + sep + fileName;
-		}
+            return propertyId.ToString(CultureInfo.InvariantCulture) + sep + fileName;
+        }
 
         [Obsolete("This low-level method should NOT exist.", false)]
         public string GetRelativePath(string subfolder, string fileName)
@@ -264,7 +264,7 @@ namespace Umbraco.Core.IO
             var filename = Path.GetFileName(sourcepath);
             var filepath = GetMediaPath(filename, content.Key, propertyType.Key);
             this.CopyFile(sourcepath, filepath);
-            
+
             return filepath;
         }
 
@@ -321,7 +321,7 @@ namespace Umbraco.Core.IO
         /// <param name="filepath"></param>
         /// <param name="filestream"></param>
         private void SetUploadFile(IContentBase content, Property property, string filepath, Stream filestream)
-        {            
+        {
             // will use filepath for extension, and filestream for length
             _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream);
         }
@@ -368,19 +368,20 @@ namespace Umbraco.Core.IO
                         return new Size(width, height);
                     }
                 }
+
+                //we have no choice but to try to read in via GDI
+                using (var image = Image.FromStream(stream))
+                {
+
+                    var fileWidth = image.Width;
+                    var fileHeight = image.Height;
+                    return new Size(fileWidth, fileHeight);
+                }
             }
             catch (Exception)
             {
                 //We will just swallow, just means we can't read exif data, we don't want to log an error either
-            }
-
-            //we have no choice but to try to read in via GDI
-            using (var image = Image.FromStream(stream))
-            {
-
-                var fileWidth = image.Width;
-                var fileHeight = image.Height;
-                return new Size(fileWidth, fileHeight);
+                return new Size(Constants.Conventions.Media.DefaultSize, Constants.Conventions.Media.DefaultSize);
             }
         }
 
@@ -430,8 +431,8 @@ namespace Umbraco.Core.IO
             }
         }
 
-	    public void DeleteMediaFiles(IEnumerable<string> files)
-	    {
+        public void DeleteMediaFiles(IEnumerable<string> files)
+        {
             files = files.Distinct();
 
             Parallel.ForEach(files, file =>

src/Umbraco.Core/IO/PhysicalFileSystem.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.IO
@@ -107,7 +108,7 @@ namespace Umbraco.Core.IO
 
             try
             {
-                Directory.Delete(fullPath, recursive);
+                WithRetry(() => Directory.Delete(fullPath, recursive));
             }
             catch (DirectoryNotFoundException ex)
             {
@@ -225,8 +226,8 @@ namespace Umbraco.Core.IO
                 return;
 
             try
-            {
-                File.Delete(fullPath);
+            {
+                WithRetry(() => File.Delete(fullPath));
             }
             catch (FileNotFoundException ex)
             {
@@ -378,7 +379,7 @@ namespace Umbraco.Core.IO
             {
                 if (overrideIfExists == false)
                     throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
-                File.Delete(fullPath);
+                WithRetry(() => File.Delete(fullPath));
             }
 
             var directory = Path.GetDirectoryName(fullPath);
@@ -386,9 +387,9 @@ namespace Umbraco.Core.IO
             Directory.CreateDirectory(directory); // ensure it exists
 
             if (copy)
-                File.Copy(physicalPath, fullPath);
+                WithRetry(() => File.Copy(physicalPath, fullPath));
             else
-                File.Move(physicalPath, fullPath);
+                WithRetry(() => File.Move(physicalPath, fullPath));
         }
 
         #region Helper Methods
@@ -417,6 +418,35 @@ namespace Umbraco.Core.IO
             return path;
         }
 
+        protected void WithRetry(Action action)
+        {
+            // 10 times 100ms is 1s
+            const int count = 10;
+            const int pausems = 100;
+
+            for (var i = 0;; i++)
+            {
+                try
+                {
+                    action();
+                    break; // done
+                }
+                catch (IOException e)
+                {
+                    // if it's not *exactly* IOException then it could be
+                    // some inherited exception such as FileNotFoundException,
+                    // and then we don't want to retry
+                    if (e.GetType() != typeof(IOException)) throw;
+
+                    // if we have tried enough, throw, else swallow
+                    // the exception and retry after a pause
+                    if (i == count) throw;
+                }
+
+                Thread.Sleep(pausems);
+            }
+        }
+
         #endregion
     }
 }

src/Umbraco.Core/IO/SystemDirectories.cs

@@ -203,7 +203,6 @@ namespace Umbraco.Core.IO
         {
             get
             {
-                //by default the packages folder should exist in the data folder
                 return IOHelper.ReturnPath("umbracoPreviewPath", Data + IOHelper.DirSepChar + "preview");
             }
         }

src/Umbraco.Core/IO/SystemFiles.cs

@@ -37,6 +37,7 @@ namespace Umbraco.Core.IO
             }
         }
 
+        [Obsolete("This file is no longer used and should not be accessed!")]
         public static string MetablogConfig
         {
             get
@@ -73,19 +74,19 @@ namespace Umbraco.Core.IO
         {
             get
             {
-                switch (GlobalSettings.ContentCacheXmlStorageLocation)
+                switch (GlobalSettings.LocalTempStorageLocation)
                 {                    
-                    case ContentXmlStorage.AspNetTemp:
+                    case LocalTempStorage.AspNetTemp:
                         return Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco.config");
-                    case ContentXmlStorage.EnvironmentTemp:
+                    case LocalTempStorage.EnvironmentTemp:
                         var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
-                        var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoXml",
-                            //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
-                            // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
-                            // utilizing an old path
+                        var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                            //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                            // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                            // utilizing an old path
                             appDomainHash);
                         return Path.Combine(cachePath, "umbraco.config");
-                    case ContentXmlStorage.Default:
+                    case LocalTempStorage.Default:
                         return IOHelper.ReturnPath("umbracoContentXML", "~/App_Data/umbraco.config");
                     default:
                         throw new ArgumentOutOfRangeException();

src/Umbraco.Core/Logging/RollingFileCleanupAppender.cs

@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+using log4net.Appender;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+    /// <summary>
+    /// This class will do the exact same thing as the RollingFileAppender that comes from log4net
+    /// With the extension, that it is able to do automatic cleanup of the logfiles in the directory where logging happens
+    /// 
+    /// By specifying the properties MaxLogFileDays and BaseFilePattern, the files will automaticly get deleted when
+    /// the logger is configured(typically when the app starts). To utilize this appender swap out the type of the rollingFile appender
+    /// that ships with Umbraco, to be Umbraco.Core.Logging.RollingFileCleanupAppender, and add the maxLogFileDays and baseFilePattern elements 
+    /// to the configuration i.e.:
+    /// 
+    /// <example>
+    ///  <appender name="rollingFile" type="Log4netAwesomeness.CustomRollingFileAppender, Log4netAwesomeness">
+    ///	  <file type="log4net.Util.PatternString" value="App_Data\Logs\UmbracoTraceLog.%property{log4net:HostName}.txt" />
+    ///    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    ///    <appendToFile value="true" />
+    ///    <rollingStyle value="Date" />
+    ///    <maximumFileSize value="5MB" />
+    ///    <maxLogFileDays value="5"/>
+    ///    <basefilePattern value="UmbracoTraceLog.*.txt.*"/>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <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>
+    /// </example>
+    /// </summary>
+    public class RollingFileCleanupAppender : RollingFileAppender
+    {
+        public int MaxLogFileDays { get; set; }
+        public string BaseFilePattern { get; set; }
+
+        /// <summary>
+        /// This override will delete logs older than the specified amount of days
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="append"></param>
+        protected override void OpenFile(string fileName, bool append)
+        {
+            bool cleanup = true;
+            // Validate settings and input
+            if (MaxLogFileDays <= 0)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'MaxLogFileDays' needs to be a positive integer, aborting cleanup");
+                cleanup = false;
+            }
+
+            if (string.IsNullOrWhiteSpace(BaseFilePattern))
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'BaseFilePattern' is empty, aborting cleanup");
+                cleanup = false;
+            }
+            // grab the directory we are logging to, as this is were we will search for older logfiles
+            var logFolder = Path.GetDirectoryName(fileName);
+            if (Directory.Exists(logFolder) == false)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), string.Format("Directory '{0}' for logfiles does not exist, aborting cleanup", logFolder));
+                cleanup = false;
+            }
+            // If everything is validated, we can do the actual cleanup
+            if (cleanup)
+            {
+                Cleanup(logFolder);
+            }
+
+            base.OpenFile(fileName, append);
+        }
+
+        private void Cleanup(string directoryPath)
+        {
+            // only take files that matches the pattern we are using i.e. UmbracoTraceLog.*.txt.*
+            string[] logFiles = Directory.GetFiles(directoryPath, BaseFilePattern);
+            LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Found {0} files that matches the baseFilePattern: '{1}'", logFiles.Length, BaseFilePattern));
+
+            foreach (var logFile in logFiles)
+            {
+                DateTime lastAccessTime = System.IO.File.GetLastWriteTimeUtc(logFile);
+                // take the value from the config file
+                if (lastAccessTime < DateTime.Now.AddDays(-MaxLogFileDays))
+                {
+                    LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Deleting file {0} as its lastAccessTime is older than {1} days speficied by MaxLogFileDays", logFile, MaxLogFileDays));
+                    base.DeleteFile(logFile);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs

@@ -3,10 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
-using System.Linq;
+using umbraco.interfaces;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
-using umbraco.interfaces;
 
 namespace Umbraco.Core.Macros
 {