Backport of https://github.com/umbraco/Umbraco-CMS/pull/15437

bump version
Merge pull request from GHSA-cfr5-7p54-4qg8
2023-12-12 15:54:37 +01:00 · 2023-12-12 15:14:11 +01:00 · 2023-12-11 13:59:59 +01:00 · 2023-12-11 13:59:35 +01:00 · 2023-12-11 13:39:56 +01:00 · 2023-12-11 13:01:21 +01:00
2359 changed files with 82796 additions and 23149 deletions
@@ -39,7 +39,7 @@ To build Umbraco, fire up PowerShell and move to Umbraco's repository root (the

    build/build.ps1
    
-If you only see a build.bat-file, you're probably on the wrong branch. If you switch to the correct branch (dev-v8) the file will appear and you can build it.
+If you only see a build.bat-file, you're probably on the wrong branch. If you switch to the correct branch (v8/contrib) the file will appear and you can build it.

 You might run into [Powershell quirks](#powershell-quirks).

@@ -1,32 +1,92 @@
-# 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:
+# Umbraco Code of Conduct

-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).
+## Preamble

-## Be a Friend
+We are the friendly CMS. And our friendliness stems from our values. That's why we have set for ourselves, Umbraco HQ, and the community, five values to guide us in everything we do:  

-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 - We believe in and empower  people
+* Respect - We treat others as we would like to be treated
+* Open - We share our thoughts and knowledge 
+* Hungry - We want to do things better, best is next 
+* Friendly - We want to build long-lasting relationships

-## Trust
+With these values in mind, we want to offer the Umbraco community a code of conduct that specifies a baseline standard of behavior so that people with different social values and communication styles can work together.  

-Assume positive intent and try to understand before being understood.
+This code of conduct is based on the widely used Contributor Covenant, as described in [https://www.contributor-covenant.org/](https://www.contributor-covenant.org/)  

-## Respect
+## Our Pledge

-Treat others as you would like to be treated.
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.  

-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.
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.  

-## Open
+## Our Standards
+Examples of behavior that contributes to a positive environment for our community include:  

-Be honest and straightforward. Tell it as it is. Share thoughts and knowledge and engage in collaboration.
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community

-## Hungry
+Examples of unacceptable behavior include:  

-Don't rest on your laurels and never accept the status quo. Contribute and give back to fellow Umbracians.
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting

-## Friendly
+## Enforcement Responsibilities

-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 build long lasting relationships.
+Community leaders (e.g. Meetup & festival organizers, moderators, maintainers, ...) are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.  
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.  
+
+Specific enforcement steps are listed in the [Code of Conduct Enforcement Guidelines](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/.github/CODE_OF_CONDUCT_ENFORCEMENT.md) document which is an appendix of this document, updated and maintained by the Code of Conduct Team.
+
+## Scope
+This Code of Conduct applies within all community spaces and events supported by Umbraco HQ or using the Umbraco name. It also applies when an individual is officially representing the community in public spaces. 
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior, may be reported at [conduct@umbraco.com](mailto:conduct@umbraco.com). All complaints will be reviewed and investigated promptly and fairly.  
+
+Or alternatively, you can reach out directly to any of the team members behind the address above:  
+
+* Sebastiaan Janssen (He, Him - Languages spoken: English, Dutch, Danish(Read)) [sebastiaan@umbraco.com](mailto:sebastiaan@umbraco.com)
+* Ilham Boulghallat (She, Her - Languages spoken: English, French, Arabic) [ilham@umbraco.com](mailto:ilham@umbraco.com)
+* Arnold Visser (He, Him - Languages spoken: English, Dutch) [arnold@umbraco.com](mailto:arnold@umbraco.com)
+
+The review process is done with full respect for the privacy and security of the reporter of any incident.  
+
+People with a conflict of interest should exclude themselves or if necessary be excluded by the other team members.  
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+**1. Correction**  
+Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.  
+
+Consequence: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+**2. Warning**  
+Community Impact: A violation through a single incident or series of actions.  
+
+Consequence: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+**3. Temporary Ban**  
+Community Impact: A serious violation of community standards, including sustained inappropriate behavior.  
+
+Consequence: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+**4. Permanent Ban**  
+Community Impact: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.  
+
+Consequence: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+This Code of Conduct is adapted from the Contributor Covenant, version 2.0, available at [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html).  
+
+This Code of Conduct will be maintained and reviewed by the team listed above. 
@@ -0,0 +1,57 @@
+# Umbraco Code of Conduct Enforcement guidelines - Consequence Ladder  
+
+These are the steps followed by the [Umbraco Code of Conduct Team](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/.github/CODE_OF_CONDUCT.md) when we respond to an issue or incident brought to our attention by a community member.  
+
+This is an appendix to the Code of Conduct and is updated and maintained by the Code of Conduct Team.  
+
+To make sure that all reports will be reviewed and investigated promptly and fairly, as highlighted in the Umbraco Code of Conduct, we are following [Mozilla’s Consequence Ladder approach](https://github.com/mozilla/inclusion/blob/master/code-of-conduct-enforcement/consequence-ladder.md).  
+
+This approach helps the Team enforce the Code of Conduct in a structured manner and can be used as a way of communicating escalation. Each time the Team takes an action (warning, ban) the individual is made aware of future consequences. The Team can either follow the order of the levels in the ladder or decide to jump levels. When needed, the team can go directly to a permanent ban.  
+
+**Level 0: No Action**  
+Recommendations do not indicate a violation of the Code of Conduct.  
+
+**Level 1: Simple Warning Issued**  
+A private, written warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior.  
+
+**Level 2: Warning**  
+A private, written warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* Communication of next-level consequences if behaviors are repeated (according to this ladder).  
+
+**Level 3: Warning + Mandatory Cooling Off Period (Access Retained)**  
+A private warning from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* Request to avoid interaction on community messaging platforms (public forums, Our, commenting on issues).  
+  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to this ladder.  
+* Require they do not interact with others in the report, or those who they suspect are involved in the report.  
+* Suggestions for 'out of office' type of message on platforms, to reduce curiosity, or suspicion among those not involved.  
+
+**Level 4: Temporary Ban (Access Revoked)**  
+Private communication of ban from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* 3-6 months imposed break.  
+* All accounts deactivated, or blocked during this time (Our, HQ Slack if applicable).  
+* Require to avoid interaction on community messaging platforms (public forums, Our, commenting on issues).  
+  * This includes avoiding any interactions in any Umbraco channels, spaces/offices, as well as external channels like social media (e.g. Twitter, Facebook, LinkedIn). For example, 'following/liking/retweeting' would be considered a violation of these terms, and consequence would escalate according to this ladder.  
+* All community leadership roles (e.g. Community Teams, Meetup/festival organizer, Commit right on Github..) suspended. (onboarding/reapplication required outside of this process)  
+* No attendance at Umbraco events during the ban period.  
+* Not allowed to enter Umbraco HQ offices during the ban period.  
+* Permission to use the MVP title, if applicable, is revoked during this ban period.  
+* The community leaders running events and other initiatives are informed of the ban.  
+
+**Level 5: Permanent Ban**  
+Private communication of ban from the Code of Conduct Team, with clarity of violation, consequences of continued behavior. Additionally:  
+
+* All accounts deactivated permanently.  
+* No attendance at Umbraco events going forward.  
+* Not allowed to enter Umbraco HQ offices permanently.  
+* All community leadership roles (e.g. Community Teams, Meetup/festival organizer, Commit right on Github..) permanently suspended.  
+* Permission to use the MVP title, if applicable, revoked.  
+* The community leaders running events and other initiatives are informed of the ban.  
+
+
+Sources:  
+* [Mozilla Code of Conduct - Enforcement Consequence Ladder](https://github.com/mozilla/inclusion/blob/master/code-of-conduct-enforcement/consequence-ladder.md)  
+* [Drupal Conflict Resolution Policy and Process](https://www.drupal.org/conflict-resolution)  
+* [Django Code of Conduct - Enforcement Manual](https://www.djangoproject.com/conduct/enforcement-manual/)  
@@ -16,6 +16,7 @@ This project and everyone participating in it, is governed by the [our Code of C

 [Contributing code changes](#contributing-code-changes)
  * [Guidelines for contributions we welcome](#guidelines-for-contributions-we-welcome)
+    * [Ownership and copyright](#ownership-and-copyright)
  * [What can I start with?](#what-can-i-start-with)
  * [How do I begin?](#how-do-i-begin)
  * [Pull requests](#pull-requests)
@@ -44,6 +45,17 @@ We have [documented what we consider small and large changes](CONTRIBUTION_GUIDE

 Remember, it is always worth working on an issue from the `Up for grabs` list or even asking for some feedback before you send us a PR. This way, your PR will not be closed as unwanted.

+#### Ownership and copyright
+
+It is your responsibility to make sure that you're allowed to share the code you're providing us.   
+For example, you should have permission from your employer or customer to share code.  
+
+Similarly, if your contribution is copied or adapted from somewhere else, make sure that the license allows you to reuse that for a contribution to Umbraco-CMS. 
+
+If you're not sure, leave a note on your contribution and we will be happy to guide you.
+
+When your contribution has been accepted, it will be [MIT licensed](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/LICENSE.md) from that time onwards. 
+
 ### What can I start with?

 Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` issues](https://github.com/umbraco/Umbraco-CMS/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs+)
@@ -102,10 +114,11 @@ That said, the Umbraco development team likes to follow the hints that ReSharper

 The Core Contributors team consists of one member of Umbraco HQ, [Sebastiaan](https://github.com/nul800sebastiaan), who gets assistance from the following community members who have comitted to volunteering their free time:

- [Anders Bjerner](https://github.com/abjerner)
- [Emma Burstow](https://github.com/emmaburstow)
- [Poornima Nayar](https://github.com/poornimanayar)
- [Kenn Jacobsen](https://twitter.com/KennJacobsen_DK)
+- [Nathan Woulfe](https://github.com/nathanwoulfe)
+- [Joe Glombek](https://github.com/glombek)
+- [Laura Weatherhead](https://github.com/lssweatherhead)
+- [Michael Latouche](https://github.com/mikecp)
+- [Owain Williams](https://github.com/OwainWilliams)


 These wonderful people aim to provide you with a first reply to your PR, review and test out your changes and on occasions, they might ask more questions. If they are happy with your work, they'll let Umbraco HQ know by approving the PR. Hq will have final sign-off and will check the work again before it is merged. 
@@ -123,12 +136,12 @@ You can get in touch with [the core contributors team](#the-core-contributors-te

 In order to build the Umbraco source code locally, first make sure you have the following installed.

-  * [Visual Studio 2017 v15.9.7+](https://visualstudio.microsoft.com/vs/)
+  * [Visual Studio 2019 v16.8+ (with .NET Core 3.0)](https://visualstudio.microsoft.com/vs/)
  * [Node.js v10+](https://nodejs.org/en/download/)
  * npm v6.4.1+ (installed with Node.js)
  * [Git command line](https://git-scm.com/download/)

-The easiest way to get started is to open `src\umbraco.sln` in Visual Studio 2017 (version 15.9.7 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
+The easiest way to get started is to open `src\umbraco.sln` in Visual Studio 2019 (version 16.3 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.

 Alternatively, you can run `build.ps1` from the Powershell command line, 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.

@@ -0,0 +1,52 @@
+---
+name: 🐛 Bug Report
+description: "File a bug report, if you've discovered a problem in Umbraco."
+labels: "type/bug"
+body:
+- type: input
+  id: "version"
+  attributes:
+    label: "Which *exact* Umbraco version are you using? For example: 8.13.1 - don't just write v8"
+    description: "Use the help icon in the Umbraco backoffice to find the version you're using"
+  validations:
+    required: true
+- type: textarea
+  id: "summary"
+  attributes:
+    label: "Bug summary"
+    description: "Write a short summary of the bug."
+    placeholder: >
+      Try to pinpoint it as much as possible.
+      
+      Try to state the actual problem, and not just what you think the solution might be.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Specifics"
+    id: "specifics"
+    description: "Remember that you can format code and logs nicely with the `<>` button"
+    placeholder: >
+      Mention the URL where this bug occurs, if applicable
+      
+      Please mention if you've checked it in other browsers as well
+      
+      Please include full error messages and screenshots, gifs or mp4 videos if applicable
+- type: textarea
+  attributes:
+    label: "Steps to reproduce"
+    id: "reproduction"
+    description: "How can we reproduce the problem on a clean Umbraco install?"
+    placeholder: >
+      Please include screenshots, gifs or mp4 videos if applicable
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Expected result / actual result"
+    id: "result"
+    description: "What did you expect that would happen on your Umbraco site and what is the actual result of the above steps?"
+    placeholder: >
+      Describe the intended/desired outcome after you did the steps mentioned.
+      
+      Describe the behaviour of the bug
@@ -1,66 +0,0 @@
---
-name: 🐛 Bug Report
-about: File a bug report, if you've discovered a problem in Umbraco.
---
-
-A brief description of the issue goes here.
-
-<!--
-
-Please fill 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.
-
-->
-
-## Umbraco version
-
-I am seeing this issue on Umbraco version: <!-- please note the version here -->
-
-
-Reproduction
------------
-
-If you're filing a bug, please describe how to reproduce it. Include as much
-relevant information as possible, such as:
-
-### Bug summary
-
-<!--
-    * Write a short summary of the bug
-    * Try to pinpoint it as much as possible
-    * Try to state the _actual problem_, and not just what you _think_ the
-      solution might be.
-->
-
-### Specifics
-
-<!--
-    * Mention the URL where this bug occurs, if applicable
-    * What version of Umbraco are you using (down to the very last digit!)
-    * What browser and version you are using
-    * Please mention if you've checked it in other browsers as well
-    * Please include *full error messages* and *screenshots* if possible
-->
-
-### Steps to reproduce
-
-<!--
-    * Clearly mention the steps to reproduce the bug
-->
-
-### Expected result
-
-<!--
-    * What did you _expect_ that would happen on your Umbraco site?
-    * Describe the intended/desired outcome after you did the steps mentioned.
-->
-
-### Actual result
-
-<!--
-    * What is the actual result of the above steps?
-    * Describe the behaviour of the bug
-    * Please, please include **error messages** and screenshots. They might mean
-      nothing to you, but they are _very_ helpful to us.
-->
@@ -1,31 +0,0 @@
---
-name:  📮 Feature Request
-about: Open a feature request, if you want to propose a new feature.
---
-
-A brief description of your feature request goes here.
-
-
-<!--
-If you want to discuss the feature you're imagining, please make sure to keep
-those discussions on the forum at https://our.umbraco.com/ (choose the
-category "Contributing to Umbraco", Umbraco HQ follows all new topics there).
-
-Once you've come to a conclusion in the discussion, feel free to propose the
-new feature here. 
-->
-
-How can you help?
-------------------------------
-
-<!--
-The resources (read: available time and effort) of Umbraco's core team are
-limited.
-
-If we can not work on your suggestion, please don't take it personally. Most
-likely, it's either:
-
- - We think your idea is valid, but we can't find the time to work on it.
- - Your idea might be better suited as a package, if it's not suitable for
-   the majority of users.
-->
@@ -1,9 +0,0 @@
---
-name: ⁉️ Support Question
-about: Having trouble with Umbraco? -> https://our.umbraco.com
---
-
-This issue tracker is NOT meant for support questions. If you have a question,
-please join us on the forum at https://our.umbraco.com.
-
-Thanks!
@@ -1,9 +0,0 @@
---
-name: 📖 Documentation Issue
-about: See https://github.com/umbraco/UmbracoDocs/issues for documentation issues
---
-
-The Umbraco documentation has its own dedicated repository. Please open your
-documentation-related issue at https://github.com/umbraco/UmbracoDocs/issues
-
-Thanks!
@@ -1,31 +0,0 @@
---
-name: 🔐 Security Issue
-about: Discovered a Security Issue in Umbraco?
---
-
-⚠️ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
-
-If you have found a security issue in Umbraco, please send the details to
-security@umbraco.com and don't disclose it publicly until we can provide a fix for
-it. If you wish, we'll credit you for finding verified issues, when we release
-the patched version.
-
-❗ Please read more about how to report security issues on https://umbraco.com/security
-
-A note on "Self XSS"
--------------------
-
-Umbraco is a CMS, that allows users to edit content on a website. As such,
-all _authenticated users_ can:
-
- - Edit content, and (depending on the field types) insert HTML and CSS in that
-   content, with a variety of allowed attributes.
- - Depending on the user level: Edit template files, and insert C#, HTML, CSS and
-   javascript in so on.
- - Upload files to the site, which will become publicly available.
-
-We see these functionalities as _features_, and not as security issues. Please
-report the mentioned items only if they can be performed by non-authorized
-users, or other exploitable vulnerabilities.
-
-Thanks!
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+    - name: 💡 Features and ideas
+      url: https://github.com/umbraco/Umbraco-CMS/discussions/new?category=features-and-ideas
+      about: Start a new discussion when you have ideas or feature requests, eventually discussions can turn into plans
+    - name: ⁉️ Support Question
+      url: https://our.umbraco.com
+      about: This issue tracker is NOT meant for support questions. If you have a question, please join us on the forum.
+    - name: 📖 Documentation Issue
+      url: https://github.com/umbraco/UmbracoDocs/issues
+      about: Documentation issues should be reported on the Umbraco documentation repository.
+    - name: 🔐 Security Issue
+      url: https://umbraco.com/about-us/trust-center/security-and-umbraco/how-to-report-a-vulnerability-in-umbraco/
+      about: Discovered a Security Issue in Umbraco?
@@ -0,0 +1,14 @@
+name: "CodeQL config"
+on:
+  push:
+    branches: [v8/contrib,v8/dev]
+paths-ignore: 
+  - node_modules
+  - Umbraco.TestData
+  - Umbraco.Tests
+  - Umbraco.Tests.AcceptanceTest
+  - Umbraco.Tests.Benchmarks
+  - bin
+  - build.tmp
+paths:
+  - src   
@@ -0,0 +1,68 @@
+name: "Code scanning - action"
+
+on:
+  push:
+    branches: [v8/contrib,v8/dev,v8/bug,v8/feature]
+  pull_request:
+    # The branches below must be a subset of the branches above
+  schedule:
+    - cron: '0 7 * * 2'
+
+jobs:
+  CodeQL-Build:
+
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+    
+    - name: configure Pagefile
+      uses: al-cheb/configure-pagefile-action@v1.2
+      with:
+          minimum-size: 8GB
+          maximum-size: 32GB
+          
+    - run: |
+        echo "Run Umbraco-CMS build"
+        pwsh -command .\build\build.ps1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
+      with:
+        config-file: ./.github/config/codeql-config.yml
+        
+  # This job is to prevent the workflow status from showing as failed when all other jobs are skipped - See https://github.community/t/workflow-is-failing-if-no-job-can-be-ran-due-to-condition/16873
+  always_job:
+    name: Always run job
+    runs-on: ubuntu-latest    
+    steps:
+      - name: Always run
+        run: echo "This job is to prevent the workflow status from showing as failed when all other jobs are skipped"
+
@@ -167,6 +167,7 @@ build/temp/
 # eof
 /src/Umbraco.Web.UI.Client/TESTS-*.xml
 /src/ApiDocs/api/*
+/src/Umbraco.Web.UI.Client/package-lock.json

 # Acceptance tests
 cypress.env.json
@@ -174,3 +175,6 @@ cypress.env.json
 /src/Umbraco.Tests.AcceptanceTest/package-lock.json
 /src/Umbraco.Tests.AcceptanceTest/cypress/videos/
 /src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
+src/Umbraco.Web.UI/Umbraco/telemetrics-id.umb
+
+/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -1,6 +1,6 @@
 # The MIT License (MIT) #

-Copyright (c) 2013-present Umbraco
+Copyright (c) 2005-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:

@@ -30,18 +30,18 @@
                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
                <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
                <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
-                <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
+                <dependency id="Newtonsoft.Json" version="[12.0.1,13.999999)" />
                <dependency id="Semver" version="[2.0.4,2.999999)" />
-                <dependency id="Serilog" version="[2.8.0,2.999999)" />
-                <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
-                <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
-                <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
-                <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
+                <dependency id="Serilog" version="[2.10.0,2.999999)" />
+                <dependency id="Serilog.Enrichers.Process" version="[2.0.2,2.999999)" />
+                <dependency id="Serilog.Enrichers.Thread" version="[3.1.0,3.999999)" />
+                <dependency id="Serilog.Filters.Expressions" version="[2.1.0,2.999999)" />
+                <dependency id="Serilog.Formatting.Compact" version="[1.1.0,1.999999)" />
+                <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.5,1.999999)" />
                <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
-                <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
-                <dependency id="Serilog.Sinks.Map" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Sinks.Async" version="[1.3.0,1.999999)" />
+                <dependency id="Serilog.Sinks.File" version="[4.1.0,4.999999)" />
+                <dependency id="Serilog.Sinks.Map" version="[1.0.2,1.999999)" />
+                <dependency id="Serilog.Sinks.Async" version="[1.5.0,1.999999)" />
                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
                <dependency id="NPoco" version="[3.9.4,3.999999)" />
            </group>
@@ -25,12 +25,12 @@
                  not want this to happen as the alpha of the next major is, really, the next major already.
                -->
                <dependency id="UmbracoCms.Core" version="[$version$]" />
-                <dependency id="ClientDependency" version="[1.9.9,1.999999)" />
+                <dependency id="ClientDependency" version="[1.9.10,1.999999)" />
                <dependency id="ClientDependency-Mvc5" version="[1.9.3,1.999999)" />
                <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.2,1.999999)" />
+                <dependency id="Examine" version="[1.2.2,1.999999)" />
                <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
-                <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
+                <dependency id="ImageProcessor" version="[2.9.1,2.999999)" />
                <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
                <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
                <dependency id="Markdown" version="[2.2.1,2.999999)" />
@@ -41,7 +41,14 @@
                <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
                <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
                <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
+                <dependency id="System.Buffers" version="[4.5.1,4.999999)" />
+                <dependency id="System.Numerics.Vectors" version="[4.5.0,4.999999)" />
+                <dependency id="System.Memory" version="[4.5.4,4.999999)" />
                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
+                <dependency id="System.Collections.Immutable" version="[1.7.1,1.999999)" />
+                <dependency id="System.Text.Encoding.CodePages" version="[4.7.1,4.999999)" />
+                <dependency id="MessagePack" version="[2.2.85,2.999999)" />
+                <dependency id="K4os.Compression.LZ4" version="[1.1.11,1.999999)" />

            </group>

@@ -26,8 +26,8 @@
                  not want this to happen as the alpha of the next major is, really, the next major already.
                -->
                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
-                <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
+                <dependency id="ImageProcessor.Web" version="[4.12.1,4.999999)" />
+                <dependency id="ImageProcessor.Web.Config" version="[2.6.0,2.999999)" />
                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />

            </group>
@@ -11,7 +11,7 @@ Y88   88Y 888  888  888 888 d88P 888    888  888 Y88b.    Y88..88P

 Don't forget to build!

-We've done our best to transform your configuration files but in case something is not quite right: we recommmend you look in source control for the previous version so you can find the original files before they were transformed.
+We've done our best to transform your configuration files but in case something is not quite right: we recommend you look in source control for the previous version so you can find the original files before they were transformed.

 This NuGet package includes build targets that extend the creation of a deploy package, which is generated by
 Publishing from Visual Studio. The targets will only work once Publishing is configured, so if you don't use
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+    <runtime xdt:Transform="InsertIfMissing" />
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Buffers')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Memory')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Numerics.Vectors')" xdt:Transform="Remove" />
+			<dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" />
+                <bindingRedirect oldVersion="4.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" />
+                <bindingRedirect oldVersion="4.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" />
+                <bindingRedirect oldVersion="4.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
@@ -1,139 +1,139 @@
 <?xml version="1.0"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections xdt:Transform="InsertIfMissing" />
-  <configSections>
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
-      <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-      <section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </sectionGroup>
-  </configSections>
+    <configSections xdt:Transform="InsertIfMissing" />
+    <configSections>
+        <sectionGroup name="applicationSettings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+        <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)">
+            <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+            <section name="dashBoard" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+            <section name="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" />
-  </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" />
+    </appSettings>

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

-  <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)" />
-    </DbProviderFactories>
-  </system.data>
-  <clientDependency xdt:Transform="RemoveAttributes(version)" />
+    <system.data xdt:Transform="InsertIfMissing" />
+    <system.data>
+        <DbProviderFactories xdt:Transform="InsertIfMissing" />
+        <DbProviderFactories>
+            <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)" />
+        </DbProviderFactories>
+    </system.data>

-  <system.web xdt:Transform="InsertIfMissing" />
-  <system.web>
-    <siteMap xdt:Transform="Remove" />
-    <httpRuntime xdt:Transform="InsertIfMissing" />
-    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
-    <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    <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" />
+    <system.web xdt:Transform="InsertIfMissing" />
+    <system.web>
+        <siteMap xdt:Transform="Remove" />
+        <httpRuntime xdt:Transform="InsertIfMissing" />
+        <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
+        <httpRuntime targetFramework="4.7.2" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+        <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" />
+        <xhtmlConformance xdt:Transform="Remove" />

-    <xhtmlConformance xdt:Transform="Remove" />
+        <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" />
+            <!-- Don't remove the leading space below, this is to fix a quirk 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.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
+        </httpModules>

-    <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.Web" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
-    </httpModules>
+        <httpHandlers xdt:Transform="InsertIfMissing" />
+        <httpHandlers>
+            <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove" />
+        </httpHandlers>
+    </system.web>

-    <httpHandlers xdt:Transform="InsertIfMissing" />
-    <httpHandlers>
-      <add path="GoogleSpellChecker.ashx" xdt:Locator="Match(path)" xdt:Transform="Remove"  />
-    </httpHandlers>
-  </system.web>
+    <system.webServer xdt:Transform="InsertIfMissing" />
+    <system.webServer>
+        <modules xdt:Transform="InsertIfMissing" />
+        <modules runAllManagedModulesForAllRequests="true" xdt:Transform="SetAttributes(runAllManagedModulesForAllRequests)" />
+        <modules>
+            <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" />
+            <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" />
+            <!-- Don't remove the leading space below, this is to fix a quirk 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.Web" 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" />
+        <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="font/woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+            <mimeMap fileExtension=".woff2" mimeType="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.Web" 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" />
+        <security>
+            <requestFiltering xdt:Transform="InsertIfMissing" />
+            <requestFiltering>
+                <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>
-
-  </system.webServer>
-
-  <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" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
-      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
-    </assemblyBinding>
-  </runtime>
-
- <runtime>
+    <runtime xdt:Transform="InsertIfMissing" />
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
        <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" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Buffers')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Memory')" xdt:Transform="Remove" />
+            <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Numerics.Vectors')" xdt:Transform="Remove" />
            <dependentAssembly xdt:Transform="Insert">
                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
@@ -156,7 +156,7 @@
            </dependentAssembly>
            <dependentAssembly xdt:Transform="Insert">
                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+                <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
            </dependentAssembly>
            <dependentAssembly xdt:Transform="Insert">
                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -174,23 +174,36 @@
                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" />
+                <bindingRedirect oldVersion="4.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" />
+                <bindingRedirect oldVersion="4.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" />
+                <bindingRedirect oldVersion="4.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+            </dependentAssembly>
        </assemblyBinding>
    </runtime>

-  <system.web.webPages.razor xdt:Transform="Remove" />
+    <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>
+    <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
+    <location path="umbraco" xdt:Locator="Match(path)">
+        <system.webServer xdt:Transform="InsertIfMissing" />
+        <system.webServer>
+            <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" />
+        <system.webServer>
+            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+        </system.webServer>
+    </location>
 </configuration>
@@ -34,6 +34,7 @@
    if (-not (test-path $nuget))
    {
      Write-Host "Download NuGet..."
+      [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
      Invoke-WebRequest $source -OutFile $nuget
      if (-not $?) { throw "Failed to download NuGet." }
    }
@@ -91,6 +91,7 @@
  {
    $src = "$($this.SolutionRoot)\src"
    $log = "$($this.BuildTemp)\belle.log"
+	

    Write-Host "Compile Belle"
    Write-Host "Logging to $log"
@@ -352,6 +353,14 @@
      "-x!dotless.Core.*" "-x!Content_Types.xml" "-x!*.pdb" `
      > $null
    if (-not $?) { throw "Failed to zip UmbracoCms." }
+	
+    Write-Host "Zip cms cloud"
+	$this.CopyFile("$($this.SolutionRoot)\build\NuSpecs\tools\Web.config.cloud.xdt", "$tmp\WebApp\Web.config.install.xdt")
+    &$this.BuildEnv.Zip a -r "$out\UmbracoCms.$($this.Version.Semver).Cloud.zip" `
+      "$tmp\WebApp\*" `
+      "-x!dotless.Core.*" "-x!Content_Types.xml" "-x!*.pdb" `
+      > $null
+    if (-not $?) { throw "Failed to zip UmbracoCms." }
  })

  $ubuild.DefineMethod("PrepareBuild",
@@ -553,7 +562,6 @@
  # run
  if (-not $get)
  {
-cd
    if ($command.Length -eq 0)
    {
      $command = @( "Build" )
@@ -15,8 +15,8 @@
    <div class="level{{item.level}}"><span class="xref">{{item.name.0.value}}</span></div>
 </div>
 {{/inheritance.0}}
-<h6><strong>{{__global.namespace}}</strong>:{{namespace}}</h6>
-<h6><strong>{{__global.assembly}}</strong>:{{assemblies.0}}.dll</h6>
+<h6><strong>{{__global.namespace}}</strong>: {{{namespace.specName.0.value}}}</h6>
+<h6><strong>{{__global.assembly}}</strong>: {{assemblies.0}}.dll</h6>
 <h5 id="{{id}}_syntax">{{__global.syntax}}</h5>
 <div class="codewrapper">
  <pre><code class="lang-{{_lang}} hljs">{{syntax.content.0.value}}</code></pre>
@@ -2,7 +2,7 @@
 using System.Resources;

 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2020")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]

 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.7.0")]
-[assembly: AssemblyInformationalVersion("8.7.0")]
+[assembly: AssemblyFileVersion("8.18.11")]
+[assembly: AssemblyInformationalVersion("8.18.11")]
@@ -6,8 +6,10 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// Represents the application caches.
    /// </summary>
-    public class AppCaches
+    public class AppCaches : IDisposable
    {
+        private bool _disposedValue;
+
        /// <summary>
        /// Initializes a new instance of the <see cref="AppCaches"/> for use in a web application.
        /// </summary>
@@ -82,5 +84,26 @@ namespace Umbraco.Core.Cache
        /// search through all keys on a global scale.</para>
        /// </remarks>
        public IsolatedCaches IsolatedCaches { get; }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    RuntimeCache.DisposeIfDisposable();
+                    RequestCache.DisposeIfDisposable();
+                    IsolatedCaches.Dispose();
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+        }
    }
 }
@@ -7,7 +7,7 @@ namespace Umbraco.Core.Cache
    /// Provides a base class for implementing a dictionary of <see cref="IAppPolicyCache"/>.
    /// </summary>
    /// <typeparam name="TKey">The type of the dictionary key.</typeparam>
-    public abstract class AppPolicedCacheDictionary<TKey>
+    public abstract class AppPolicedCacheDictionary<TKey> : IDisposable
    {
        private readonly ConcurrentDictionary<TKey, IAppPolicyCache> _caches = new ConcurrentDictionary<TKey, IAppPolicyCache>();

@@ -24,6 +24,7 @@ namespace Umbraco.Core.Cache
        /// Gets the internal cache factory, for tests only!
        /// </summary>
        internal readonly Func<TKey, IAppPolicyCache> CacheFactory;
+        private bool _disposedValue;

        /// <summary>
        /// Gets or creates a cache.
@@ -70,5 +71,27 @@ namespace Umbraco.Core.Cache
            foreach (var cache in _caches.Values)
                cache.Clear();
        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    foreach(var value in _caches.Values)
+                    {
+                        value.DisposeIfDisposable();
+                    }
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+        }
    }
-}
+}
@@ -12,5 +12,13 @@

        public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
        public const string MacroFromAliasCacheKey = "macroFromAlias_";
+
+        public const string UserAllContentStartNodesPrefix = "AllContentStartNodes";
+        public const string UserAllMediaStartNodesPrefix = "AllMediaStartNodes";
+        public const string UserMediaStartNodePathsPrefix = "MediaStartNodePaths";
+        public const string UserContentStartNodePathsPrefix = "ContentStartNodePaths";
+        
+        public const string ContentRecycleBinCacheKey = "recycleBin_content";
+        public const string MediaRecycleBinCacheKey = "recycleBin_media";
    }
 }
@@ -12,8 +12,10 @@ namespace Umbraco.Core.Cache
    /// instance, and ensuring that all inserts and returns are deep cloned copies of the cache item,
    /// when the item is deep-cloneable.
    /// </summary>
-    internal class DeepCloneAppCache : IAppPolicyCache
+    internal class DeepCloneAppCache : IAppPolicyCache, IDisposable
    {
+        private bool _disposedValue;
+
        /// <summary>
        /// Initializes a new instance of the <see cref="DeepCloneAppCache"/> class.
        /// </summary>
@@ -153,5 +155,24 @@ namespace Umbraco.Core.Cache

            return input;
        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    InnerCache.DisposeIfDisposable();
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+        }
    }
 }
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Cache
    internal class DefaultRepositoryCachePolicy<TEntity, TId> : RepositoryCachePolicyBase<TEntity, TId>
        where TEntity : class, IEntity
    {
-        private static readonly TEntity[] EmptyEntities = new TEntity[0]; // const
+        private static readonly TEntity[] s_emptyEntities = new TEntity[0]; // const
        private readonly RepositoryCachePolicyOptions _options;

        public DefaultRepositoryCachePolicy(IAppPolicyCache cache, IScopeAccessor scopeAccessor, RepositoryCachePolicyOptions options)
@@ -29,16 +29,24 @@ namespace Umbraco.Core.Cache
            _options = options ?? throw new ArgumentNullException(nameof(options));
        }

-        protected string GetEntityCacheKey(object id)
+        protected string GetEntityCacheKey(int id) => EntityTypeCacheKey + id;
+
+        protected string GetEntityCacheKey(TId id)
        {
-            if (id == null) throw new ArgumentNullException(nameof(id));
-            return GetEntityTypeCacheKey() + id;
+            if (EqualityComparer<TId>.Default.Equals(id, default))
+            {
+                return string.Empty;
+            }
+
+            if (typeof(TId).IsValueType)
+            {
+                return EntityTypeCacheKey + id;
+            }
+
+            return EntityTypeCacheKey + id.ToString().ToUpperInvariant();
        }

-        protected string GetEntityTypeCacheKey()
-        {
-            return $"uRepo_{typeof (TEntity).Name}_";
-        }
+        protected string EntityTypeCacheKey { get; } = $"uRepo_{typeof(TEntity).Name}_";

        protected virtual void InsertEntity(string cacheKey, TEntity entity)
        {
@@ -52,7 +60,7 @@ namespace Umbraco.Core.Cache
                // getting all of them, and finding nothing.
                // if we can cache a zero count, cache an empty array,
                // for as long as the cache is not cleared (no expiration)
-                Cache.Insert(GetEntityTypeCacheKey(), () => EmptyEntities);
+                Cache.Insert(EntityTypeCacheKey, () => s_emptyEntities);
            }
            else
            {
@@ -81,7 +89,7 @@ namespace Umbraco.Core.Cache
                }

                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                Cache.Clear(EntityTypeCacheKey);
            }
            catch
            {
@@ -91,7 +99,7 @@ namespace Umbraco.Core.Cache
                Cache.Clear(GetEntityCacheKey(entity.Id));

                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                Cache.Clear(EntityTypeCacheKey);

                throw;
            }
@@ -113,7 +121,7 @@ namespace Umbraco.Core.Cache
                }

                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                Cache.Clear(EntityTypeCacheKey);
            }
            catch
            {
@@ -123,7 +131,7 @@ namespace Umbraco.Core.Cache
                Cache.Clear(GetEntityCacheKey(entity.Id));

                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                Cache.Clear(EntityTypeCacheKey);

                throw;
            }
@@ -144,7 +152,7 @@ namespace Umbraco.Core.Cache
                var cacheKey = GetEntityCacheKey(entity.Id);
                Cache.Clear(cacheKey);
                // if there's a GetAllCacheAllowZeroCount cache, ensure it is cleared
-                Cache.Clear(GetEntityTypeCacheKey());
+                Cache.Clear(EntityTypeCacheKey);
            }
        }

@@ -195,7 +203,7 @@ namespace Umbraco.Core.Cache
            else
            {
                // get everything we have
-                var entities = Cache.GetCacheItemsByKeySearch<TEntity>(GetEntityTypeCacheKey())
+                var entities = Cache.GetCacheItemsByKeySearch<TEntity>(EntityTypeCacheKey)
                    .ToArray(); // no need for null checks, we are not caching nulls

                if (entities.Length > 0)
@@ -218,7 +226,7 @@ namespace Umbraco.Core.Cache
                {
                    // if none of them were in the cache
                    // and we allow zero count - check for the special (empty) entry
-                    var empty = Cache.GetCacheItem<TEntity[]>(GetEntityTypeCacheKey());
+                    var empty = Cache.GetCacheItem<TEntity[]>(EntityTypeCacheKey);
                    if (empty != null) return empty;
                }
            }
@@ -238,7 +246,7 @@ namespace Umbraco.Core.Cache
        /// <inheritdoc />
        public override void ClearAll()
        {
-            Cache.ClearByKey(GetEntityTypeCacheKey());
+            Cache.ClearByKey(EntityTypeCacheKey);
        }
    }
 }
@@ -13,9 +13,10 @@ namespace Umbraco.Core.Cache
    /// <summary>
    /// Implements <see cref="IAppPolicyCache"/> on top of a <see cref="ObjectCache"/>.
    /// </summary>
-    public class ObjectCacheAppCache : IAppPolicyCache
+    public class ObjectCacheAppCache : IAppPolicyCache, IDisposable
    {
        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+        private bool _disposedValue;

        /// <summary>
        /// Initializes a new instance of the <see cref="ObjectCacheAppCache"/>.
@@ -109,19 +110,34 @@ namespace Umbraco.Core.Cache

            Lazy<object> result;

-            using (var lck = new UpgradeableReadLock(_locker))
+            try
            {
+                _locker.EnterUpgradeableReadLock();
+
                result = MemoryCache.Get(key) as Lazy<object>;
                if (result == null || FastDictionaryAppCacheBase.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                {
                    result = FastDictionaryAppCacheBase.GetSafeLazy(factory);
                    var policy = GetPolicy(timeout, isSliding, removedCallback, dependentFiles);

-                    lck.UpgradeToWriteLock();
-                    //NOTE: This does an add or update
-                    MemoryCache.Set(key, result, policy);
+                    try
+                    {
+                        _locker.EnterWriteLock();
+                        //NOTE: This does an add or update
+                        MemoryCache.Set(key, result, policy);
+                    }
+                    finally
+                    {
+                        if (_locker.IsWriteLockHeld)
+                            _locker.ExitWriteLock();
+                    }
                }
            }
+            finally
+            {
+                if (_locker.IsUpgradeableReadLockHeld)
+                    _locker.ExitUpgradeableReadLock();
+            }

            //return result.Value;

@@ -360,5 +376,23 @@ namespace Umbraco.Core.Cache
            }
            return policy;
        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    _locker.Dispose();
+                }
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+        }
    }
 }
@@ -11,7 +11,7 @@ namespace Umbraco.Core.Cache
    /// Implements <see cref="IAppPolicyCache"/> on top of a <see cref="System.Web.Caching.Cache"/>.
    /// </summary>
    /// <remarks>The underlying cache is expected to be HttpRuntime.Cache.</remarks>
-    internal class WebCachingAppCache : FastDictionaryAppCacheBase, IAppPolicyCache
+    internal class WebCachingAppCache : FastDictionaryAppCacheBase, IAppPolicyCache, IDisposable
    {
        // locker object that supports upgradeable read locking
        // does not need to support recursion if we implement the cache correctly and ensure
@@ -19,6 +19,7 @@ namespace Umbraco.Core.Cache
        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);

        private readonly System.Web.Caching.Cache _cache;
+        private bool _disposedValue;

        /// <summary>
        /// Initializes a new instance of the <see cref="WebCachingAppCache"/> class.
@@ -138,8 +139,10 @@ namespace Umbraco.Core.Cache
            var value = result == null ? null : GetSafeLazyValue(result);
            if (value != null) return value;

-            using (var lck = new UpgradeableReadLock(_locker))
+            try
            {
+                _locker.EnterUpgradeableReadLock();
+
                result = _cache.Get(key) as Lazy<object>; // null if key not found

                // cannot create value within the lock, so if result.IsValueCreated is false, just
@@ -152,15 +155,28 @@ namespace Umbraco.Core.Cache
                    var absolute = isSliding ? System.Web.Caching.Cache.NoAbsoluteExpiration : (timeout == null ? System.Web.Caching.Cache.NoAbsoluteExpiration : DateTime.Now.Add(timeout.Value));
                    var sliding = isSliding == false ? System.Web.Caching.Cache.NoSlidingExpiration : (timeout ?? System.Web.Caching.Cache.NoSlidingExpiration);

-                    lck.UpgradeToWriteLock();
+                    try
+                    {
+                        _locker.EnterWriteLock();

-                    // create a cache dependency if one is needed. 
-                    var dependency = dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null;
+                        // create a cache dependency if one is needed. 
+                        var dependency = dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null;

-                    //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
-                    _cache.Insert(key, result, dependency, absolute, sliding, priority, removedCallback);
+                        //NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
+                        _cache.Insert(key, result, dependency, absolute, sliding, priority, removedCallback);
+                    }
+                    finally
+                    {
+                        if (_locker.IsWriteLockHeld)
+                            _locker.ExitWriteLock();
+                    }
                }
            }
+            finally
+            {
+                if (_locker.IsUpgradeableReadLockHeld)
+                    _locker.ExitUpgradeableReadLock();
+            }

            // using GetSafeLazy and GetSafeLazyValue ensures that we don't cache
            // exceptions (but try again and again) and silently eat them - however at
@@ -204,5 +220,24 @@ namespace Umbraco.Core.Cache
                    _locker.ExitWriteLock();
            }
        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    _locker.Dispose();
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+        }
    }
 }
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Allows clearing all event handlers
+    /// </summary>
+    /// <typeparam name="TValue"></typeparam>
+    public class EventClearingObservableCollection<TValue> : ObservableCollection<TValue>, INotifyCollectionChanged
+    {
+        public EventClearingObservableCollection()
+        {
+        }
+
+        public EventClearingObservableCollection(List<TValue> list) : base(list)
+        {
+        }
+
+        public EventClearingObservableCollection(IEnumerable<TValue> collection) : base(collection)
+        {
+        }
+
+        // need to explicitly implement with event accessor syntax in order to override in order to to clear
+        // c# events are weird, they do not behave the same way as other c# things that are 'virtual',
+        // a good article is here: https://medium.com/@unicorn_dev/virtual-events-in-c-something-went-wrong-c6f6f5fbe252
+        // and https://stackoverflow.com/questions/2268065/c-sharp-language-design-explicit-interface-implementation-of-an-event
+        private NotifyCollectionChangedEventHandler _changed;
+        event NotifyCollectionChangedEventHandler INotifyCollectionChanged.CollectionChanged
+        {
+            add { _changed += value; }
+            remove { _changed -= value; }
+        }
+
+        /// <summary>
+        /// Clears all event handlers for the <see cref="CollectionChanged"/> event
+        /// </summary>
+        public void ClearCollectionChangedEvents() => _changed = null;
+    }
+}
@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Runtime.Serialization;

 namespace Umbraco.Core.Collections
 {
+
    /// <summary>
    /// An ObservableDictionary
    /// </summary>
@@ -15,7 +18,7 @@ namespace Umbraco.Core.Collections
    /// </remarks>
    /// <typeparam name="TValue">The type of elements contained in the BindableCollection</typeparam>
    /// <typeparam name="TKey">The type of the indexing key</typeparam>
-    public class ObservableDictionary<TKey, TValue> : ObservableCollection<TValue>, IReadOnlyDictionary<TKey, TValue>, IDictionary<TKey, TValue>
+    public class ObservableDictionary<TKey, TValue> : ObservableCollection<TValue>, IReadOnlyDictionary<TKey, TValue>, IDictionary<TKey, TValue>, INotifyCollectionChanged
    {
        protected Dictionary<TKey, int> Indecies { get; }
        protected Func<TValue, TKey> KeySelector { get; }
@@ -74,6 +77,22 @@ namespace Umbraco.Core.Collections

        #endregion

+        // need to explicitly implement with event accessor syntax in order to override in order to to clear
+        // c# events are weird, they do not behave the same way as other c# things that are 'virtual',
+        // a good article is here: https://medium.com/@unicorn_dev/virtual-events-in-c-something-went-wrong-c6f6f5fbe252
+        // and https://stackoverflow.com/questions/2268065/c-sharp-language-design-explicit-interface-implementation-of-an-event
+        private NotifyCollectionChangedEventHandler _changed;
+        event NotifyCollectionChangedEventHandler INotifyCollectionChanged.CollectionChanged
+        {
+            add { _changed += value; }
+            remove { _changed -= value; }
+        }
+
+        /// <summary>
+        /// Clears all <see cref="CollectionChanged"/> event handlers
+        /// </summary>
+        public void ClearCollectionChangedEvents() => _changed = null;
+
        public bool ContainsKey(TKey key)
        {
            return Indecies.ContainsKey(key);
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Collection that can be both a queue and a stack.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class StackQueue<T>
+    {
+        private readonly LinkedList<T> _linkedList = new LinkedList<T>();
+
+        public void Clear()
+        {
+            _linkedList.Clear();
+        }
+
+        public void Push(T obj)
+        {
+            _linkedList.AddFirst(obj);
+        }
+
+        public void Enqueue(T obj)
+        {
+            _linkedList.AddFirst(obj);
+        }
+
+        public T Pop()
+        {
+            var obj = _linkedList.First.Value;
+            _linkedList.RemoveFirst();
+            return obj;
+        }
+
+        public T Dequeue()
+        {
+            var obj = _linkedList.Last.Value;
+            _linkedList.RemoveLast();
+            return obj;
+        }
+
+        public T PeekStack()
+        {
+            return _linkedList.First.Value;
+        }
+
+        public T PeekQueue()
+        {
+            return _linkedList.Last.Value;
+        }
+
+        public int Count
+        {
+            get
+            {
+                return _linkedList.Count;
+            }
+        }
+    }
+}
@@ -42,7 +42,19 @@ namespace Umbraco.Core.Compose
        }

        public void Terminate()
-        { }
+        {
+            UserService.SavedUserGroup -= OnSavedUserGroupWithUsers;
+
+            UserService.SavedUser -= OnSavedUser;
+            UserService.DeletedUser -= OnDeletedUser;
+            UserService.UserGroupPermissionsAssigned -= UserGroupPermissionAssigned;
+
+            MemberService.Saved -= OnSavedMember;
+            MemberService.Deleted -= OnDeletedMember;
+            MemberService.AssignedRoles -= OnAssignedRoles;
+            MemberService.RemovedRoles -= OnRemovedRoles;
+            MemberService.Exported -= OnMemberExported;
+        }

        internal static IUser UnknownUser => new User { Id = Constants.Security.UnknownUserId, Name = Constants.Security.UnknownUserName, Email = "" };

@@ -67,7 +79,7 @@ namespace Umbraco.Core.Compose
            get
            {
                var httpContext = HttpContext.Current == null ? (HttpContextBase) null : new HttpContextWrapper(HttpContext.Current);
-                var ip = httpContext.GetCurrentRequestIpAddress();
+                var ip = httpContext?.GetCurrentRequestIpAddress();
                if (ip == null || ip.ToLowerInvariant().StartsWith("unknown")) ip = "";
                return ip;
            }
@@ -14,7 +14,9 @@ namespace Umbraco.Core.Compose
        }

        public void Terminate()
-        { }
+        {
+            ContentService.Copied -= ContentServiceCopied;
+        }

        private static void ContentServiceCopied(IContentService sender, Events.CopyEventArgs<IContent> e)
        {
@@ -18,7 +18,12 @@ namespace Umbraco.Core.Compose
        }

        public void Terminate()
-        { }
+        {
+            ContentService.Moved -= ContentService_Moved;
+            ContentService.Trashed -= ContentService_Trashed;
+            MediaService.Moved -= MediaService_Moved;
+            MediaService.Trashed -= MediaService_Trashed;
+        }

        private static void ContentService_Moved(IContentService sender, MoveEventArgs<IContent> e)
        {
@@ -88,7 +93,8 @@ namespace Umbraco.Core.Compose
                        item.Entity.Id,
                        ObjectTypes.GetName(UmbracoObjectTypes.Document),
                        string.Format(textService.Localize(
-                                "recycleBin/contentTrashed"),
+                                "recycleBin","contentTrashed"),
+
                            item.Entity.Id, originalParentId));
                }
            }
@@ -127,7 +133,7 @@ namespace Umbraco.Core.Compose
                        item.Entity.Id,
                        ObjectTypes.GetName(UmbracoObjectTypes.Media),
                        string.Format(textService.Localize(
-                               "recycleBin/mediaTrashed"),
+                               "recycleBin", "mediaTrashed"),
                            item.Entity.Id, originalParentId));
                }
            }
@@ -51,7 +51,7 @@ namespace Umbraco.Core.Composing
                        }
                        catch (Exception ex)
                        {
-                            _logger.Error<ComponentCollection>(ex, "Error while terminating component {ComponentType}.", componentType.FullName);
+                            _logger.Error<ComponentCollection,string>(ex, "Error while terminating component {ComponentType}.", componentType.FullName);
                        }
                    }
                }
@@ -114,7 +114,7 @@ namespace Umbraco.Core.Composing

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

            return sortedComposerTypes;
        }
@@ -205,7 +205,7 @@ namespace Umbraco.Core.Composing
            catch (Exception e)
            {
                // in case of an error, force-dump everything to log
-                _logger.Info<Composers>("Composer Report:\r\n{ComposerReport}", GetComposersReport(requirements));
+                _logger.Info<Composers,string>("Composer Report:\r\n{ComposerReport}", GetComposersReport(requirements));
                _logger.Error<Composers>(e, "Failed to sort composers.");
                throw;
            }
@@ -49,6 +49,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
            composition.RegisterUnique<IContentTypeCommonRepository, ContentTypeCommonRepository>();
            composition.RegisterUnique<IInstallationRepository, InstallationRepository>();
            composition.RegisterUnique<IUpgradeCheckRepository, UpgradeCheckRepository>();
+            composition.RegisterUnique<IDocumentVersionRepository, DocumentVersionRepository>();

            return composition;
        }
@@ -6,8 +6,10 @@ using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Packaging;
+using Umbraco.Core.Security;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
+using Umbraco.Core.Telemetry;

 namespace Umbraco.Core.Composing.CompositionExtensions
 {
@@ -31,7 +33,12 @@ namespace Umbraco.Core.Composing.CompositionExtensions
            composition.RegisterUnique<IDomainService, DomainService>();
            composition.RegisterUnique<IAuditService, AuditService>();
            composition.RegisterUnique<ITagService, TagService>();
-            composition.RegisterUnique<IContentService, ContentService>();
+
+            composition.RegisterUnique<ContentService>();
+            composition.RegisterUnique<IContentService>(factory => factory.GetInstance<ContentService>());
+            composition.RegisterUnique<IContentVersionService>(factory => factory.GetInstance<ContentService>());
+            composition.RegisterUnique<IContentVersionCleanupPolicy, DefaultContentVersionCleanupPolicy>();
+
            composition.RegisterUnique<IUserService, UserService>();
            composition.RegisterUnique<IMemberService, MemberService>();
            composition.RegisterUnique<IMediaService, MediaService>();
@@ -52,6 +59,7 @@ namespace Umbraco.Core.Composing.CompositionExtensions
            composition.RegisterUnique<IExternalLoginService, ExternalLoginService>();
            composition.RegisterUnique<IRedirectUrlService, RedirectUrlService>();
            composition.RegisterUnique<IConsentService, ConsentService>();
+            composition.RegisterUnique<IEmailSender, EmailSender>();
            composition.Register<LocalizedTextServiceFileSources>(SourcesFactory);
            composition.RegisterUnique<ILocalizedTextService>(factory => new LocalizedTextService(
                factory.GetInstance<Lazy<LocalizedTextServiceFileSources>>(),
@@ -73,6 +81,10 @@ namespace Umbraco.Core.Composing.CompositionExtensions
                    factory.GetInstance<CompiledPackageXmlParser>(), factory.GetInstance<IPackageActionRunner>(),
                    new DirectoryInfo(IOHelper.GetRootDirectorySafe())));

+            composition.RegisterUnique<ITelemetryService, TelemetryService>();
+            composition.RegisterUnique<IHtmlSanitizer, NoopHtmlSanitizer>();
+            composition.RegisterUnique<IFileStreamSecurityValidator, FileStreamSecurityValidator>();
+
            return composition;
        }

@@ -30,6 +30,7 @@ namespace Umbraco.Core.Composing
    public static class Current
    {
        private static IFactory _factory;
+        private static IRuntimeState _state;

        // TODO: get rid of these oddities
        // we don't want Umbraco tests to die because the container has not been properly initialized,
@@ -125,7 +126,17 @@ namespace Umbraco.Core.Composing
               ?? new ProfilingLogger(Logger, Profiler);

        public static IRuntimeState RuntimeState
-            => Factory.GetInstance<IRuntimeState>();
+        {
+            get
+            {
+                return _state ?? Factory.GetInstance<IRuntimeState>();
+            }
+            internal set
+            {
+                // this is only used when the boot entirely fails, we need to manually set this so we can report
+                _state = value;
+            }
+        }

        public static TypeLoader TypeLoader
            => Factory.GetInstance<TypeLoader>();
@@ -11,7 +11,7 @@ using System.Web.Compilation;
 using System.Web.Hosting;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
-
+using Umbraco.Core.Logging;
 namespace Umbraco.Core.Composing
 {
    /// <summary>
@@ -35,7 +35,7 @@ namespace Umbraco.Core.Composing
                var s = ConfigurationManager.AppSettings[Constants.AppSettings.AssembliesAcceptingLoadExceptions];
                return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
                    ? Array.Empty<string>()
-                    : s.Split(',').Select(x => x.Trim()).ToArray();
+                    : s.Split(Constants.CharArrays.Comma).Select(x => x.Trim()).ToArray();
            }
        }

@@ -441,7 +441,7 @@ namespace Umbraco.Core.Composing
                    }
                    catch (TypeLoadException ex)
                    {
-                        Current.Logger.Error(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
+                        Current.Logger.Error<Assembly>(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
                        continue;
                    }

@@ -507,7 +507,7 @@ namespace Umbraco.Core.Composing
                    }
                    catch (TypeLoadException ex)
                    {
-                        Current.Logger.Error(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
+                        Current.Logger.Error<Assembly>(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
                        continue;
                    }

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
@@ -44,7 +45,7 @@ namespace Umbraco.Core.Composing
        private IEnumerable<Assembly> _assemblies;
        private bool _reportedChange;
        private readonly string _localTempPath;
-        private string _fileBasePath;
+        private readonly Lazy<string> _fileBasePath;

        /// <summary>
        /// Initializes a new instance of the <see cref="TypeLoader"/> class.
@@ -69,6 +70,8 @@ namespace Umbraco.Core.Composing
            _localTempPath = localTempPath;
            _logger = logger ?? throw new ArgumentNullException(nameof(logger));

+            _fileBasePath = new Lazy<string>(GetFileBasePath);
+
            if (detectChanges)
            {
                //first check if the cached hash is string.Empty, if it is then we need
@@ -159,7 +162,8 @@ namespace Umbraco.Core.Composing
                    return _cachedAssembliesHash;

                var typesHashFilePath = GetTypesHashFilePath();
-                if (!File.Exists(typesHashFilePath)) return string.Empty;
+                if (!File.Exists(typesHashFilePath))
+                    return string.Empty;

                var hash = File.ReadAllText(typesHashFilePath, Encoding.UTF8);

@@ -338,7 +342,9 @@ namespace Umbraco.Core.Composing

            var typesListFilePath = GetTypesListFilePath();
            if (File.Exists(typesListFilePath) == false)
+            {
                return cache;
+            }

            using (var stream = GetFileStream(typesListFilePath, FileMode.Open, FileAccess.Read, FileShare.Read, ListFileOpenReadTimeout))
            using (var reader = new StreamReader(stream))
@@ -346,11 +352,21 @@ namespace Umbraco.Core.Composing
                while (true)
                {
                    var baseType = reader.ReadLine();
-                    if (baseType == null) return cache; // exit
-                    if (baseType.StartsWith("<")) break; // old xml
+                    if (baseType == null)
+                    {
+                        return cache; // exit
+                    }
+
+                    if (baseType.StartsWith("<"))
+                    {
+                        break; // old xml
+                    }

                    var attributeType = reader.ReadLine();
-                    if (attributeType == null) break;
+                    if (attributeType == null)
+                    {
+                        break;
+                    }

                    var types = new List<string>();
                    while (true)
@@ -369,7 +385,10 @@ namespace Umbraco.Core.Composing
                        types.Add(type);
                    }

-                    if (types == null) break;
+                    if (types == null)
+                    {
+                        break;
+                    }
                }
            }

@@ -378,28 +397,31 @@ namespace Umbraco.Core.Composing
        }

        // internal for tests
-        internal string GetTypesListFilePath() => GetFileBasePath() + ".list";
+        internal string GetTypesListFilePath() => _fileBasePath.Value + ".list";

-        private string GetTypesHashFilePath() => GetFileBasePath() + ".hash";
+        private string GetTypesHashFilePath() => _fileBasePath.Value + ".hash";

+        /// <summary>
+        /// Used to produce the Lazy value of _fileBasePath
+        /// </summary>
+        /// <returns></returns>
        private string GetFileBasePath()
        {
-            lock (_locko)
+            var fileBasePath = Path.Combine(_localTempPath, "TypesCache", "umbraco-types." + NetworkHelper.FileSafeMachineName);
+
+            // ensure that the folder exists
+            var directory = Path.GetDirectoryName(fileBasePath);
+            if (directory == null)
            {
-                if (_fileBasePath != null)
-                    return _fileBasePath;
-
-                _fileBasePath = Path.Combine(_localTempPath, "TypesCache", "umbraco-types." + NetworkHelper.FileSafeMachineName);
-
-                // ensure that the folder exists
-                var directory = Path.GetDirectoryName(_fileBasePath);
-                if (directory == null)
-                    throw new InvalidOperationException($"Could not determine folder for path \"{_fileBasePath}\".");
-                if (Directory.Exists(directory) == false)
-                    Directory.CreateDirectory(directory);
-
-                return _fileBasePath;
+                throw new InvalidOperationException($"Could not determine folder for path \"{fileBasePath}\".");
            }
+
+            if (Directory.Exists(directory) == false)
+            {
+                Directory.CreateDirectory(directory);
+            }
+
+            return fileBasePath;
        }

        // internal for tests
@@ -415,7 +437,10 @@ namespace Umbraco.Core.Composing
                    writer.WriteLine(typeList.BaseType == null ? string.Empty : typeList.BaseType.FullName);
                    writer.WriteLine(typeList.AttributeType == null ? string.Empty : typeList.AttributeType.FullName);
                    foreach (var type in typeList.Types)
+                    {
                        writer.WriteLine(type.AssemblyQualifiedName);
+                    }
+
                    writer.WriteLine();
                }
            }
@@ -433,16 +458,22 @@ namespace Umbraco.Core.Composing
                        WriteCache();
                    }
                    catch { /* bah - just don't die */ }
-                    if (!_timing) _timer = null;
+                    if (!_timing)
+                        _timer = null;
                }
            }

            lock (_timerLock)
            {
                if (_timer == null)
+                {
                    _timer = new Timer(TimerRelease, null, ListFileWriteThrottle, Timeout.Infinite);
+                }
                else
+                {
                    _timer.Change(ListFileWriteThrottle, Timeout.Infinite);
+                }
+
                _timing = true;
            }
        }
@@ -475,9 +506,11 @@ namespace Umbraco.Core.Composing
                catch
                {
                    if (--attempts == 0)
+                    {
                        throw;
+                    }

-                    _logger.Debug<TypeLoader>("Attempted to get filestream for file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
+                    _logger.Debug<TypeLoader,string,int,int>("Attempted to get filestream for file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
                    Thread.Sleep(pauseMilliseconds);
                }
            }
@@ -498,7 +531,7 @@ namespace Umbraco.Core.Composing
                    if (--attempts == 0)
                        throw;

-                    _logger.Debug<TypeLoader>("Attempted to delete file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
+                    _logger.Debug<TypeLoader,string,int,int>("Attempted to delete file {Path} failed, {NumberOfAttempts} attempts left, pausing for {PauseMilliseconds} milliseconds", path, attempts, pauseMilliseconds);
                    Thread.Sleep(pauseMilliseconds);
                }
            }
@@ -542,7 +575,8 @@ namespace Umbraco.Core.Composing
        /// <exception cref="ArgumentNullException">attributeTypes</exception>
        public IEnumerable<Attribute> GetAssemblyAttributes(params Type[] attributeTypes)
        {
-            if (attributeTypes == null) throw new ArgumentNullException(nameof(attributeTypes));
+            if (attributeTypes == null)
+                throw new ArgumentNullException(nameof(attributeTypes));

            return AssembliesToScan.SelectMany(a => attributeTypes.SelectMany(at => a.GetCustomAttributes(at))).ToList();
        }
@@ -562,7 +596,9 @@ namespace Umbraco.Core.Composing
        public IEnumerable<Type> GetTypes<T>(bool cache = true, IEnumerable<Assembly> specificAssemblies = null)
        {
            if (_logger == null)
+            {
                throw new InvalidOperationException("Cannot get types from a test/blank type loader.");
+            }

            // do not cache anything from specific assemblies
            cache &= specificAssemblies == null;
@@ -571,7 +607,7 @@ namespace Umbraco.Core.Composing
            if (!typeof(IDiscoverable).IsAssignableFrom(typeof(T)))
            {
                // warn
-                _logger.Debug<TypeLoader>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} (slow).", typeof(T).FullName);
+                _logger.Debug<TypeLoader,string>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} (slow).", typeof(T).FullName);

                return GetTypesInternal(
                    typeof(T), null,
@@ -582,20 +618,20 @@ namespace Umbraco.Core.Composing

            // get IDiscoverable and always cache
            var discovered = GetTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                "scanning assemblies",
                true);

            // warn
            if (!cache)
-                _logger.Debug<TypeLoader>("Running a non-cached, filter for discoverable type {TypeName} (slowish).", typeof(T).FullName);
+                _logger.Debug<TypeLoader, string>("Running a non-cached, filter for discoverable type {TypeName} (slowish).", typeof(T).FullName);

            // filter the cached discovered types (and maybe cache the result)
            return GetTypesInternal(
-                typeof (T), null,
+                typeof(T), null,
                () => discovered
-                    .Where(x => typeof (T).IsAssignableFrom(x)),
+                    .Where(x => typeof(T).IsAssignableFrom(x)),
                "filtering IDiscoverable",
                cache);
        }
@@ -613,7 +649,9 @@ namespace Umbraco.Core.Composing
            where TAttribute : Attribute
        {
            if (_logger == null)
+            {
                throw new InvalidOperationException("Cannot get types from a test/blank type loader.");
+            }

            // do not cache anything from specific assemblies
            cache &= specificAssemblies == null;
@@ -621,7 +659,7 @@ namespace Umbraco.Core.Composing
            // if not IDiscoverable, directly get types
            if (!typeof(IDiscoverable).IsAssignableFrom(typeof(T)))
            {
-                _logger.Debug<TypeLoader>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} / attribute {AttributeName} (slow).", typeof(T).FullName, typeof(TAttribute).FullName);
+                _logger.Debug<TypeLoader, string, string>("Running a full, " + (cache ? "" : "non-") + "cached, scan for non-discoverable type {TypeName} / attribute {AttributeName} (slow).", typeof(T).FullName, typeof(TAttribute).FullName);

                return GetTypesInternal(
                    typeof(T), typeof(TAttribute),
@@ -632,18 +670,18 @@ namespace Umbraco.Core.Composing

            // get IDiscoverable and always cache
            var discovered = GetTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                "scanning assemblies",
                true);

            // warn
            if (!cache)
-                _logger.Debug<TypeLoader>("Running a non-cached, filter for discoverable type {TypeName}  / attribute {AttributeName} (slowish).", typeof(T).FullName, typeof(TAttribute).FullName);
+                _logger.Debug<TypeLoader, string, string>("Running a non-cached, filter for discoverable type {TypeName}  / attribute {AttributeName} (slowish).", typeof(T).FullName, typeof(TAttribute).FullName);

            // filter the cached discovered types (and maybe cache the result)
            return GetTypesInternal(
-                typeof (T), typeof (TAttribute),
+                typeof(T), typeof(TAttribute),
                () => discovered
                    .Where(x => typeof(T).IsAssignableFrom(x))
                    .Where(x => x.GetCustomAttributes<TAttribute>(false).Any()),
@@ -663,16 +701,18 @@ namespace Umbraco.Core.Composing
            where TAttribute : Attribute
        {
            if (_logger == null)
+            {
                throw new InvalidOperationException("Cannot get types from a test/blank type loader.");
+            }

            // do not cache anything from specific assemblies
            cache &= specificAssemblies == null;

            if (!cache)
-                _logger.Debug<TypeLoader>("Running a full, non-cached, scan for types / attribute {AttributeName} (slow).", typeof(TAttribute).FullName);
+                _logger.Debug<TypeLoader, string>("Running a full, non-cached, scan for types / attribute {AttributeName} (slow).", typeof(TAttribute).FullName);

            return GetTypesInternal(
-                typeof (object), typeof (TAttribute),
+                typeof(object), typeof(TAttribute),
                () => TypeFinder.FindClassesWithAttribute<TAttribute>(specificAssemblies ?? AssembliesToScan),
                "scanning assemblies",
                cache);
@@ -692,12 +732,14 @@ namespace Umbraco.Core.Composing
            var name = GetName(baseType, attributeType);

            lock (_locko)
-            using (_logger.DebugDuration<TypeLoader>(
+            {
+                using (_logger.DebugDuration<TypeLoader>(
                "Getting " + name,
                "Got " + name)) // cannot contain typesFound.Count as it's evaluated before the find
-            {
-                // get within a lock & timer
-                return GetTypesInternalLocked(baseType, attributeType, finder, action, cache);
+                {
+                    // get within a lock & timer
+                    return GetTypesInternalLocked(baseType, attributeType, finder, action, cache);
+                }
            }
        }

@@ -719,13 +761,15 @@ namespace Umbraco.Core.Composing
            var listKey = new CompositeTypeTypeKey(baseType ?? tobject, attributeType ?? tobject);
            TypeList typeList = null;
            if (cache)
+            {
                _types.TryGetValue(listKey, out typeList); // else null
+            }

            // if caching and found, return
            if (typeList != null)
            {
                // need to put some logging here to try to figure out why this is happening: http://issues.umbraco.org/issue/U4-3505
-                _logger.Debug<TypeLoader>("Getting {TypeName}: found a cached type list.", GetName(baseType, attributeType));
+                _logger.Debug<TypeLoader, string>("Getting {TypeName}: found a cached type list.", GetName(baseType, attributeType));
                return typeList.Types;
            }

@@ -756,7 +800,7 @@ namespace Umbraco.Core.Composing
                // so in this instance there will never be a result.
                if (cacheResult.Exception is CachedTypeNotFoundInFileException || cacheResult.Success == false)
                {
-                    _logger.Debug<TypeLoader>("Getting {TypeName}: failed to load from cache file, must scan assemblies.", GetName(baseType, attributeType));
+                    _logger.Debug<TypeLoader, string>("Getting {TypeName}: failed to load from cache file, must scan assemblies.", GetName(baseType, attributeType));
                    scan = true;
                }
                else
@@ -775,7 +819,7 @@ namespace Umbraco.Core.Composing
                        catch (Exception ex)
                        {
                            // in case of any exception, we have to exit, and revert to scanning
-                            _logger.Error<TypeLoader>(ex, "Getting {TypeName}: failed to load cache file type {CacheType}, reverting to scanning assemblies.", GetName(baseType, attributeType), type);
+                            _logger.Error<TypeLoader,string,string>(ex, "Getting {TypeName}: failed to load cache file type {CacheType}, reverting to scanning assemblies.", GetName(baseType, attributeType), type);
                            scan = true;
                            break;
                        }
@@ -783,7 +827,7 @@ namespace Umbraco.Core.Composing

                    if (scan == false)
                    {
-                        _logger.Debug<TypeLoader>("Getting {TypeName}: loaded types from cache file.", GetName(baseType, attributeType));
+                        _logger.Debug<TypeLoader, string>("Getting {TypeName}: loaded types from cache file.", GetName(baseType, attributeType));
                    }
                }
            }
@@ -791,10 +835,12 @@ namespace Umbraco.Core.Composing
            if (scan)
            {
                // either we had to scan, or we could not get the types from the cache file - scan now
-                _logger.Debug<TypeLoader>("Getting {TypeName}: " + action + ".", GetName(baseType, attributeType));
+                _logger.Debug<TypeLoader, string>("Getting {TypeName}: " + action + ".", GetName(baseType, attributeType));

                foreach (var t in finder())
+                {
                    typeList.Add(t);
+                }
            }

            // if we are to cache the results, do so
@@ -806,14 +852,16 @@ namespace Umbraco.Core.Composing
                    _types[listKey] = typeList;
                    //if we are scanning then update the cache file
                    if (scan)
+                    {
                        UpdateCache();
+                    }
                }

-                _logger.Debug<TypeLoader>("Got {TypeName}, caching ({CacheType}).", GetName(baseType, attributeType), added.ToString().ToLowerInvariant());
+                _logger.Debug<TypeLoader, string, string>("Got {TypeName}, caching ({CacheType}).", GetName(baseType, attributeType), added.ToString().ToLowerInvariant());
            }
            else
            {
-                _logger.Debug<TypeLoader>("Got {TypeName}.", GetName(baseType, attributeType));
+                _logger.Debug<TypeLoader, string>("Got {TypeName}.", GetName(baseType, attributeType));
            }

            return typeList.Types;
@@ -16,6 +16,8 @@ namespace Umbraco.Core.Composing
    {
        protected abstract TBuilder This { get; }

+        private readonly Dictionary<Type, int> _customWeights = new Dictionary<Type, int>();
+
        /// <summary>
        /// Clears all types in the collection.
        /// </summary>
@@ -107,6 +109,18 @@ namespace Umbraco.Core.Composing
            return This;
        }

+        /// <summary>
+        /// Changes the default weight of an item
+        /// </summary>
+        /// <typeparam name="T">The type of item</typeparam>
+        /// <param name="weight">The new weight</param>
+        /// <returns></returns>
+        public TBuilder SetWeight<T>(int weight) where T : TItem
+        {
+            _customWeights[typeof(T)] = weight;
+            return This;
+        }
+
        protected override IEnumerable<Type> GetRegisteringTypes(IEnumerable<Type> types)
        {
            var list = types.ToList();
@@ -118,6 +132,8 @@ namespace Umbraco.Core.Composing

        protected virtual int GetWeight(Type type)
        {
+            if (_customWeights.ContainsKey(type))
+                return _customWeights[type];
            var attr = type.GetCustomAttributes(typeof(WeightAttribute), false).OfType<WeightAttribute>().SingleOrDefault();
            return attr?.Weight ?? DefaultWeight;
        }
@@ -5,6 +5,7 @@ using Umbraco.Core.Dictionary;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging.Viewer;
 using Umbraco.Core.Manifest;
+using Umbraco.Core.Mapping;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PackageActions;
 using Umbraco.Core.Persistence.Mappers;
@@ -28,6 +29,13 @@ namespace Umbraco.Core
        public static CacheRefresherCollectionBuilder CacheRefreshers(this Composition composition)
            => composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>();

+        /// <summary>
+        /// Gets the map definitions collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static MapDefinitionCollectionBuilder MapDefinitions(this Composition composition)
+            => composition.WithCollectionBuilder<MapDefinitionCollectionBuilder>();
+
        /// <summary>
        /// Gets the mappers collection builder.
        /// </summary>
@@ -64,7 +72,7 @@ namespace Umbraco.Core
            => composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();

        /// <summary>
-        /// Gets the url segment providers collection builder.
+        /// Gets the URL segment providers collection builder.
        /// </summary>
        /// <param name="composition">The composition.</param>
        public static UrlSegmentProviderCollectionBuilder UrlSegmentProviders(this Composition composition)
@@ -1,10 +1,11 @@
 using System.IO;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Configuration.HealthChecks;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Dashboards;
+using Umbraco.Core.Help;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
@@ -28,8 +29,8 @@ namespace Umbraco.Core
        public static IGridConfig Grids(this Configs configs)
            => configs.GetConfig<IGridConfig>();

-        internal static CoreDebug CoreDebug(this Configs configs)
-            => configs.GetConfig<CoreDebug>();
+        public static ICoreDebug CoreDebug(this Configs configs)
+            => configs.GetConfig<ICoreDebug>();

        public static void AddCoreConfigs(this Configs configs)
        {
@@ -39,7 +40,7 @@ namespace Umbraco.Core
            configs.Add<IUmbracoSettingsSection>("umbracoConfiguration/settings");
            configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");

-            configs.Add(() => new CoreDebug());
+            configs.Add<ICoreDebug>(() => new CoreDebug());

            // GridConfig depends on runtime caches, manifest parsers... and cannot be available during composition
            configs.Add<IGridConfig>(factory => new GridConfig(
@@ -48,6 +49,10 @@ namespace Umbraco.Core
                configDir,
                factory.GetInstance<ManifestParser>(),
                factory.GetInstance<IRuntimeState>().Debug));
+
+            configs.Add<IContentDashboardSettings>(() => new ContentDashboardSettings());
+
+            configs.Add<IHelpPageSettings>(() => new HelpPageSettings());
        }
    }
 }
@@ -2,7 +2,7 @@

 namespace Umbraco.Core.Configuration
 {
-    internal class CoreDebug
+    internal class CoreDebug : ICoreDebug
    {
        public CoreDebug()
        {
@@ -6,7 +6,9 @@ using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Xml.Linq;
+using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;

 namespace Umbraco.Core.Configuration
 {
@@ -23,6 +25,7 @@ namespace Umbraco.Core.Configuration
        // TODO these should not be static
        private static string _reservedPaths;
        private static string _reservedUrls;
+        private static int _sqlWriteLockTimeOut;

        //ensure the built on (non-changeable) reserved paths are there at all times
        internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
@@ -68,9 +71,9 @@ namespace Umbraco.Core.Configuration
        internal static bool? HasSmtpServer { get; set; }

        /// <summary>
-        /// Gets the reserved urls from web.config.
+        /// Gets the reserved URLs from web.config.
        /// </summary>
-        /// <value>The reserved urls.</value>
+        /// <value>The reserved URLs.</value>
        public string ReservedUrls
        {
            get
@@ -145,6 +148,20 @@ namespace Umbraco.Core.Configuration
            }
        }

+        /// <summary>
+        /// Gets the path to folder containing the icons used in the umbraco backoffice (/umbraco/assets/icons by default).
+        /// </summary>
+        /// <value>The icons path.</value>
+        public string IconsPath
+        {
+            get
+            {
+                return ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.IconsPath)
+                    ? IOHelper.ResolveUrl(Constants.AppSettings.IconsPath)
+                    : $"{Path}/assets/icons";
+            }
+        }
+
        /// <summary>
        /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
        /// </summary>
@@ -340,10 +357,10 @@ namespace Umbraco.Core.Configuration
        }

        /// <summary>
-        /// Gets a value indicating whether umbraco should hide top level nodes from generated urls.
+        /// Gets a value indicating whether umbraco should hide top level nodes from generated URLs.
        /// </summary>
        /// <value>
-        ///     <c>true</c> if umbraco hides top level nodes from urls; otherwise, <c>false</c>.
+        ///     <c>true</c> if umbraco hides top level nodes from URLs; otherwise, <c>false</c>.
        /// </value>
        public bool HideTopLevelNodeFromPath
        {
@@ -377,5 +394,69 @@ namespace Umbraco.Core.Configuration
                }
            }
        }
+
+        /// <summary>
+        /// Returns true if TinyMCE scripting sanitization should be applied
+        /// </summary>
+        /// <remarks>
+        /// The default value is false
+        /// </remarks>
+        public bool SanitizeTinyMce
+        {
+            get
+            {
+                try
+                {
+                    return bool.Parse(ConfigurationManager.AppSettings[Constants.AppSettings.SanitizeTinyMce]);
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// An int value representing the time in milliseconds to lock the database for a write operation
+        /// </summary>
+        /// <remarks>
+        /// The default value is 5000 milliseconds
+        /// </remarks>
+        /// <value>The timeout in milliseconds.</value>
+        public int SqlWriteLockTimeOut
+        {
+            get
+            {
+                if (_sqlWriteLockTimeOut != default) return _sqlWriteLockTimeOut;
+
+                var timeOut = GetSqlWriteLockTimeoutFromConfigFile(Current.Logger);
+
+                _sqlWriteLockTimeOut = timeOut;
+                return _sqlWriteLockTimeOut;
+            }
+        }
+
+        internal static int GetSqlWriteLockTimeoutFromConfigFile(ILogger logger)
+        {
+            var timeOut = 5000; // 5 seconds
+            var appSettingSqlWriteLockTimeOut = ConfigurationManager.AppSettings[Constants.AppSettings.SqlWriteLockTimeOut];
+            if (int.TryParse(appSettingSqlWriteLockTimeOut, out var configuredTimeOut))
+            {
+                // Only apply this setting if it's not excessively high or low
+                const int minimumTimeOut = 100;
+                const int maximumTimeOut = 20000;
+                if (configuredTimeOut >= minimumTimeOut && configuredTimeOut <= maximumTimeOut) // between 0.1 and 20 seconds
+                {
+                    timeOut = configuredTimeOut;
+                }
+                else
+                {
+                    logger.Warn<GlobalSettings>(
+                        $"The `{Constants.AppSettings.SqlWriteLockTimeOut}` setting in web.config is not between the minimum of {minimumTimeOut} ms and maximum of {maximumTimeOut} ms, defaulting back to {timeOut}");
+                }
+            }
+
+            return timeOut;
+        }
    }
 }
@@ -44,7 +44,7 @@ namespace Umbraco.Core.Configuration
            var path = globalSettings.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(Constants.CharArrays.Tilde).TrimStart(Constants.CharArrays.ForwardSlash).Replace('/', '-').Trim().ToLower();
        }

    }
@@ -43,7 +43,7 @@ namespace Umbraco.Core.Configuration.Grid
                        }
                        catch (Exception ex)
                        {
-                            _logger.Error<GridEditorsConfig>(ex, "Could not parse the contents of grid.editors.config.js into a JSON array '{Json}", sourceString);
+                            _logger.Error<GridEditorsConfig,string>(ex, "Could not parse the contents of grid.editors.config.js into a JSON array '{Json}", sourceString);
                        }
                    }

@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Configuration
+{
+    public interface ICoreDebug
+    {
+        bool DumpOnTimeoutThreadAbort { get; }
+        bool LogUncompletedScopes { get; }
+    }
+}
@@ -1,14 +1,14 @@
 namespace Umbraco.Core.Configuration
 {
    /// <summary>
-    /// Contains general settings information for the entire Umbraco instance based on information from  web.config appsettings 
+    /// Contains general settings information for the entire Umbraco instance based on information from  web.config appsettings
    /// </summary>
    public interface IGlobalSettings
    {
        /// <summary>
-        /// Gets the reserved urls from web.config.
+        /// Gets the reserved URLs from web.config.
        /// </summary>
-        /// <value>The reserved urls.</value>
+        /// <value>The reserved URLs.</value>
        string ReservedUrls { get; }

        /// <summary>
@@ -21,7 +21,12 @@
        /// Gets the path to umbraco's root directory (/umbraco by default).
        /// </summary>
        string Path { get; }
-        
+
+        /// <summary>
+        /// Gets the path to umbraco's icons directory (/umbraco/assets/icons by default).
+        /// </summary>
+        string IconsPath { get; }
+
        /// <summary>
        /// Gets or sets the configuration status. This will return the version number of the currently installed umbraco instance.
        /// </summary>
@@ -40,10 +45,10 @@
        string DefaultUILanguage { get; }

        /// <summary>
-        /// Gets a value indicating whether umbraco should hide top level nodes from generated urls.
+        /// Gets a value indicating whether umbraco should hide top level nodes from generated URLs.
        /// </summary>
        /// <value>
-        /// 	<c>true</c> if umbraco hides top level nodes from urls; otherwise, <c>false</c>.
+        /// 	<c>true</c> if umbraco hides top level nodes from URLs; otherwise, <c>false</c>.
        /// </value>
        bool HideTopLevelNodeFromPath { get; }

@@ -67,5 +72,15 @@
        /// Gets the location of temporary files.
        /// </summary>
        string LocalTempPath { get; }
+
+        /// <summary>
+        /// Gets the write lock timeout.
+        /// </summary>
+        int SqlWriteLockTimeOut { get; }
+
+        /// <summary>
+        /// Returns true if TinyMCE scripting sanitization should be applied
+        /// </summary>
+        bool SanitizeTinyMce { get; }
    }
 }
@@ -8,5 +8,10 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        internal TourConfigElement Tours => (TourConfigElement)this["tours"];

        ITourSection IBackOfficeSection.Tours => Tours;
+
+        [ConfigurationProperty("id", DefaultValue = "")]
+        internal string Id => (string)base["id"];
+
+        string IBackOfficeSection.Id => (string)base["id"];
    }
 }
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Configuration;
 using Umbraco.Core.Macros;

@@ -22,6 +23,9 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        [ConfigurationProperty("notifications", IsRequired = true)]
        internal NotificationsElement Notifications => (NotificationsElement) base["notifications"];

+        [ConfigurationProperty("contentVersionCleanupPolicyGlobalSettings", IsRequired = false)]
+        internal ContentVersionCleanupPolicyGlobalSettingsElement ContentVersionCleanupPolicyGlobalSettingsElement => (ContentVersionCleanupPolicyGlobalSettingsElement) this["contentVersionCleanupPolicyGlobalSettings"];
+
        [ConfigurationProperty("PreviewBadge")]
        internal InnerTextConfigurationElement<string> PreviewBadge => GetOptionalTextElement("PreviewBadge", DefaultPreviewBadge);

@@ -29,17 +33,27 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        internal InnerTextConfigurationElement<MacroErrorBehaviour> MacroErrors => GetOptionalTextElement("MacroErrors", MacroErrorBehaviour.Inline);

        [ConfigurationProperty("disallowedUploadFiles")]
-        internal CommaDelimitedConfigurationElement DisallowedUploadFiles => GetOptionalDelimitedElement("disallowedUploadFiles", new[] {"ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd"});
+        internal CommaDelimitedConfigurationElement DisallowedUploadFiles => GetOptionalDelimitedElement("disallowedUploadFiles", new[] {"ashx", "aspx", "ascx", "config", "cshtml", "vbhtml", "asmx", "air", "axd", "xamlx"});
+
+        [ConfigurationProperty("allowedMediaHosts")]
+        internal CommaDelimitedConfigurationElement AllowedMediaHosts => GetOptionalDelimitedElement("allowedMediaHosts", new string[0]);

        [ConfigurationProperty("allowedUploadFiles")]
        internal CommaDelimitedConfigurationElement AllowedUploadFiles => GetOptionalDelimitedElement("allowedUploadFiles", new string[0]);
-        
+
        [ConfigurationProperty("showDeprecatedPropertyEditors")]
        internal InnerTextConfigurationElement<bool> ShowDeprecatedPropertyEditors => GetOptionalTextElement("showDeprecatedPropertyEditors", false);

        [ConfigurationProperty("loginBackgroundImage")]
        internal InnerTextConfigurationElement<string> LoginBackgroundImage => GetOptionalTextElement("loginBackgroundImage", string.Empty);

+        [ConfigurationProperty("loginLogoImage")]
+        internal InnerTextConfigurationElement<string> LoginLogoImage => GetOptionalTextElement("loginLogoImage", "assets/img/application/umbraco_logo_white.svg");
+
+        [ConfigurationProperty("hideBackofficeLogo")]
+        internal InnerTextConfigurationElement<bool> HideBackOfficeLogo => GetOptionalTextElement("hideBackofficeLogo", false);
+
+
        string IContentSection.NotificationEmailAddress => Notifications.NotificationEmailAddress;

        bool IContentSection.DisableHtmlEmail => Notifications.DisableHtmlEmail;
@@ -58,8 +72,13 @@ namespace Umbraco.Core.Configuration.UmbracoSettings

        IEnumerable<string> IContentSection.AllowedUploadFiles => AllowedUploadFiles;

+        IContentVersionCleanupPolicyGlobalSettings IContentSection.ContentVersionCleanupPolicyGlobalSettings => ContentVersionCleanupPolicyGlobalSettingsElement;
+
        bool IContentSection.ShowDeprecatedPropertyEditors => ShowDeprecatedPropertyEditors;

        string IContentSection.LoginBackgroundImage => LoginBackgroundImage;
+
+        string IContentSection.LoginLogoImage => LoginLogoImage;
+        bool IContentSection.HideBackOfficeLogo => HideBackOfficeLogo;
    }
 }
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        {
            if (contentConfig == null) throw new ArgumentNullException(nameof(contentConfig));
            if (extension == null) return false;
-            extension = extension.TrimStart('.');
+            extension = extension.TrimStart(Constants.CharArrays.Period);
            return contentConfig.ImageFileTypes.InvariantContains(extension);
        }

@@ -0,0 +1,16 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ContentVersionCleanupPolicyGlobalSettingsElement : UmbracoConfigurationElement, IContentVersionCleanupPolicyGlobalSettings
+    {
+        [ConfigurationProperty("enable", DefaultValue = false)]
+        public bool EnableCleanup => (bool)this["enable"];
+
+        [ConfigurationProperty("keepAllVersionsNewerThanDays", DefaultValue = 2)]
+        public int KeepAllVersionsNewerThanDays => (int)this["keepAllVersionsNewerThanDays"];
+
+        [ConfigurationProperty("keepLatestVersionPerDayForDays", DefaultValue = 30)]
+        public int KeepLatestVersionPerDayForDays => (int)this["keepLatestVersionPerDayForDays"];
+    }
+}
@@ -1,7 +1,10 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
 {
    public interface IBackOfficeSection
    {
        ITourSection Tours { get; }
+        string Id { get; }
    }
-}
+}
@@ -12,11 +12,11 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        IEnumerable<string> ImageFileTypes { get; }

        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
-        
+
        bool ResolveUrlsFromTextString { get; }

        IEnumerable<IContentErrorPage> Error404Collection { get; }
-        
+
        string PreviewBadge { get; }

        MacroErrorBehaviour MacroErrorBehaviour { get; }
@@ -25,6 +25,8 @@ namespace Umbraco.Core.Configuration.UmbracoSettings

        IEnumerable<string> AllowedUploadFiles { get; }

+        IContentVersionCleanupPolicyGlobalSettings ContentVersionCleanupPolicyGlobalSettings { get; }
+
        /// <summary>
        /// Gets a value indicating whether to show deprecated property editors in
        /// a datatype list of available editors.
@@ -32,5 +34,8 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        bool ShowDeprecatedPropertyEditors { get; }

        string LoginBackgroundImage { get; }
+
+        string LoginLogoImage { get; }
+        bool HideBackOfficeLogo { get; }
    }
 }
@@ -0,0 +1,9 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IContentVersionCleanupPolicyGlobalSettings
+    {
+        bool EnableCleanup { get; }
+        int KeepAllVersionsNewerThanDays { get; }
+        int KeepLatestVersionPerDayForDays { get; }
+    }
+}
@@ -43,6 +43,11 @@ namespace Umbraco.Core
            /// </summary>
            public const string Path = "Umbraco.Core.Path";

+            /// <summary>
+            /// Gets the path to umbraco's icons directory (/umbraco/assets/icons by default).
+            /// </summary>
+            public const string IconsPath = "Umbraco.Icons.Path";
+
            /// <summary>
            /// Gets the path to the css directory (/css by default).
            /// </summary>
@@ -59,7 +64,7 @@ namespace Umbraco.Core
            public const string MediaPath = "umbracoMediaPath";

            /// <summary>
-            /// The reserved urls from web.config.
+            /// The reserved URLs from web.config.
            /// </summary>
            public const string ReservedUrls = "Umbraco.Core.ReservedUrls";

@@ -96,7 +101,7 @@ namespace Umbraco.Core
            public const string DefaultUILanguage = "Umbraco.Core.DefaultUILanguage";

            /// <summary>
-            /// A true/false value indicating whether umbraco should hide top level nodes from generated urls.
+            /// A true/false value indicating whether umbraco should hide top level nodes from generated URLs.
            /// </summary>
            public const string HideTopLevelNodeFromPath = "Umbraco.Core.HideTopLevelNodeFromPath";

@@ -105,6 +110,26 @@ namespace Umbraco.Core
            /// </summary>
            public const string UseHttps = "Umbraco.Core.UseHttps";

+            /// <summary>
+            /// A true/false value indicating whether the content dashboard should be visible for all user groups.
+            /// </summary>
+            public const string AllowContentDashboardAccessToAllUsers = "Umbraco.Core.AllowContentDashboardAccessToAllUsers";
+
+            /// <summary>
+            /// The path to use when constructing the URL for retrieving data for the content dashboard.
+            /// </summary>
+            public const string ContentDashboardPath = "Umbraco.Core.ContentDashboardPath";
+
+            /// <summary>
+            /// A list of allowed addresses to fetch content for the content dashboard.
+            /// </summary>
+            public const string ContentDashboardUrlAllowlist = "Umbraco.Core.ContentDashboardUrl-Allowlist";
+
+            /// <summary>
+            /// A list of allowed addresses to fetch content for the help page.
+            /// </summary>
+            public const string HelpPageUrlAllowList = "Umbraco.Core.HelpPage-Allowlist";
+
            /// <summary>
            /// TODO: FILL ME IN
            /// </summary>
@@ -135,6 +160,16 @@ namespace Umbraco.Core
                /// </summary>
                public const string DatabaseFactoryServerVersion = "Umbraco.Core.Debug.DatabaseFactoryServerVersion";
            }
+
+            /// <summary>
+            /// An int value representing the time in milliseconds to lock the database for a write operation
+            /// </summary>
+            public const string SqlWriteLockTimeOut = "Umbraco.Core.SqlWriteLockTimeOut";
+
+            /// <summary>
+            /// Returns true if TinyMCE scripting sanitization should be applied
+            /// </summary>
+            public const string SanitizeTinyMce = "Umbraco.Web.SanitizeTinyMce";
        }
    }
 }
@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Char Arrays to avoid allocations
+        /// </summary>
+        public static class CharArrays
+        {
+            /// <summary>
+            /// Char array containing only /
+            /// </summary>
+            public static readonly char[] ForwardSlash = new char[] { '/' };
+
+            /// <summary>
+            /// Char array containing only \
+            /// </summary>
+            public static readonly char[] Backslash = new char[] { '\\' };
+
+            /// <summary>
+            /// Char array containing only '
+            /// </summary>
+            public static readonly char[] SingleQuote = new char[] { '\'' };
+
+            /// <summary>
+            /// Char array containing only "
+            /// </summary>
+            public static readonly char[] DoubleQuote = new char[] { '\"' };
+
+
+            /// <summary>
+            /// Char array containing ' "
+            /// </summary>
+            public static readonly char[] DoubleQuoteSingleQuote = new char[] { '\"', '\'' };
+
+            /// <summary>
+            /// Char array containing only _
+            /// </summary>
+            public static readonly char[] Underscore = new char[] { '_' };
+
+            /// <summary>
+            /// Char array containing \n \r
+            /// </summary>
+            public static readonly char[] LineFeedCarriageReturn = new char[] { '\n', '\r' };
+
+
+            /// <summary>
+            /// Char array containing \n
+            /// </summary>
+            public static readonly char[] LineFeed = new char[] { '\n' };
+
+            /// <summary>
+            /// Char array containing only ,
+            /// </summary>
+            public static readonly char[] Comma = new char[] { ',' };
+
+            /// <summary>
+            /// Char array containing only &
+            /// </summary>
+            public static readonly char[] Ampersand = new char[] { '&' };
+
+            /// <summary>
+            /// Char array containing only \0
+            /// </summary>
+            public static readonly char[] NullTerminator = new char[] { '\0' };
+
+            /// <summary>
+            /// Char array containing only .
+            /// </summary>
+            public static readonly char[] Period = new char[] { '.' };
+
+            /// <summary>
+            /// Char array containing only ~
+            /// </summary>
+            public static readonly char[] Tilde = new char[] { '~' };
+            /// <summary>
+            /// Char array containing ~ /
+            /// </summary>
+            public static readonly char[] TildeForwardSlash = new char[] { '~', '/' };
+
+            /// <summary>
+            /// Char array containing only ?
+            /// </summary>
+            public static readonly char[] QuestionMark = new char[] { '?' };
+
+            /// <summary>
+            /// Char array containing ? &
+            /// </summary>
+            public static readonly char[] QuestionMarkAmpersand = new char[] { '?', '&' };
+
+            /// <summary>
+            /// Char array containing XML 1.1 whitespace chars
+            /// </summary>
+            public static readonly char[] XmlWhitespaceChars = new char[] { ' ', '\t', '\r', '\n' };
+
+            /// <summary>
+            /// Char array containing only the Space char
+            /// </summary>
+            public static readonly char[] Space = new char[] { ' ' };
+
+            /// <summary>
+            /// Char array containing only ;
+            /// </summary>
+            public static readonly char[] Semicolon = new char[] { ';' };
+
+            /// <summary>
+            /// Char array containing a comma and a space
+            /// </summary>
+            public static readonly char[] CommaSpace = new char[] { ',', ' ' };
+
+            /// <summary>
+            /// Char array containing  _ -
+            /// </summary>
+            public static readonly char[] UnderscoreDash = new char[] { '_', '-' };
+
+            /// <summary>
+            /// Char array containing =
+            /// </summary>
+            public static readonly char[] EqualsChar = new char[] { '=' };
+
+            /// <summary>
+            /// Char array containing >
+            /// </summary>
+            public static readonly char[] GreaterThan = new char[] { '>' };
+
+            /// <summary>
+            /// Char array containing |
+            /// </summary>
+            public static readonly char[] VerticalTab = new char[] { '|' };
+        }
+    }
+}
@@ -118,6 +118,46 @@ namespace Umbraco.Core
                /// </summary>
                public const string Image = "Image";

+                /// <summary>
+                /// MediaType name for a video.
+                /// </summary>
+                public const string Video = "Video";
+
+                /// <summary>
+                /// MediaType name for an audio.
+                /// </summary>
+                public const string Audio = "Audio";
+
+                /// <summary>
+                /// MediaType name for an article.
+                /// </summary>
+                public const string Article = "Article";
+
+                /// <summary>
+                /// MediaType name for vector graphics.
+                /// </summary>
+                public const string VectorGraphics = "VectorGraphics";
+
+                /// <summary>
+                /// MediaType alias for a video.
+                /// </summary>
+                public const string VideoAlias = "umbracoMediaVideo";
+
+                /// <summary>
+                /// MediaType alias for an audio.
+                /// </summary>
+                public const string AudioAlias = "umbracoMediaAudio";
+
+                /// <summary>
+                /// MediaType alias for an article.
+                /// </summary>
+                public const string ArticleAlias = "umbracoMediaArticle";
+
+                /// <summary>
+                /// MediaType alias for vector graphics.
+                /// </summary>
+                public const string VectorGraphicsAlias = "umbracoMediaVectorGraphics";
+
                /// <summary>
                /// MediaType alias indicating allowing auto-selection.
                /// </summary>
@@ -202,9 +242,14 @@ namespace Umbraco.Core
                public const string FailedPasswordAttemptsLabel = "Failed Password Attempts";

                /// <summary>
-                /// Group name to put the membership properties on
+                /// The standard properties group alias for membership properties.
                /// </summary>
-                internal const string StandardPropertiesGroupName = "Membership";
+                public const string StandardPropertiesGroupAlias = "membership";
+
+                /// <summary>
+                /// The standard properties group name for membership properties.
+                /// </summary>
+                public const string StandardPropertiesGroupName = "Membership";

                public static Dictionary<string, PropertyType> GetStandardPropertyTypeStubs()
                {
@@ -25,6 +25,10 @@ namespace Umbraco.Core
            public const int DropDownSingle = -39;
            public const int DropDownMultiple = -42;
            public const int Upload = -90;
+            public const int UploadVideo = -100;
+            public const int UploadAudio = -101;
+            public const int UploadArticle = -102;
+            public const int UploadVectorGraphics = -103;

            public const int DefaultContentListView = -95;
            public const int DefaultMediaListView = -96;
@@ -42,7 +46,7 @@ namespace Umbraco.Core
            /// Defines the identifiers for Umbraco data types as constants for easy centralized access/management.
            /// </summary>
            public static class Guids
-            {   
+            {

                /// <summary>
                /// Guid for Content Picker as string
@@ -88,6 +92,49 @@ namespace Umbraco.Core
                public static readonly Guid MultipleMediaPickerGuid = new Guid(MultipleMediaPicker);


+                /// <summary>
+                /// Guid for Media Picker v3 as string
+                /// </summary>
+                public const string MediaPicker3 = "4309A3EA-0D78-4329-A06C-C80B036AF19A";
+
+                /// <summary>
+                /// Guid for Media Picker v3
+                /// </summary>
+                public static readonly Guid MediaPicker3Guid = new Guid(MediaPicker3);
+
+                /// <summary>
+                /// Guid for Media Picker v3 multiple as string
+                /// </summary>
+                public const string MediaPicker3Multiple = "1B661F40-2242-4B44-B9CB-3990EE2B13C0";
+
+                /// <summary>
+                /// Guid for Media Picker v3 multiple
+                /// </summary>
+                public static readonly Guid MediaPicker3MultipleGuid = new Guid(MediaPicker3Multiple);
+
+
+                /// <summary>
+                /// Guid for Media Picker v3 single-image as string
+                /// </summary>
+                public const string MediaPicker3SingleImage = "AD9F0CF2-BDA2-45D5-9EA1-A63CFC873FD3";
+
+                /// <summary>
+                /// Guid for Media Picker v3 single-image
+                /// </summary>
+                public static readonly Guid MediaPicker3SingleImageGuid = new Guid(MediaPicker3SingleImage);
+
+
+                /// <summary>
+                /// Guid for Media Picker v3 multi-image as string
+                /// </summary>
+                public const string MediaPicker3MultipleImages = "0E63D883-B62B-4799-88C3-157F82E83ECC";
+
+                /// <summary>
+                /// Guid for Media Picker v3 multi-image
+                /// </summary>
+                public static readonly Guid MediaPicker3MultipleImagesGuid = new Guid(MediaPicker3MultipleImages);
+
+
                /// <summary>
                /// Guid for Related Links as string
                /// </summary>
@@ -307,6 +354,46 @@ namespace Umbraco.Core
                /// </summary>
                public static readonly Guid UploadGuid = new Guid(Upload);

+                /// <summary>
+                /// Guid for UploadVideo as string
+                /// </summary>
+                public const string UploadVideo = "70575fe7-9812-4396-bbe1-c81a76db71b5";
+
+                /// <summary>
+                /// Guid for UploadVideo
+                /// </summary>
+                public static readonly Guid UploadVideoGuid = new Guid(UploadVideo);
+
+                /// <summary>
+                /// Guid for UploadAudio as string
+                /// </summary>
+                public const string UploadAudio = "8f430dd6-4e96-447e-9dc0-cb552c8cd1f3";
+
+                /// <summary>
+                /// Guid for UploadAudio
+                /// </summary>
+                public static readonly Guid UploadAudioGuid = new Guid(UploadAudio);
+
+                /// <summary>
+                /// Guid for UploadArticle as string
+                /// </summary>
+                public const string UploadArticle = "bc1e266c-dac4-4164-bf08-8a1ec6a7143d";
+
+                /// <summary>
+                /// Guid for UploadArticle
+                /// </summary>
+                public static readonly Guid UploadArticleGuid = new Guid(UploadArticle);
+
+                /// <summary>
+                /// Guid for UploadVectorGraphics as string
+                /// </summary>
+                public const string UploadVectorGraphics = "215cb418-2153-4429-9aef-8c0f0041191b";
+
+                /// <summary>
+                /// Guid for UploadVectorGraphics
+                /// </summary>
+                public static readonly Guid UploadVectorGraphicsGuid = new Guid(UploadVectorGraphics);
+

                /// <summary>
                /// Guid for Label as string
@@ -367,8 +454,8 @@ namespace Umbraco.Core
                /// Guid for Label decimal
                /// </summary>
                public static readonly Guid LabelDecimalGuid = new Guid(LabelDecimal);
-                
-                
+
+
            }
        }
    }
@@ -24,6 +24,26 @@
            /// </summary>
            public const string DataType = "icon-autofill";

+            /// <summary>
+            /// System dictionary icon
+            /// </summary>
+            public const string Dictionary = "icon-book-alt";
+
+            /// <summary>
+            /// System generic folder icon
+            /// </summary>
+            public const string Folder = "icon-folder";
+
+            /// <summary>
+            /// System language icon
+            /// </summary>
+            public const string Language = "icon-globe";
+
+            /// <summary>
+            /// System logviewer icon
+            /// </summary>
+            public const string LogViewer = "icon-box-alt";
+
            /// <summary>
            /// System list view icon
            /// </summary>
@@ -39,6 +59,26 @@
            /// </summary>
            public const string MediaFile = "icon-document";

+            /// <summary>
+            /// System media video icon
+            /// </summary>
+            public const string MediaVideo = "icon-video";
+
+            /// <summary>
+            /// System media audio icon
+            /// </summary>
+            public const string MediaAudio = "icon-sound-waves";
+
+            /// <summary>
+            /// System media article icon
+            /// </summary>
+            public const string MediaArticle = "icon-article";
+
+            /// <summary>
+            /// System media vector icon
+            /// </summary>
+            public const string MediaVectorGraphics = "icon-picture";
+
            /// <summary>
            /// System media folder icon
            /// </summary>
@@ -69,6 +109,11 @@
            /// </summary>
            public const string MemberType = "icon-users";

+            /// <summary>
+            /// System packages icon
+            /// </summary>
+            public const string Packages = "icon-box";
+
            /// <summary>
            /// System property editor icon
            /// </summary>
@@ -51,6 +51,11 @@ namespace Umbraco.Core
                /// </summary>
                public const string ColorPicker = "Umbraco.ColorPicker";

+                /// <summary>
+                /// EyeDropper Color Picker.
+                /// </summary>
+                public const string ColorPickerEyeDropper = "Umbraco.ColorPicker.EyeDropper";
+
                /// <summary>
                /// Content Picker.
                /// </summary>
@@ -90,12 +95,17 @@ namespace Umbraco.Core
                /// ListView.
                /// </summary>
                public const string ListView = "Umbraco.ListView";
-                
+
                /// <summary>
                /// Media Picker.
                /// </summary>
                public const string MediaPicker = "Umbraco.MediaPicker";

+                /// <summary>
+                /// Media Picker v.3.
+                /// </summary>
+                public const string MediaPicker3 = "Umbraco.MediaPicker3";
+
                /// <summary>
                /// Multiple Media Picker.
                /// </summary>
@@ -192,7 +202,7 @@ namespace Umbraco.Core
                public const string NestedContent = "Umbraco.NestedContent";

                /// <summary>
-                /// Alias for the multi url picker editor.
+                /// Alias for the multi URL picker editor.
                /// </summary>
                public const string MultiUrlPicker = "Umbraco.MultiUrlPicker";
            }
@@ -8,7 +8,7 @@
        public static class PropertyTypeGroups
        {
            /// <summary>
-            /// Guid for a Image PropertyTypeGroup object.
+            /// Guid for an Image PropertyTypeGroup object.
            /// </summary>
            public const string Image = "79ED4D07-254A-42CF-8FA9-EBE1C116A596";

@@ -18,7 +18,27 @@
            public const string File = "50899F9C-023A-4466-B623-ABA9049885FE";

            /// <summary>
-            /// Guid for a Image PropertyTypeGroup object.
+            /// Guid for a Video PropertyTypeGroup object.
+            /// </summary>
+            public const string Video = "2F0A61B6-CF92-4FF4-B437-751AB35EB254";
+
+            /// <summary>
+            /// Guid for an Audio PropertyTypeGroup object.
+            /// </summary>
+            public const string Audio = "335FB495-0A87-4E82-B902-30EB367B767C";
+
+            /// <summary>
+            /// Guid for an Article PropertyTypeGroup object.
+            /// </summary>
+            public const string Article = "9AF3BD65-F687-4453-9518-5F180D1898EC";
+
+            /// <summary>
+            /// Guid for a VectorGraphics PropertyTypeGroup object.
+            /// </summary>
+            public const string VectorGraphics = "F199B4D7-9E84-439F-8531-F87D9AF37711";
+
+            /// <summary>
+            /// Guid for a Membership PropertyTypeGroup object.
            /// </summary>
            public const string Membership = "0756729D-D665-46E3-B84A-37ACEAA614F8";
        }
@@ -25,7 +25,7 @@ namespace Umbraco.Core
            /// <summary>
            /// The name of the 'unknown' user.
            /// </summary>
-            public const string UnknownUserName = "SYTEM";
+            public const string UnknownUserName = "SYSTEM";

            public const string AdminGroupAlias = "admin";
            public const string EditorGroupAlias = "editor";
@@ -56,6 +56,8 @@ namespace Umbraco.Core
            public const string AllowedApplicationsClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/allowedapp";
            public const string SessionIdClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/sessionid";

+            public const string BackOfficeExternalLoginOptionsProperty = "UmbracoBackOfficeExternalLoginOptions";
+
        }
    }
 }
@@ -0,0 +1,17 @@
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        public static class Sql
+        {
+            /// <summary>
+            /// The maximum amount of parameters that can be used in a query.
+            /// </summary>
+            /// <remarks>
+            /// The actual limit is 2100 (https://docs.microsoft.com/en-us/sql/sql-server/maximum-capacity-specifications-for-sql-server),
+            /// but we want to ensure there's room for additional parameters if this value is used to create groups/batches.
+            /// </remarks>
+            public const int MaxParameterCount = 2000;
+        }
+    }
+}
@@ -14,7 +14,30 @@
                public const string GetParentNode = "Umbraco.Core.VersionableRepository.GetParentNode";
                public const string GetReservedId = "Umbraco.Core.VersionableRepository.GetReservedId";
            }
+            public static class RelationRepository
+            {
+                public const string DeleteByParentAll = "Umbraco.Core.RelationRepository.DeleteByParent";
+                public const string DeleteByParentIn = "Umbraco.Core.RelationRepository.DeleteByParentIn";
+            }

+            public static class DataTypeRepository
+            {
+                public const string EnsureUniqueNodeName = "Umbraco.Core.DataTypeDefinitionRepository.EnsureUniqueNodeName";
+            }
+
+            internal static class NuCacheDatabaseDataSource
+            {
+                public const string WhereNodeId = "Umbraco.Web.PublishedCache.NuCache.DataSource.WhereNodeId";
+                public const string WhereNodeIdX = "Umbraco.Web.PublishedCache.NuCache.DataSource.WhereNodeIdX";
+                public const string SourcesSelectUmbracoNodeJoin = "Umbraco.Web.PublishedCache.NuCache.DataSource.SourcesSelectUmbracoNodeJoin";
+                public const string ContentSourcesSelect = "Umbraco.Web.PublishedCache.NuCache.DataSource.ContentSourcesSelect";                
+                public const string ContentSourcesCount = "Umbraco.Web.PublishedCache.NuCache.DataSource.ContentSourcesCount";
+                public const string MediaSourcesSelect = "Umbraco.Web.PublishedCache.NuCache.DataSource.MediaSourcesSelect";
+                public const string MediaSourcesCount = "Umbraco.Web.PublishedCache.NuCache.DataSource.MediaSourcesCount";
+                public const string ObjectTypeNotTrashedFilter = "Umbraco.Web.PublishedCache.NuCache.DataSource.ObjectTypeNotTrashedFilter";
+                public const string OrderByLevelIdSortOrder = "Umbraco.Web.PublishedCache.NuCache.DataSource.OrderByLevelIdSortOrder";
+
+            }
        }
    }
 }
@@ -17,6 +17,11 @@
            /// The preview cookie name
            /// </summary>
            public const string PreviewCookieName = "UMB_PREVIEW";
+            /// <summary>
+
+            /// Client-side cookie that determines whether the user has accepted to be in Preview Mode when visiting the website.
+            /// </summary>
+            public const string AcceptPreviewCookieName = "UMB-WEBSITE-PREVIEW-ACCEPT";

            public const string InstallerCookieName = "umb_installId";
        }
@@ -0,0 +1,27 @@
+using System;
+using System.Security.Cryptography;
+
+namespace Umbraco.Core
+{
+    public static class CryptoServiceProviderExtensions
+    {
+        /// <summary>
+        /// Generates a random int withing a specified range.
+        /// </summary>
+        /// <param name="provider">Random bytes provider.</param>
+        /// <param name="minValue">The minimum value of the resulting int.</param>
+        /// <param name="maxValue">The maximum value of the resulting int.</param>
+        /// <returns>A random integer that falls withing the specified range.</returns>
+        public static int GetInt32(this RNGCryptoServiceProvider provider, int minValue, int maxValue)
+        {
+            var randomBytes = new byte[4];
+            provider.GetBytes(randomBytes);
+
+            var randomInt = Math.Abs(BitConverter.ToInt32(randomBytes, 0));
+            // We call do mod to ensure that the value is within the specified range.
+            return randomInt % (maxValue - minValue + 1) + minValue;
+        }
+    }
+}
+
+
@@ -0,0 +1,43 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Dashboards
+{
+    public class ContentDashboardSettings : IContentDashboardSettings
+    {
+        private const string DefaultContentDashboardPath = "cms";
+
+        /// <summary>
+        /// Gets a value indicating whether the content dashboard should be available to all users.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
+        ///     and the default access rules for that dashboard will be in use.
+        /// </value>
+        public bool AllowContentDashboardAccessToAllUsers
+        {
+            get
+            {
+                bool.TryParse(ConfigurationManager.AppSettings[Constants.AppSettings.AllowContentDashboardAccessToAllUsers], out var value);
+                return value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to use when constructing the URL for retrieving data for the content dashboard.
+        /// </summary>
+        /// <value>The URL path.</value>
+        public string ContentDashboardPath =>
+            ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.ContentDashboardPath)
+                ? ConfigurationManager.AppSettings[Constants.AppSettings.ContentDashboardPath]
+                : DefaultContentDashboardPath;
+
+        /// <summary>
+        /// Gets the allowed addresses to retrieve data for the content dashboard.
+        /// </summary>
+        /// <value>The URLs.</value>
+        public string ContentDashboardUrlAllowlist =>
+            ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.ContentDashboardUrlAllowlist)
+                ? ConfigurationManager.AppSettings[Constants.AppSettings.ContentDashboardUrlAllowlist]
+                : null;
+    }
+}
@@ -0,0 +1,26 @@
+namespace Umbraco.Core.Dashboards
+{
+    public interface IContentDashboardSettings
+    {
+        /// <summary>
+        /// Gets a value indicating whether the content dashboard should be available to all users.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if the dashboard is visible for all user groups; otherwise, <c>false</c>
+        ///     and the default access rules for that dashboard will be in use.
+        /// </value>
+        bool AllowContentDashboardAccessToAllUsers { get; }
+
+        /// <summary>
+        /// Gets the path to use when constructing the URL for retrieving data for the content dashboard.
+        /// </summary>
+        /// <value>The URL path.</value>
+        string ContentDashboardPath { get; }
+
+        /// <summary>
+        /// Gets the allowed addresses to retrieve data for the content dashboard.
+        /// </summary>
+        /// <value>The URLs.</value>
+        string ContentDashboardUrlAllowlist { get; }
+    }
+}
@@ -79,24 +79,26 @@ namespace Umbraco.Core.Diagnostics

        private static bool Write(SafeHandle fileHandle, Option options, bool withException = false)
        {
-            var currentProcess = Process.GetCurrentProcess();
-            var currentProcessHandle = currentProcess.Handle;
-            var currentProcessId = (uint)currentProcess.Id;
+            using (var currentProcess = Process.GetCurrentProcess())
+            {
+                var currentProcessHandle = currentProcess.Handle;
+                var currentProcessId = (uint)currentProcess.Id;

-            MiniDumpExceptionInformation exp;
+                MiniDumpExceptionInformation exp;

-            exp.ThreadId = GetCurrentThreadId();
-            exp.ClientPointers = false;
-            exp.ExceptionPointers = IntPtr.Zero;
+                exp.ThreadId = GetCurrentThreadId();
+                exp.ClientPointers = false;
+                exp.ExceptionPointers = IntPtr.Zero;

-            if (withException)
-                exp.ExceptionPointers = Marshal.GetExceptionPointers();
+                if (withException)
+                    exp.ExceptionPointers = Marshal.GetExceptionPointers();

-            var bRet = exp.ExceptionPointers == IntPtr.Zero
-                ? MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint) options, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero)
-                : MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint) options, ref exp, IntPtr.Zero, IntPtr.Zero);
+                var bRet = exp.ExceptionPointers == IntPtr.Zero
+                    ? MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint)options, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero)
+                    : MiniDumpWriteDump(currentProcessHandle, currentProcessId, fileHandle, (uint)options, ref exp, IntPtr.Zero, IntPtr.Zero);

-            return bRet;
+                return bRet;
+            }
        }

        public static bool Dump(Option options = Option.WithFullMemory, bool withException = false)
@@ -253,7 +253,7 @@ namespace Umbraco.Core
            {
                builder.Append(String.Format("{0}={1}&", HttpUtility.UrlEncode(i.Key), i.Value == null ? string.Empty : HttpUtility.UrlEncode(i.Value.ToString())));
            }
-            return builder.ToString().TrimEnd('&');
+            return builder.ToString().TrimEnd(Constants.CharArrays.Ampersand);
        }

        /// <summary>The get entry ignore case.</summary>
@@ -0,0 +1,9 @@
+namespace Umbraco.Core.Events
+{
+    /// <summary>
+    /// Used to notify that an Unattended install has completed
+    /// </summary>
+    public class UnattendedInstallEventArgs : System.ComponentModel.CancelEventArgs
+    {
+    }
+}
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.Serialization;
+using System.Text;

 namespace Umbraco.Core.Exceptions
 {
@@ -34,6 +35,14 @@ namespace Umbraco.Core.Exceptions
        /// </value>
        public string[] PropertyTypeAliases { get; }

+        /// <summary>
+        /// Gets the property group aliases.
+        /// </summary>
+        /// <value>
+        /// The property group aliases.
+        /// </value>
+        public string[] PropertyGroupAliases { get; }
+
        /// <summary>
        /// Initializes a new instance of the <see cref="InvalidCompositionException" /> class.
        /// </summary>
@@ -56,21 +65,49 @@ namespace Umbraco.Core.Exceptions
        /// <param name="addedCompositionAlias">The added composition alias.</param>
        /// <param name="propertyTypeAliases">The property type aliases.</param>
        public InvalidCompositionException(string contentTypeAlias, string addedCompositionAlias, string[] propertyTypeAliases)
-            : this(addedCompositionAlias.IsNullOrWhiteSpace()
-                    ? string.Format(
-                        "ContentType with alias '{0}' has an invalid composition " +
-                        "and there was a conflict on the following PropertyTypes: '{1}'. " +
-                        "PropertyTypes must have a unique alias across all Compositions in order to compose a valid ContentType Composition.",
-                        contentTypeAlias, string.Join(", ", propertyTypeAliases))
-                    : string.Format(
-                        "ContentType with alias '{0}' was added as a Composition to ContentType with alias '{1}', " +
-                        "but there was a conflict on the following PropertyTypes: '{2}'. " +
-                        "PropertyTypes must have a unique alias across all Compositions in order to compose a valid ContentType Composition.",
-                        addedCompositionAlias, contentTypeAlias, string.Join(", ", propertyTypeAliases)))
+            : this(contentTypeAlias, addedCompositionAlias, propertyTypeAliases, new string[0])
+        { }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvalidCompositionException" /> class.
+        /// </summary>
+        /// <param name="contentTypeAlias">The content type alias.</param>
+        /// <param name="addedCompositionAlias">The added composition alias.</param>
+        /// <param name="propertyTypeAliases">The property type aliases.</param>
+        /// <param name="propertyGroupAliases">The property group aliases.</param>
+        public InvalidCompositionException(string contentTypeAlias, string addedCompositionAlias, string[] propertyTypeAliases, string[] propertyGroupAliases)
+            : this(FormatMessage(contentTypeAlias, addedCompositionAlias, propertyTypeAliases, propertyGroupAliases))
        {
            ContentTypeAlias = contentTypeAlias;
            AddedCompositionAlias = addedCompositionAlias;
            PropertyTypeAliases = propertyTypeAliases;
+            PropertyGroupAliases = propertyGroupAliases;
+        }
+
+        private static string FormatMessage(string contentTypeAlias, string addedCompositionAlias, string[] propertyTypeAliases, string[] propertyGroupAliases)
+        {
+            var sb = new StringBuilder();
+
+            if (addedCompositionAlias.IsNullOrWhiteSpace())
+            {
+                sb.AppendFormat("Content type with alias '{0}' has an invalid composition.", contentTypeAlias);
+            }
+            else
+            {
+                sb.AppendFormat("Content type with alias '{0}' was added as a composition to content type with alias '{1}', but there was a conflict.", addedCompositionAlias, contentTypeAlias);
+            }
+
+            if (propertyTypeAliases.Length > 0)
+            {
+                sb.AppendFormat(" Property types must have a unique alias across all compositions, these aliases are duplicate: {0}.", string.Join(", ", propertyTypeAliases));
+            }
+
+            if (propertyGroupAliases.Length > 0)
+            {
+                sb.AppendFormat(" Property groups with the same alias must also have the same type across all compositions, these aliases have different types: {0}.", string.Join(", ", propertyGroupAliases));
+            }
+
+            return sb.ToString();
        }

        /// <summary>
@@ -101,6 +138,7 @@ namespace Umbraco.Core.Exceptions
            ContentTypeAlias = info.GetString(nameof(ContentTypeAlias));
            AddedCompositionAlias = info.GetString(nameof(AddedCompositionAlias));
            PropertyTypeAliases = (string[])info.GetValue(nameof(PropertyTypeAliases), typeof(string[]));
+            PropertyGroupAliases = (string[])info.GetValue(nameof(PropertyGroupAliases), typeof(string[]));
        }

        /// <summary>
@@ -119,6 +157,7 @@ namespace Umbraco.Core.Exceptions
            info.AddValue(nameof(ContentTypeAlias), ContentTypeAlias);
            info.AddValue(nameof(AddedCompositionAlias), AddedCompositionAlias);
            info.AddValue(nameof(PropertyTypeAliases), PropertyTypeAliases);
+            info.AddValue(nameof(PropertyGroupAliases), PropertyGroupAliases);

            base.GetObjectData(info, context);
        }
@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Exceptions
+{
+    /// <summary>
+    /// An exception that is thrown if an unattended installation occurs.
+    /// </summary>
+    [Serializable]
+    public class UnattendedInstallException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattendedInstallException" /> class.
+        /// </summary>
+        public UnattendedInstallException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattendedInstallException" /> class with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public UnattendedInstallException(string message) : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattendedInstallException" /> class with a specified error message
+        /// and a reference to the inner exception which is the cause of this exception.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        /// <param name="innerException">The inner exception, or null.</param>
+        public UnattendedInstallException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnattendedInstallException" /> class.
+        /// </summary>
+        /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
+        protected UnattendedInstallException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
@@ -33,8 +33,8 @@ namespace Umbraco.Core
            : base(uriValue)
        {
            Guid guid;
-            if (Guid.TryParse(uriValue.AbsolutePath.TrimStart('/'), out guid) == false)
-                throw new FormatException("Url \"" + uriValue + "\" is not a guid entity id.");
+            if (Guid.TryParse(uriValue.AbsolutePath.TrimStart(Constants.CharArrays.ForwardSlash), out guid) == false)
+                throw new FormatException("URI \"" + uriValue + "\" is not a GUID entity ID.");

            Guid = guid;
        }
@@ -48,7 +48,7 @@ namespace Umbraco.Core
        {
            var udi = Udi.Parse(s);
            if (udi is GuidUdi == false)
-                throw new FormatException("String \"" + s + "\" is not a guid entity id.");
+                throw new FormatException("String \"" + s + "\" is not a GUID entity id.");

            return (GuidUdi) udi;
        }
@@ -0,0 +1,12 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Help
+{
+    public class HelpPageSettings : IHelpPageSettings
+    {
+        public string HelpPageUrlAllowList =>
+            ConfigurationManager.AppSettings.ContainsKey(Constants.AppSettings.HelpPageUrlAllowList)
+                ? ConfigurationManager.AppSettings[Constants.AppSettings.HelpPageUrlAllowList]
+                : null;
+    }
+}
@@ -0,0 +1,10 @@
+namespace Umbraco.Core.Help
+{
+    public interface IHelpPageSettings
+    {
+        /// <summary>
+        /// Gets the allowed addresses to retrieve data for the help page.
+        /// </summary>
+        string HelpPageUrlAllowList { get; }
+    }
+}
@@ -50,7 +50,7 @@ namespace Umbraco.Core
                if (string.IsNullOrEmpty(ipAddress))
                    return request.UserHostAddress;

-                var addresses = ipAddress.Split(',');
+                var addresses = ipAddress.Split(Constants.CharArrays.Comma);
                if (addresses.Length != 0)
                    return addresses[0];

@@ -23,94 +23,94 @@ namespace Umbraco.Core.IO

        internal IFileSystem InnerFileSystem { get; set; }

-        public IEnumerable<string> GetDirectories(string path)
+        public virtual IEnumerable<string> GetDirectories(string path)
        {
            return InnerFileSystem.GetDirectories(path);
        }

-        public void DeleteDirectory(string path)
+        public virtual void DeleteDirectory(string path)
        {
            InnerFileSystem.DeleteDirectory(path);
        }

-        public void DeleteDirectory(string path, bool recursive)
+        public virtual void DeleteDirectory(string path, bool recursive)
        {
            InnerFileSystem.DeleteDirectory(path, recursive);
        }

-        public bool DirectoryExists(string path)
+        public virtual bool DirectoryExists(string path)
        {
            return InnerFileSystem.DirectoryExists(path);
        }

-        public void AddFile(string path, Stream stream)
+        public virtual void AddFile(string path, Stream stream)
        {
            InnerFileSystem.AddFile(path, stream);
        }

-        public void AddFile(string path, Stream stream, bool overrideExisting)
+        public virtual void AddFile(string path, Stream stream, bool overrideExisting)
        {
            InnerFileSystem.AddFile(path, stream, overrideExisting);
        }

-        public IEnumerable<string> GetFiles(string path)
+        public virtual IEnumerable<string> GetFiles(string path)
        {
            return InnerFileSystem.GetFiles(path);
        }

-        public IEnumerable<string> GetFiles(string path, string filter)
+        public virtual IEnumerable<string> GetFiles(string path, string filter)
        {
            return InnerFileSystem.GetFiles(path, filter);
        }

-        public Stream OpenFile(string path)
+        public virtual Stream OpenFile(string path)
        {
            return InnerFileSystem.OpenFile(path);
        }

-        public void DeleteFile(string path)
+        public virtual void DeleteFile(string path)
        {
            InnerFileSystem.DeleteFile(path);
        }

-        public bool FileExists(string path)
+        public virtual bool FileExists(string path)
        {
            return InnerFileSystem.FileExists(path);
        }

-        public string GetRelativePath(string fullPathOrUrl)
+        public virtual string GetRelativePath(string fullPathOrUrl)
        {
            return InnerFileSystem.GetRelativePath(fullPathOrUrl);
        }

-        public string GetFullPath(string path)
+        public virtual string GetFullPath(string path)
        {
            return InnerFileSystem.GetFullPath(path);
        }

-        public string GetUrl(string path)
+        public virtual string GetUrl(string path)
        {
            return InnerFileSystem.GetUrl(path);
        }

-        public DateTimeOffset GetLastModified(string path)
+        public virtual DateTimeOffset GetLastModified(string path)
        {
            return InnerFileSystem.GetLastModified(path);
        }

-        public DateTimeOffset GetCreated(string path)
+        public virtual DateTimeOffset GetCreated(string path)
        {
            return InnerFileSystem.GetCreated(path);
        }

-        public long GetSize(string path)
+        public virtual long GetSize(string path)
        {
            return InnerFileSystem.GetSize(path);
        }

-        public bool CanAddPhysical => InnerFileSystem.CanAddPhysical;
+        public virtual bool CanAddPhysical => InnerFileSystem.CanAddPhysical;

-        public void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false)
+        public virtual void AddFile(string path, string physicalPath, bool overrideIfExists = true, bool copy = false)
        {
            InnerFileSystem.AddFile(path, physicalPath, overrideIfExists, copy);
        }
@@ -225,7 +225,7 @@ namespace Umbraco.Core.IO

                _shadowCurrentId = id;

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

                foreach (var wrapper in _shadowWrappers)
                    wrapper.Shadow(_shadowCurrentId);
@@ -242,7 +242,7 @@ namespace Umbraco.Core.IO
                if (id != _shadowCurrentId)
                    throw new InvalidOperationException("Not the current shadow.");

-                _logger.Debug<ShadowFileSystems>("UnShadow '{ShadowId}' {Status}", id, completed ? "complete" : "abort");
+                _logger.Debug<ShadowFileSystems, string, string>("UnShadow '{ShadowId}' {Status}", id, completed ? "complete" : "abort");

                var exceptions = new List<Exception>();
                foreach (var wrapper in _shadowWrappers)
@@ -102,7 +102,7 @@ namespace Umbraco.Core.IO
        /// <summary>
        /// Returns the application relative path to the file.
        /// </summary>
-        /// <param name="fullPathOrUrl">The full path or url.</param>
+        /// <param name="fullPathOrUrl">The full path or URL.</param>
        /// <returns>
        /// The <see cref="string"/> representing the relative path.
        /// </returns>
@@ -118,11 +118,11 @@ namespace Umbraco.Core.IO
        string GetFullPath(string path);

        /// <summary>
-        /// Returns the application relative url to the file.
+        /// Returns the application relative URL to the file.
        /// </summary>
-        /// <param name="path">The path to return the url for.</param>
+        /// <param name="path">The path to return the URL for.</param>
        /// <returns>
-        /// <see cref="string"/> representing the relative url.
+        /// <see cref="string"/> representing the relative URL.
        /// </returns>
        string GetUrl(string path);

@@ -40,7 +40,7 @@ namespace Umbraco.Core.IO
                retval = virtualPath.Replace("~", SystemDirectories.Root);

            if (virtualPath.StartsWith("/") && virtualPath.StartsWith(SystemDirectories.Root) == false)
-                retval = SystemDirectories.Root + "/" + virtualPath.TrimStart('/');
+                retval = SystemDirectories.Root + "/" + virtualPath.TrimStart(Constants.CharArrays.ForwardSlash);

            return retval;
        }
@@ -81,6 +81,7 @@ namespace Umbraco.Core.IO
        public static string MapPath(string path, bool useHttpContext)
        {
            if (path == null) throw new ArgumentNullException("path");
+
            useHttpContext = useHttpContext && IsHosted;

            // Check if the path is already mapped
@@ -89,20 +90,18 @@ namespace Umbraco.Core.IO
            {
                return path;
            }
-            // Check that we even have an HttpContext! otherwise things will fail anyways
-            // http://umbraco.codeplex.com/workitem/30946

-            if (useHttpContext && HttpContext.Current != null)
+            if (useHttpContext)
            {
                //string retval;
                if (String.IsNullOrEmpty(path) == false && (path.StartsWith("~") || path.StartsWith(SystemDirectories.Root)))
                    return HostingEnvironment.MapPath(path);
                else
-                    return HostingEnvironment.MapPath("~/" + path.TrimStart('/'));
+                    return HostingEnvironment.MapPath("~/" + path.TrimStart(Constants.CharArrays.ForwardSlash));
            }

            var root = GetRootDirectorySafe();
-            var newPath = path.TrimStart('~', '/').Replace('/', IOHelper.DirSepChar);
+            var newPath = path.TrimStart(Constants.CharArrays.TildeForwardSlash).Replace('/', IOHelper.DirSepChar);
            var retval = root + IOHelper.DirSepChar.ToString(CultureInfo.InvariantCulture) + newPath;

            return retval;
@@ -121,7 +120,7 @@ namespace Umbraco.Core.IO
            if (string.IsNullOrEmpty(retval))
                retval = standardPath;

-            return retval.TrimEnd('/');
+            return retval.TrimEnd(Constants.CharArrays.ForwardSlash);
        }

        internal static string ReturnPath(string settingsKey, string standardPath)
@@ -188,7 +187,7 @@ namespace Umbraco.Core.IO
        internal static bool VerifyFileExtension(string filePath, IEnumerable<string> validFileExtensions)
        {
            var ext = Path.GetExtension(filePath);
-            return ext != null && validFileExtensions.Contains(ext.TrimStart('.'));
+            return ext != null && validFileExtensions.Contains(ext.TrimStart(Constants.CharArrays.Period));
        }

        public static bool PathStartsWith(string path, string root, char separator)
@@ -51,7 +51,7 @@ namespace Umbraco.Core.IO
                }
                catch (Exception e)
                {
-                    _logger.Error<MediaFileSystem>(e, "Failed to delete media file '{File}'.", file);
+                    _logger.Error<MediaFileSystem,string>(e, "Failed to delete media file '{File}'.", file);
                }
            });
        }
@@ -19,7 +19,7 @@ namespace Umbraco.Core.IO
        // (is used in GetRelativePath)
        private readonly string _rootPathFwd;

-        // the relative url, using url separator chars, NOT ending with a separator
+        // the relative URL, using URL separator chars, NOT ending with a separator
        // eg "" or "/Views" or "/Media" or "/<vpath>/Media" in case of a virtual path
        private readonly string _rootUrl;

@@ -33,7 +33,7 @@ namespace Umbraco.Core.IO

            _rootPath = EnsureDirectorySeparatorChar(IOHelper.MapPath(virtualRoot)).TrimEnd(Path.DirectorySeparatorChar);
            _rootPathFwd = EnsureUrlSeparatorChar(_rootPath);
-            _rootUrl = EnsureUrlSeparatorChar(IOHelper.ResolveUrl(virtualRoot)).TrimEnd('/');
+            _rootUrl = EnsureUrlSeparatorChar(IOHelper.ResolveUrl(virtualRoot)).TrimEnd(Constants.CharArrays.ForwardSlash);
        }

        public PhysicalFileSystem(string rootPath, string rootUrl)
@@ -54,7 +54,7 @@ namespace Umbraco.Core.IO

            _rootPath = EnsureDirectorySeparatorChar(rootPath).TrimEnd(Path.DirectorySeparatorChar);
            _rootPathFwd = EnsureUrlSeparatorChar(_rootPath);
-            _rootUrl = EnsureUrlSeparatorChar(rootUrl).TrimEnd('/');
+            _rootUrl = EnsureUrlSeparatorChar(rootUrl).TrimEnd(Constants.CharArrays.ForwardSlash);
        }

        /// <summary>
@@ -74,11 +74,11 @@ namespace Umbraco.Core.IO
            }
            catch (UnauthorizedAccessException ex)
            {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Not authorized to get directories for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem,string>(ex, "Not authorized to get directories for '{Path}'", fullPath);
            }
            catch (DirectoryNotFoundException ex)
            {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Directory not found for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem,string>(ex, "Directory not found for '{Path}'", fullPath);
            }

            return Enumerable.Empty<string>();
@@ -110,7 +110,7 @@ namespace Umbraco.Core.IO
            }
            catch (DirectoryNotFoundException ex)
            {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Directory not found for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem,string>(ex, "Directory not found for '{Path}'", fullPath);
            }
        }

@@ -190,11 +190,11 @@ namespace Umbraco.Core.IO
            }
            catch (UnauthorizedAccessException ex)
            {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Not authorized to get directories for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem,string>(ex, "Not authorized to get directories for '{Path}'", fullPath);
            }
            catch (DirectoryNotFoundException ex)
            {
-                Current.Logger.Error<PhysicalFileSystem>(ex, "Directory not found for '{FullPath}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem, string>(ex, "Directory not found for '{FullPath}'", fullPath);
            }

            return Enumerable.Empty<string>();
@@ -227,7 +227,7 @@ namespace Umbraco.Core.IO
            }
            catch (FileNotFoundException ex)
            {
-                Current.Logger.Error<PhysicalFileSystem>(ex.InnerException, "DeleteFile failed with FileNotFoundException for '{Path}'", fullPath);
+                Current.Logger.Error<PhysicalFileSystem, string>(ex.InnerException, "DeleteFile failed with FileNotFoundException for '{Path}'", fullPath);
            }
        }

@@ -243,9 +243,9 @@ namespace Umbraco.Core.IO
        }

        /// <summary>
-        /// Gets the filesystem-relative path of a full path or of an url.
+        /// Gets the filesystem-relative path of a full path or of an URL.
        /// </summary>
-        /// <param name="fullPathOrUrl">The full path or url.</param>
+        /// <param name="fullPathOrUrl">The full path or URL.</param>
        /// <returns>The path, relative to this filesystem's root.</returns>
        /// <remarks>
        /// <para>The relative path is relative to this filesystem's root, not starting with any
@@ -253,18 +253,18 @@ namespace Umbraco.Core.IO
        /// </remarks>
        public string GetRelativePath(string fullPathOrUrl)
        {
-            // test url
-            var path = fullPathOrUrl.Replace('\\', '/'); // ensure url separator char
+            // test URL
+            var path = fullPathOrUrl.Replace('\\', '/'); // ensure URL separator char

-            // if it starts with the root url, strip it and trim the starting slash to make it relative
+            // if it starts with the root URL, strip it and trim the starting slash to make it relative
            // eg "/Media/1234/img.jpg" => "1234/img.jpg"
            if (IOHelper.PathStartsWith(path, _rootUrl, '/'))
-                return path.Substring(_rootUrl.Length).TrimStart('/');
+                return path.Substring(_rootUrl.Length).TrimStart(Constants.CharArrays.ForwardSlash);

            // if it starts with the root path, strip it and trim the starting slash to make it relative
            // eg "c:/websites/test/root/Media/1234/img.jpg" => "1234/img.jpg"
            if (IOHelper.PathStartsWith(path, _rootPathFwd, '/'))
-                return path.Substring(_rootPathFwd.Length).TrimStart('/');
+                return path.Substring(_rootPathFwd.Length).TrimStart(Constants.CharArrays.ForwardSlash);

            // unchanged - what else?
            return path;
@@ -319,14 +319,14 @@ namespace Umbraco.Core.IO
        }

        /// <summary>
-        /// Gets the url.
+        /// Gets the URL.
        /// </summary>
        /// <param name="path">The filesystem-relative path.</param>
-        /// <returns>The url.</returns>
+        /// <returns>The URL.</returns>
        /// <remarks>All separators are forward-slashes.</remarks>
        public string GetUrl(string path)
        {
-            path = EnsureUrlSeparatorChar(path).Trim('/');
+            path = EnsureUrlSeparatorChar(path).Trim(Constants.CharArrays.ForwardSlash);
            return _rootUrl + "/" + path;
        }

@@ -182,7 +182,7 @@ namespace Umbraco.Core.IO
            if (Nodes.TryGetValue(normPath, out sf) && sf.IsExist && (sf.IsDir || overrideIfExists == false))
                throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));

-            var parts = normPath.Split('/');
+            var parts = normPath.Split(Constants.CharArrays.ForwardSlash);
            for (var i = 0; i < parts.Length - 1; i++)
            {
                var dirPath = string.Join("/", parts.Take(i + 1));
@@ -297,7 +297,7 @@ namespace Umbraco.Core.IO
            if (Nodes.TryGetValue(normPath, out sf) && sf.IsExist && (sf.IsDir || overrideIfExists == false))
                throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));

-            var parts = normPath.Split('/');
+            var parts = normPath.Split(Constants.CharArrays.ForwardSlash);
            for (var i = 0; i < parts.Length - 1; i++)
            {
                var dirPath = string.Join("/", parts.Take(i + 1));
@@ -11,6 +11,8 @@ namespace Umbraco.Core.IO

        public static string Data => "~/App_Data";

+        public static string LogFiles => Data + "/Logs";
+
        public static string TempData => Data + "/TEMP";

        public static string TempFileUploads => TempData + "/FileUploads";
@@ -23,6 +25,8 @@ namespace Umbraco.Core.IO

        public static string AppPlugins => "~/App_Plugins";

+        public static string AppPluginIcons => "/Backoffice/Icons";
+
        public static string MvcViews => "~/Views";

        public static string PartialViews => MvcViews + "/Partials/";
@@ -7,6 +7,8 @@ namespace Umbraco.Core.IO
    {
        public static string TinyMceConfig => SystemDirectories.Config + "/tinyMceConfig.config";

+        public static string UmbracoSettings => SystemDirectories.Config + "/UmbracoSettings.config";
+
        // TODO: Kill this off we don't have umbraco.config XML cache we now have NuCache
        public static string GetContentCacheXml(IGlobalSettings globalSettings)
        {
@@ -41,7 +41,7 @@ namespace Umbraco.Core
        ServerRole ServerRole { get; }

        /// <summary>
-        /// Gets the Umbraco application url.
+        /// Gets the Umbraco application URL.
        /// </summary>
        /// <remarks>This is eg "http://www.example.com".</remarks>
        Uri ApplicationUrl { get; }
@@ -129,5 +129,65 @@ namespace Umbraco.Core.Logging
        {
            System.Diagnostics.Debug.WriteLine(MessageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
        }
+        /// <inheritdoc/>
+        public void Fatal<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0,
+            T1 propertyValue1, T2 propertyValue2)
+                => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+        /// <inheritdoc/>
+        public void Fatal<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+        /// <inheritdoc/>
+        public void Fatal<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Fatal(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+        /// <inheritdoc/>
+        public void Error<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0,
+            T1 propertyValue1, T2 propertyValue2)
+                => Error(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+        /// <inheritdoc/>
+        public void Error<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Error(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+        /// <inheritdoc/>
+        public void Error<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Error(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+        /// <inheritdoc/>
+        public void Warn<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0,
+            T1 propertyValue1, T2 propertyValue2)
+                => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1,propertyValue2 });
+        /// <inheritdoc/>
+        public void Warn<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+                => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Warn<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+            => Warn(reporting, exception, messageTemplate, new object[] { propertyValue0 });
+
+        public void Warn<T0>(Type reporting, string message, T0 propertyValue0)
+            => Warn(reporting, message, new object[] { propertyValue0 });
+
+        public void Info<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Info(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Info<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Info(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Info<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Info(reporting, messageTemplate, new object[] { propertyValue0 });
+
+        public void Debug<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Debug(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1, propertyValue2 });
+
+        public void Debug<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Debug(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Debug<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Debug(reporting, messageTemplate, new object[] { propertyValue0 });
+
+        public void Verbose<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+            => Verbose(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1,propertyValue2 });
+
+        public void Verbose<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+            => Verbose(reporting, messageTemplate, new object[] { propertyValue0, propertyValue1 });
+
+        public void Verbose<T0>(Type reporting, string messageTemplate, T0 propertyValue0)
+            => Verbose(reporting, messageTemplate, new object[] { propertyValue0 });
    }
 }
@@ -37,10 +37,10 @@ namespace Umbraco.Core.Logging
                switch (_level)
                {
                    case LogLevel.Debug:
-                        logger.Debug(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
+                        logger.Debug<string,string>(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
                        break;
                    case LogLevel.Information:
-                        logger.Info(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
+                        logger.Info<string, string>(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
                        break;
                    default:
                        throw new ArgumentOutOfRangeException(nameof(level));
@@ -84,15 +84,15 @@ namespace Umbraco.Core.Logging
            {
                if (_failed)
                {
-                    _logger.Error(_loggerType, _failException, "{FailMessage} ({Duration}ms) [Timing {TimingId}]", _failMessage, Stopwatch.ElapsedMilliseconds, _timingId);
+                    _logger.Error<string,long,string>(_loggerType, _failException, "{FailMessage} ({Duration}ms) [Timing {TimingId}]", _failMessage, Stopwatch.ElapsedMilliseconds, _timingId);
                }
                else switch (_level)
                {
                    case LogLevel.Debug:
-                        _logger.Debug(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
+                        _logger.Debug<string,long,string>(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
                        break;
                    case LogLevel.Information:
-                        _logger.Info(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
+                        _logger.Info<string, long, string>(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
                        break;
                    // filtered in the ctor
                    //default:
@@ -52,7 +52,7 @@ namespace Umbraco.Core.Logging
        /// <param name="messageTemplate">A message template.</param>
        /// <param name="propertyValues">Property values.</param>
        void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
-
+       
        /// <summary>
        /// Logs a fatal message.
        /// </summary>
@@ -92,7 +92,7 @@ namespace Umbraco.Core.Logging
        /// <param name="messageTemplate">A message template.</param>
        /// <param name="propertyValues">Property values.</param>
        void Error(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
-
+       
        /// <summary>
        /// Logs an error message.
        /// </summary>
@@ -132,6 +132,7 @@ namespace Umbraco.Core.Logging
        /// <param name="messageTemplate">A message template.</param>
        /// <param name="propertyValues">Property values.</param>
        void Warn(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
+       

        /// <summary>
        /// Logs an information message.
@@ -147,6 +148,7 @@ namespace Umbraco.Core.Logging
        /// <param name="messageTemplate">A message template.</param>
        /// <param name="propertyValues">Property values.</param>
        void Info(Type reporting, string messageTemplate, params object[] propertyValues);
+       

        /// <summary>
        /// Logs a debugging message.
@@ -177,5 +179,6 @@ namespace Umbraco.Core.Logging
        /// <param name="messageTemplate">A message template.</param>
        /// <param name="propertyValues">Property values.</param>
        void Verbose(Type reporting, string messageTemplate, params object[] propertyValues);
+        
    }
 }
@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Logging
+{
+    public interface ILogger2 : ILogger
+    {
+        /// <summary>
+        /// Logs a fatal message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Fatal<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a fatal message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Fatal<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a fatal message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Fatal<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs an error message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Error<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs an error message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Error<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs an error message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Error<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Warn<T0, T1, T2>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Warn<T0, T1>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="exception">An exception.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Warn<T0>(Type reporting, Exception exception, string messageTemplate, T0 propertyValue0);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="message">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Warn<T0>(Type reporting, string message, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a info message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Info<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a info message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Info<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a info message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Info<T0>(Type reporting, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a debug message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Debug<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a debug message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Debug<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a debug message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Debug<T0>(Type reporting, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a verbose message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Verbose<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a verbose message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Verbose<T0, T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a verbose message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Verbose<T0>(Type reporting, string messageTemplate, T0 propertyValue0);
+
+
+        /// <summary>
+        /// Logs a error message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        void Error<T0>(Type reporting, string messageTemplate, T0 propertyValue0);
+
+        /// <summary>
+        /// Logs a error message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Error<T0,T1>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+
+        /// <summary>
+        /// Logs a error message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Error<T0, T1,T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+
+        /// <summary>
+        /// Logs a warning message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Warn<T, T0, T1>(string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+        /// <summary>
+        /// Logs a warning message.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Warn<T, T0, T1, T2>(string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        /// <param name="propertyValue2">Property value 2</param>
+        void Warn<T0, T1, T2>(Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2);
+        /// <summary>
+        /// Logs a warning message with an exception.
+        /// </summary>
+        /// <param name="reporting">The reporting type.</param>
+        /// <param name="messageTemplate">A message template.</param>
+        /// <param name="propertyValue0">Property value 0</param>
+        /// <param name="propertyValue1">Property value 1</param>
+        void Warn<T0, T1>(Type reporting,  string messageTemplate, T0 propertyValue0, T1 propertyValue1);
+    }
+}
@@ -24,8 +24,8 @@ namespace Umbraco.Core.Logging
        /// <inheritdoc/>
        public IDisposable Step(string name)
        {
-            _logger.Debug<LogProfiler>("Begin: {ProfileName}", name);
-            return new LightDisposableTimer(duration => _logger.Info<LogProfiler>("End {ProfileName} ({ProfileDuration}ms)", name, duration));
+            _logger.Debug<LogProfiler, string>("Begin: {ProfileName}", name);
+            return new LightDisposableTimer(duration => _logger.Info<LogProfiler, string,long>("End {ProfileName} ({ProfileDuration}ms)", name, duration));
        }

        /// <inheritdoc/>
@@ -0,0 +1,442 @@
+using System;
+
+namespace Umbraco.Core.Logging
+{
+    public static class Logger2Extensions
+    {
+        public static void Debug<T0, T1, T2>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Debug(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Debug<T0, T1>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Debug(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Debug<T0>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(reporting, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Debug(reporting, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Error<T0, T1, T2>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Error(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Error<T0, T1>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Error(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Error<T0>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(reporting, exception, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Error(reporting, exception, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Fatal<T0, T1, T2>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Fatal(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Fatal(reporting, exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Fatal<T0, T1>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Fatal(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Fatal(reporting, exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Fatal<T0>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Fatal(reporting, exception, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Fatal(reporting, exception, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Info<T0, T1, T2>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Info(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Info<T0, T1>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Info(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Info<T0>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(reporting, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Info(reporting, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Verbose<T0, T1, T2>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Verbose(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Verbose(reporting, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Verbose<T0, T1>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Verbose(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Verbose(reporting, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Verbose<T0>(this ILogger logger, Type reporting, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Verbose(reporting, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Verbose(reporting, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Warn<T0, T1, T2>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(reporting, messageTemplate, exception, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Warn(reporting, messageTemplate, exception, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Warn<T0, T1>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(reporting, messageTemplate, exception, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Warn(reporting, messageTemplate, exception, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Warn<T0>(this ILogger logger, Type reporting, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(reporting, messageTemplate, exception, propertyValue0);
+            }
+            else
+            {
+                logger.Warn(reporting, messageTemplate, exception, propertyValue0);
+            }
+        }
+
+        public static void Warn<T0>(this ILogger logger, Type reporting, string message, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(reporting, message, propertyValue0);
+            }
+            else
+            {
+                logger.Warn(reporting, message, propertyValue0);
+            }
+        }
+
+       //
+        public static void Error<T, T0>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), exception, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Error(typeof(T), exception, messageTemplate, propertyValue0);
+            }
+        }
+        
+        public static void Error<T, T0,T1>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Error(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        
+        public static void Error<T, T0, T1,T2>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Error(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+        public static void Error<T,T0>(this ILogger logger, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Error(typeof(T), messageTemplate, propertyValue0);
+            }
+        }
+        public static void Error<T, T0,T1>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Error(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        public static void Error<T, T0, T1,T2>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Error(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Error(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+        public static void Warn<T, T0>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), exception, messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Warn(typeof(T), exception, messageTemplate, propertyValue0);
+            }
+        }
+
+        public static void Warn<T, T0, T1>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Warn(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+
+        public static void Warn<T, T0, T1, T2>(this ILogger logger, Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Warn(typeof(T), exception, messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+        public static void Warn<T, T0>(this ILogger logger, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Warn(typeof(T), messageTemplate, propertyValue0);
+            }
+        }
+        public static void Warn<T, T0, T1>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Warn(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        public static void Warn<T, T0, T1, T2>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Warn(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Warn(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+
+       
+        public static void Info<T, T0>(this ILogger logger, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(typeof(T), messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Info(typeof(T), messageTemplate, propertyValue0);
+            }
+        }
+        public static void Info<T, T0, T1>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Info(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        public static void Info<T, T0, T1, T2>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Info(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Info(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+        public static void Debug<T, T0>(this ILogger logger, string messageTemplate, T0 propertyValue0)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(typeof(T), messageTemplate, propertyValue0);
+            }
+            else
+            {
+                logger.Debug(typeof(T), messageTemplate, propertyValue0);
+            }
+        }
+        public static void Debug<T, T0, T1>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+            else
+            {
+                logger.Debug(typeof(T), messageTemplate, propertyValue0, propertyValue1);
+            }
+        }
+        public static void Debug<T, T0, T1, T2>(this ILogger logger, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2)
+        {
+            if (logger is ILogger2 logger2)
+            {
+                logger2.Debug(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+            else
+            {
+                logger.Debug(typeof(T), messageTemplate, propertyValue0, propertyValue1, propertyValue2);
+            }
+        }
+    }
+}
--- a/Show More
+++ b/Show More