Fix templates by only allowing generated https ports withing the range 44300-44399 https://docs.microsoft.com/en-us/iis/extensions/using-iis-express/running-iis-express-without-administrative-privileges#summary

Co-authored-by: Bjarke Berg <mail@bergmania.dk>

.editorconfig

@@ -1,43 +1,44 @@
-# editorconfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Default settings:
-# A newline ending every file
-# Use 4 spaces as indentation
-[*]
-insert_final_newline = true
-end_of_line = crlf
-indent_style = space
-indent_size = 4
-
-# Trim trailing whitespace, limited support.
-# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
-trim_trailing_whitespace = true
-
-[*.{cs,vb}]
-dotnet_style_predefined_type_for_locals_parameters_members = true:error
-
-dotnet_naming_rule.private_members_with_underscore.symbols  = private_fields
-dotnet_naming_rule.private_members_with_underscore.style    = prefix_underscore
-dotnet_naming_rule.private_members_with_underscore.severity = suggestion
-
-dotnet_naming_symbols.private_fields.applicable_kinds           = field
-dotnet_naming_symbols.private_fields.applicable_accessibilities = private
-
-dotnet_naming_style.prefix_underscore.capitalization = camel_case
-dotnet_naming_style.prefix_underscore.required_prefix = _
-
-# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md
-[*.cs]
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
-csharp_prefer_braces = false : none
-
-[*.js]
-trim_trailing_whitespace = true
-
-[*.less]
-trim_trailing_whitespace = false
+# editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
+[*]
+insert_final_newline = true
+end_of_line = crlf
+indent_style = space
+indent_size = 4
+
+# Trim trailing whitespace, limited support.
+# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
+trim_trailing_whitespace = true
+
+[*.{cs,vb}]
+dotnet_style_predefined_type_for_locals_parameters_members = true:error
+
+dotnet_naming_rule.private_members_with_underscore.symbols  = private_fields
+dotnet_naming_rule.private_members_with_underscore.style    = prefix_underscore
+dotnet_naming_rule.private_members_with_underscore.severity = suggestion
+
+dotnet_naming_symbols.private_fields.applicable_kinds           = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities = private
+# dotnet_naming_symbols.private_fields.required_modifiers = abstract,async,readonly,static # all except const
+
+dotnet_naming_style.prefix_underscore.capitalization = camel_case
+dotnet_naming_style.prefix_underscore.required_prefix = _
+
+# https://github.com/MicrosoftDocs/visualstudio-docs/blob/master/docs/ide/editorconfig-code-style-settings-reference.md
+[*.cs]
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+csharp_prefer_braces = false : none
+
+[*.js]
+trim_trailing_whitespace = true
+
+[*.less]
+trim_trailing_whitespace = false

.gitattributes

@@ -43,6 +43,7 @@
 *.hs text=auto
 *.json text=auto
 *.xml text=auto
+*.resx text=auto
 
 *.csproj text=auto merge=union
 *.vbproj text=auto merge=union

.github/BUILD.md

@@ -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).
 

.github/CODE_OF_CONDUCT.md

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

.github/CODE_OF_CONDUCT_ENFORCEMENT.md

@@ -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/)  

.github/CONTRIBUTING.md

@@ -102,10 +102,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. 
@@ -128,7 +129,7 @@ In order to build the Umbraco source code locally, first make sure you have the
   * 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.
 

.github/ISSUE_TEMPLATE/4_Support_question.md

@@ -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!

.github/ISSUE_TEMPLATE/5_Documentation_issue.md

@@ -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!

.github/ISSUE_TEMPLATE/6_Security_issue.md

@@ -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!

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: true
+contact_links:
+    - 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?

.github/README.md

@@ -37,4 +37,3 @@ Besides "Our", we all support each other also via Twitter: [Umbraco HQ](https://
 ## Contributing
 
 Umbraco is contribution-focused and community-driven. If you want to contribute back to the Umbraco source code, please check out our [guide to contributing](CONTRIBUTING.md).
-

.github/workflows/codeql-analysis.yml

@@ -2,11 +2,9 @@ name: "Code scanning - action"
 
 on:
   push:
-    branches: [v8/contrib]
+    branches: [v8/contrib,v8/dev,v8/bug,v8/feature]
   pull_request:
     # The branches below must be a subset of the branches above
-    # SJ: Don't run on PR branches for now
-    # branches: [v8/contrib]
   schedule:
     - cron: '0 7 * * 2'
 
@@ -44,10 +42,20 @@ jobs:
     # ✏️ 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/codeql-config.yml
+
+

.github/workflows/codeql-config.yml

@@ -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   

.gitignore

@@ -163,15 +163,44 @@ build/hooks/
 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
 /src/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
 /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
+
+
+# eof
+/src/Umbraco.Web.UI.Client/TESTS-*.xml
+/src/ApiDocs/api/*
+/src/Umbraco.Web.UI.Client/package-lock.json
+/src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*
+/src/Umbraco.Tests.Integration/App_Data/*
+/src/Umbraco.Tests.Integration/TEMP/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/assets/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/js/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/lib/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/views/*
+/src/Umbraco.Web.UI.NetCore/wwwroot/App_Data/TEMP/*
+/src/Umbraco.Web.UI.NetCore/App_Data/Logs/*
+/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/TypesCache/*
+/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/*
+/src/Umbraco.Web.UI.NetCore/App_Data/Smidge/Cache/*
+/src/Umbraco.Web.UI.NetCore/umbraco/logs
+
+src/Umbraco.Tests.Integration/umbraco/Data/
+src/Umbraco.Tests.Integration/umbraco/logs/
+
+src/Umbraco.Tests.Integration/Views/
+
+src/Umbraco.Tests/TEMP/
+/src/Umbraco.Web.UI.NetCore/Umbraco/Data/*
+
+/src/Umbraco.Web.UI/config/umbracoSettings.config
+/src/Umbraco.Web.UI.NetCore/Umbraco/models/*
+src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/
+/src/Umbraco.Web.UI.NetCore/appsettings.Local.json
+src/Umbraco.Tests.Integration/DatabaseContextTests.sdf

Directory.Build.props

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+    <!-- Package references and additional files which are consumed by all projects -->
+    <ItemGroup>
+        <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
+        <AdditionalFiles Include="$(MSBuildThisFileDirectory)linting\stylecop.json" />
+    </ItemGroup>
+
+    <Choose>
+        <When Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectFile), 'Tests'))">
+            <PropertyGroup>
+                <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)linting\codeanalysis.tests.ruleset</CodeAnalysisRuleSet>
+            </PropertyGroup>
+        </When>
+        <Otherwise>
+            <PropertyGroup>
+                <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)linting\codeanalysis.ruleset</CodeAnalysisRuleSet>
+            </PropertyGroup>
+        </Otherwise>
+    </Choose>
+
+</Project>

Directory.Build.targets

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+    <!-- Package versions for package references across all projects -->
+    <ItemGroup>
+        <!--Global Dependencies-->
+        <PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <!--Shared config files that have to exist at root level to work properly.-->
+        <ConfigFilesToCopy Include="$(MSBuildThisFileDirectory)linting\.editorconfig" />
+    </ItemGroup>
+
+    <!--Ensures our config files are up to date.-->
+    <!--TODO Copy files to root once solution is split up into src/tests folder-->
+    <Target Name="CopyFiles" BeforeTargets="Build">
+        <Copy SourceFiles="@(ConfigFilesToCopy)"
+              SkipUnchangedFiles = "true"
+              DestinationFolder="$(MSBuildThisFileDirectory)src" />
+    </Target>
+
+</Project>

NuGet.Config

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <!--
+    <!--
     this is Umbraco's NuGet configuration,
     content of this file is merged with the system-wide configuration,
     at %APPDATA%\NuGet\NuGet.config
   -->
-  <packageSources>
-    <add key="UmbracoCoreMyGet" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
-  </packageSources>
+    <packageSources>
+        <clear />
+        <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+        <add key="UmbracoCoreMyGet" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
+        <add key="ExamineAzurePipelines" value="https://shazwazza.pkgs.visualstudio.com/Examine/_packaging/Examine-Beta/nuget/v3/index.json" />
+        <add key="SmidgeAppVeyor" value="https://ci.appveyor.com/nuget/smidge" />
+    </packageSources>
 </configuration>

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms.Core</id>
-        <version>8.0.0</version>
-        <title>Umbraco Cms Core Binaries</title>
-        <authors>Umbraco HQ</authors>
-        <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the core assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
-        <language>en-US</language>
-        <tags>umbraco</tags>
-        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
-        <dependencies>
-
-            <group targetFramework="net472">
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="LightInject" version="[5.4.0,5.999999)" />
-                <dependency id="LightInject.Annotation" version="[1.1.0,1.999999)" />
-                <dependency id="LightInject.Web" version="[2.0.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Core" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi.Client" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin" version="[4.0.1,4.999999)" />
-                <dependency id="MiniProfiler" version="[4.0.138,4.999999)" />
-                <dependency id="Newtonsoft.Json" version="[12.0.1,12.999999)" />
-                <dependency id="Semver" version="[2.0.4,2.999999)" />
-                <dependency id="Serilog" version="[2.8.0,2.999999)" />
-                <dependency id="Serilog.Enrichers.Process" version="[2.0.1,2.999999)" />
-                <dependency id="Serilog.Enrichers.Thread" version="[3.0.0,3.999999)" />
-                <dependency id="Serilog.Filters.Expressions" version="[2.0.0,2.999999)" />
-                <dependency id="Serilog.Formatting.Compact" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Formatting.Compact.Reader" version="[1.0.3,1.999999)" />
-                <dependency id="Serilog.Settings.AppSettings" version="[2.2.2,2.999999)" />
-                <dependency id="Serilog.Sinks.File" version="[4.0.0,4.999999)" />
-                <dependency id="Serilog.Sinks.Map" version="[1.0.0,1.999999)" />
-                <dependency id="Serilog.Sinks.Async" version="[1.3.0,1.999999)" />
-                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
-                <dependency id="NPoco" version="[3.9.4,3.999999)" />
-            </group>
-
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\net472\Umbraco.Core.dll" />
-
-        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\net472\Umbraco.Core.xml" />
-
-        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib\net472\Umbraco.Core.pdb" />
-    </files>
-</package>

build/NuSpecs/UmbracoCms.Examine.Lucene.nuspec

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata minClientVersion="4.1.0">
+        <id>Umbraco.Cms.Examine.Lucene</id>
+        <version>9.0.0</version>
+        <title>Umbraco CMS Examine Binaries</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains the Examine assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET Core project.</description>
+        <summary>Contains dll files required to run Examine.</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
+        <dependencies>
+
+            <group targetFramework="netstandard2.0">
+                <dependency id="Umbraco.Cms.Core" version="[$version$]" />
+                <dependency id="Umbraco.Cms.Infrastructure" version="[$version$]" />
+                <dependency id="Newtonsoft.Json" version="[12.0.3,12.999999)" />
+                <dependency id="NPoco" version="[4.0.2,4.999999)" />
+                <dependency id="System.Configuration.ConfigurationManager" version="[5.0.0,5.999999)" />
+            </group>
+
+        </dependencies>
+    </metadata>
+
+    <files>
+        <!-- Umbraco.Examine.Lucene HACK remove this when Examine lucene is a real netstandard dependency -->
+        <file src="$BuildTmp$\bin\Examine.Lucene.dll" target="lib\netstandard2.0\Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Lucene.Net.dll" target="lib\netstandard2.0\Lucene.Net.dll" />
+
+        <!-- Libs -->
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.dll" target="lib\net472\Umbraco.Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.dll" target="lib\netstandard2.0\Umbraco.Examine.Lucene.dll" />
+
+
+        <!-- Docs -->
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.xml" target="lib\net472\Umbraco.Examine.Lucene.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.xml" target="lib\netstandard2.0\Umbraco.Examine.Lucene.xml" />
+
+        <!-- Symbols -->
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.pdb" target="lib\net472\Umbraco.Examine.Lucene.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.pdb" target="lib\netstandard2.0\Umbraco.Examine.Lucene.pdb" />
+    </files>
+</package>

build/NuSpecs/UmbracoCms.SqlCe.nuspec

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata minClientVersion="4.1.0">
+        <id>Umbraco.Cms.SqlCe</id>
+        <version>9.0.0</version>
+        <title>Umbraco Cms Sql Ce Add-on</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains the SQL CE assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET Core project.</description>
+        <summary>Contains the SQL CE assemblies needed to run Umbraco Cms</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
+        <dependencies>
+
+            <group targetFramework="netstandard2.0">
+                <!--
+                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
+                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
+                  not want this to happen as the alpha of the next major is, really, the next major already.
+                -->
+                <dependency id="Umbraco.Cms.Core" version="[$version$]" />
+                <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" /> <!-- Hack it is only available in framework, but we need it on netstandard -->
+            </group>
+
+        </dependencies>
+    </metadata>
+    <files>
+        <!-- libs -->
+        <file src="$BuildTmp$\SqlCe\Umbraco.Persistence.SqlCe.dll" target="lib\netstandard2.0\Umbraco.Persistence.SqlCe.dll" />
+        <file src="$BuildTmp$\SqlCe\System.Data.SqlServerCe.dll" target="lib\netstandard2.0\System.Data.SqlServerCe.dll" /> <!-- Hack because the file from the package is only added to net472 projects -->
+
+        <!-- docs -->
+        <file src="$BuildTmp$\SqlCe\Umbraco.Persistence.SqlCe.xml" target="lib\netstandard2.0\Umbraco.Persistence.SqlCe.xml" />
+
+        <!-- symbols -->
+        <file src="$BuildTmp$\SqlCe\Umbraco.Persistence.SqlCe.pdb" target="lib\netstandard2.0\Umbraco.Persistence.SqlCe.pdb" />
+    </files>
+</package>

build/NuSpecs/UmbracoCms.StaticAssets.nuspec

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata minClientVersion="4.1.0">
+        <id>Umbraco.Cms.StaticAssets</id>
+        <version>9.0.0</version>
+        <title>Umbraco Cms Static Assets</title>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains the static assets that is required to run Umbraco CMS.</description>
+        <summary>Contains the static assets that is required to run Umbraco CMS.</summary>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
+        <dependencies>
+        </dependencies>
+    </metadata>
+    <files>
+        <!-- Content -->
+        <file src="$BuildTmp$\WebApp\wwwroot\umbraco\**\*.*" target="content\wwwroot\umbraco" />
+        <file src="$BuildTmp$\WebApp\umbraco\**\*.*" target="content\umbraco" />
+
+        <!-- Readme -->
+        <file src="tools\Readme.txt" target="Readme.txt" />
+        <file src="tools\ReadmeUpgrade.txt" target="ReadmeUpgrade.txt" />
+
+        <!-- UmbracoCms props and targets used to copy the content into the solution -->
+        <file src="build\**" target="build\" />
+    </files>
+</package>

build/NuSpecs/UmbracoCms.Web.nuspec

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms.Web</id>
-        <version>8.0.0</version>
-        <title>Umbraco Cms Core Binaries</title>
-        <authors>Umbraco HQ</authors>
-        <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
-        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains the web assemblies needed to run Umbraco Cms. This package only contains assemblies and can be used for package development. Use the UmbracoCms package to setup Umbraco in Visual Studio as an ASP.NET project.</description>
-        <summary>Contains the core assemblies needed to run Umbraco Cms</summary>
-        <language>en-US</language>
-        <tags>umbraco</tags>
-        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
-        <dependencies>
-
-            <group targetFramework="net472">
-
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="UmbracoCms.Core" version="[$version$]" />
-                <dependency id="ClientDependency" version="[1.9.9,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="HtmlAgilityPack" version="[1.8.14,1.999999)" />
-                <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
-                <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
-                <dependency id="LightInject.WebApi" version="[2.0.0,2.999999)" />
-                <dependency id="Markdown" version="[2.2.1,2.999999)" />
-                <dependency id="Microsoft.AspNet.Identity.Owin" version="[2.2.2,2.999999)" />
-                <dependency id="Microsoft.AspNet.Mvc" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0,2.999999)" />
-                <dependency id="Microsoft.AspNet.WebApi" version="[5.2.7,5.999999)" />
-                <dependency id="Microsoft.Owin.Host.SystemWeb" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.Cookies" version="[4.0.1,4.999999)" />
-                <dependency id="Microsoft.Owin.Security.OAuth" version="[4.0.1,4.999999)" />
-                <dependency id="System.Threading.Tasks.Dataflow" version="[4.9.0,4.999999)" />
-                <dependency id="HtmlSanitizer" version="[5.0.376,5.999999)" />
-
-            </group>
-
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.dll" target="lib\net472\Umbraco.ModelsBuilder.Embedded.dll" />
-
-        <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\net472\Umbraco.Web.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net472\Umbraco.Web.UI.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\net472\Umbraco.Examine.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.xml" target="lib\net472\Umbraco.ModelsBuilder.Embedded.xml" />
-
-        <!-- symbols -->
-        <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib\net472\Umbraco.Web.pdb" />
-        <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib\net472\Umbraco.Examine.pdb" />
-        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.Embedded.pdb" target="lib\net472\Umbraco.ModelsBuilder.Embedded.pdb" />
-    </files>
-</package>

build/NuSpecs/UmbracoCms.nuspec

@@ -1,68 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata minClientVersion="4.1.0">
-        <id>UmbracoCms</id>
-        <version>8.0.0</version>
+        <id>Umbraco.Cms</id>
+        <version>9.0.0</version>
         <title>Umbraco Cms</title>
         <authors>Umbraco HQ</authors>
         <owners>Umbraco HQ</owners>
-        <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-        <projectUrl>http://umbraco.com/</projectUrl>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
         <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Installs Umbraco Cms in your Visual Studio ASP.NET project</description>
-        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET project</summary>
+        <description>Installs Umbraco Cms in your Visual Studio ASP.NET Core project</description>
+        <summary>Installs Umbraco Cms in your Visual Studio ASP.NET Core project</summary>
         <language>en-US</language>
         <tags>umbraco</tags>
         <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
         <dependencies>
-
-            <group targetFramework="net472">
-
-                <dependency id="UmbracoCms.Web" version="[$version$]" />
-                <!--
-                  note: dependencies are specified as [x.y.z,x.999999) eg [2.1.0,2.999999) and NOT [2.1.0,3.0.0) because
-                  the latter would pick anything below 3.0.0 and that includes prereleases such as 3.0.0-alpha, and we do
-                  not want this to happen as the alpha of the next major is, really, the next major already.
-                -->
-                <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
-                <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
-                <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />
-
+            <group targetFramework="net5.0">
+                <dependency id="Umbraco.Cms.Web.Website" version="[$version$]" />
+                <dependency id="Umbraco.Cms.Web.BackOffice" version="[$version$]" />
+                <dependency id="Umbraco.Cms.StaticAssets" version="[$version$]" />
             </group>
-
-
         </dependencies>
+        <!--
+        We can't use content files, as the files need to be copied into the solution, links/shortcuts to the files
+        are not good enough
+        -->
+        <contentFiles />
     </metadata>
     <files>
-        <!-- files -->
-        <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
-        <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />
-        <file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />
-        <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
-        <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />
-
-        <!-- these files are copied by install.ps1 -->
-        <file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-        <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-        <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
-
-        <!-- tools -->
-        <!-- beware! install.ps1 not supported by PackageReference -->
-        <file src="tools\install.ps1" target="tools\install.ps1" />
-        <file src="tools\Readme.txt" target="tools\Readme.txt" />
-        <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
-
-        <!-- config transforms -->
-        <!-- beware! config transforms not supported by PackageReference -->
-        <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
-        <file src="tools\serilog.config.install.xdt" target="Content\config\serilog.config.install.xdt" />
-        <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
-        <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
-        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> <!-- FIXME: Content\ !! and then... transform?! -->
-
-        <!-- UmbracoCms props and targets -->
-        <file src="build\**" target="build" />
     </files>
 </package>

build/NuSpecs/build/Umbraco.Cms.StaticAssets.props

@@ -0,0 +1,7 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot\is-cache\**;wwwroot\ms-cache\**</DefaultItemExcludes>
+    </PropertyGroup>
+
+</Project>

build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets

@@ -0,0 +1,38 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <ContentFilesPath>$(MSBuildThisFileDirectory)..\content\**\*.*</ContentFilesPath>
+    </PropertyGroup>
+
+    <Target Name="CopyUmbracoAssets" BeforeTargets="Build">
+        <ItemGroup>
+
+            <ContentFiles Include="$(ContentFilesPath)" />
+        </ItemGroup>
+        <Message Text="Copying Umbraco content files: $(ContentFilesPath) - #@(ContentFiles->Count()) files"  Importance="high" />
+        <Copy
+            SourceFiles="@(ContentFiles)"
+            DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\%(RecursiveDir)%(Filename)%(Extension)')"
+            SkipUnchangedFiles="true" />
+
+    </Target>
+
+    <Target Name="ClearUmbracoAssets" BeforeTargets="Clean">
+        <ItemGroup>
+            <UmbracoConfigPackageDir Include="$(MSBuildProjectDirectory)\umbraco\config\" />
+            <UmbracoPartialViewMacrosPackageDir Include="$(MSBuildProjectDirectory)\umbraco\PartialViewMacros\" />
+            <UmbracoUmbracoBackOfficeMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoBackOffice\" />
+            <UmbracoUmbracoInstallDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoInstall\" />
+            <UmbracoUmbracoWebsiteMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoWebsite\" />
+            <WwwrootUmbracoPackageDir Include="$(MSBuildProjectDirectory)\wwwroot\umbraco\" />
+        </ItemGroup>
+        <Message Text="Clear old umbraco data"  Importance="high" />
+        <RemoveDir Directories="@(UmbracoConfigPackageDir)"  />
+        <RemoveDir Directories="@(UmbracoPartialViewMacrosPackageDir)"  />
+        <RemoveDir Directories="@(UmbracoUmbracoBackOfficeMacrosDir)"  />
+        <RemoveDir Directories="@(UmbracoUmbracoInstallDir)"  />
+        <RemoveDir Directories="@(UmbracoUmbracoWebsiteMacrosDir)"  />
+        <RemoveDir Directories="@(WwwrootUmbracoPackageDir)"  />
+    </Target>
+
+</Project>

build/NuSpecs/build/UmbracoCms.props

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CopyAllFilesToSingleFolderForPackageDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForPackageDependsOn>
-    <CopyAllFilesToSingleFolderForMsdeployDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
-  </PropertyGroup>
-</Project>

build/NuSpecs/build/UmbracoCms.targets

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="CopyUmbracoFilesToWebRootForDeploy" AfterTargets="CopyAllFilesToSingleFolderForMsdeploy">
-    <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="$(_PackageTempDir)\%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>  
-  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
-	<!-- This copies the files listed in `AddUmbracoFilesToOutput` to the webroot during NuGet install and should -->
-	<!-- not be altered to support automated builds, use `CopyUmbracoFilesToWebRootForDeploy` for that instead -->
-    <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-  <Target Name="AddUmbracoFilesToOutput">
-    <!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
-    <ItemGroup>
-      <CustomFilesToInclude Include=".\App_Browsers\**\*">
-        <Dir>App_Browsers</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\App_Code\**\*">
-        <Dir>App_Code</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\App_Plugins\**\*">
-        <Dir>App_Plugins</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\bin\amd64\**\*">
-        <Dir>bin\amd64</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\bin\x86\**\*">
-        <Dir>bin\x86</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\Config\Splashes\**\*">
-        <Dir>Config\Splashes</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\data\**\*">
-        <Dir>data</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\umbraco\**\*">
-        <Dir>umbraco</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\Global.asax">
-        <Dir>.</Dir>
-      </CustomFilesToInclude>
-      <FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
-        <DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
-</Project>

build/NuSpecs/tools/ReadmeUpgrade.txt

@@ -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

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

@@ -2,7 +2,7 @@
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">>
     <appSettings>
 
-        <add key="serilog:using:File" value="Umbraco.Core" xdt:Transform="SetAttributes(value)" xdt:Locator="Match(key)"/>
+        <add key="serilog:using:File" value="Umbraco.Infrastructure" xdt:Transform="SetAttributes(value)" xdt:Locator="Match(key)"/>
         <add key="serilog:write-to:File.shared" xdt:Transform="Remove" xdt:Locator="Match(key)"/>
 
     </appSettings>

build/azure-pipelines.yml

@@ -0,0 +1,529 @@
+variables:
+    buildConfiguration: Release
+    SA_PASSWORD: UmbracoIntegration123!
+resources:
+    containers:
+        - container: mssql
+          image: 'mcr.microsoft.com/mssql/server:2017-latest'
+          env:
+              ACCEPT_EULA: 'Y'
+              SA_PASSWORD: $(SA_PASSWORD)
+              MSSQL_PID: Developer
+          ports:
+              - '1433:1433'
+          options: '--name mssql'
+stages:
+    - stage: Unit_Tests
+      displayName: Unit Tests
+      dependsOn: []
+      jobs:
+          - job: Linux_Unit_Tests
+            displayName: Linux
+            pool:
+                vmImage: ubuntu-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+                - task: DotNetCoreCLI@2
+                  displayName: dotnet test
+                  inputs:
+                      command: test
+                      projects: '**/*.Tests.UnitTests.csproj'
+          - job: MacOS_Unit_Tests
+            displayName: Mac OS
+            pool:
+                vmImage: macOS-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+                - task: DotNetCoreCLI@2
+                  displayName: dotnet test
+                  inputs:
+                      command: test
+                      projects: '**/*.Tests.UnitTests.csproj'
+          - job: Windows_Unit_Tests
+            displayName: Windows
+            pool:
+                vmImage: windows-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+                - task: DotNetCoreCLI@2
+                  displayName: dotnet test
+                  inputs:
+                      command: test
+                      projects: '**/*.Tests.UnitTests.csproj'
+    - stage: Integration_Tests
+      displayName: Integration Tests
+      dependsOn: []
+      jobs:
+          - job: Linux_Integration_Tests
+            services:
+                mssql: mssql
+            timeoutInMinutes: 120
+            displayName: Linux
+            pool:
+                vmImage: ubuntu-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+                - task: DotNetCoreCLI@2
+                  displayName: dotnet test
+                  inputs:
+                      command: test
+                      projects: '**/Umbraco.Tests.Integration.csproj'
+                  env:
+                      UmbracoIntegrationTestConnectionString: 'Server=localhost,1433;User Id=sa;Password=$(SA_PASSWORD);'
+          - job: Windows_Integration_Tests
+            timeoutInMinutes: 120
+            displayName: Windows
+            pool:
+                vmImage: windows-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+                - powershell: sqllocaldb start mssqllocaldb
+                  displayName: Start MSSQL LocalDb
+                - task: DotNetCoreCLI@2
+                  displayName: dotnet test
+                  inputs:
+                      command: test
+                      projects: '**\Umbraco.Tests.Integration.csproj'
+    - stage: Acceptance_Tests
+      displayName: Acceptance Tests
+      dependsOn: []
+      variables:
+          - name: Umbraco__CMS__Unattended__InstallUnattended
+            value: true
+          - name: Umbraco__CMS__Unattended__UnattendedUserName
+            value: Cypress Test
+          - name: Umbraco__CMS__Unattended__UnattendedUserEmail
+            value: cypress@umbraco.com
+          - name: Umbraco__CMS__Unattended__UnattendedUserPassword
+            value: UmbracoAcceptance123!
+      jobs:
+          - job: Windows_Acceptance_tests
+            variables:
+                - name: UmbracoDatabaseServer
+                  value: (LocalDB)\MSSQLLocalDB
+                - name: UmbracoDatabaseName
+                  value: Cypress
+                - name: ConnectionStrings__umbracoDbDSN
+                  value: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true;
+            displayName: Windows
+            pool:
+                vmImage: windows-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+
+                - powershell: sqllocaldb start mssqllocaldb
+                  displayName: Start MSSQL LocalDb
+                - powershell:  Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer
+                  displayName: Create database
+#                - task: DotNetCoreCLI@2
+#                  displayName: dotnet build (Netcore)
+#                  inputs:
+#                      command: build
+#                      projects: '**/Umbraco.Web.UI.Netcore.csproj'
+                - task: NodeTool@0
+                  displayName: Use Node 11.x
+                  inputs:
+                       versionSpec: 11.x
+                - task: Npm@1
+                  displayName: npm install (Client)
+                  inputs:
+                    workingDir: src\Umbraco.Web.UI.Client
+                    verbose: false
+                - task: gulp@0
+                  displayName: gulp build
+                  inputs:
+                    gulpFile: src\Umbraco.Web.UI.Client\gulpfile.js
+                    targets: build
+                    workingDirectory: src\Umbraco.Web.UI.Client
+                - powershell: Start-Process -FilePath "dotnet" -ArgumentList "run", "-p", "src\Umbraco.Web.UI.Netcore\Umbraco.Web.UI.Netcore.csproj"
+                  displayName: dotnet run (Netcore)
+#                - powershell: dotnet run --no-build -p .\src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj
+#                  displayName: dotnet run (Netcore)
+                - task: PowerShell@1
+                  displayName: Generate Cypress.env.json
+                  inputs:
+                      scriptType: inlineScript
+                      inlineScript: >
+                          @{ username = $env:Umbraco__CMS__Unattended__UnattendedUserEmail; password = $env:Umbraco__CMS__Unattended__UnattendedUserPassword } | ConvertTo-Json | Set-Content -Path "src\Umbraco.Tests.AcceptanceTest\cypress.env.json"
+                - task: Npm@1
+                  name: PrepareTask
+                  displayName: npm install (AcceptanceTest)
+                  inputs:
+                      workingDir: 'src\Umbraco.Tests.AcceptanceTest'
+                - task: Npm@1
+                  displayName: Run Cypress (Desktop)
+                  condition: always()
+                  continueOnError: true
+                  inputs:
+                      workingDir: src\Umbraco.Tests.AcceptanceTest
+                      command: 'custom'
+                      customCommand: 'run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"'
+
+                - task: PublishTestResults@2
+                  condition: always()
+                  inputs:
+                      testResultsFormat: 'JUnit'
+                      testResultsFiles: 'src/Umbraco.Tests.AcceptanceTest/results/test-output-D-*.xml'
+                      mergeTestResults: true
+                      testRunTitle: "Test results Desktop"
+#                - task: Npm@1
+#                  displayName: Run Cypress (Tablet portrait)
+#                  condition: always()
+#                  inputs:
+#                      workingDir: src\Umbraco.Tests.AcceptanceTest
+#                      command: 'custom'
+#                      customCommand: 'run test -- --config="viewportHeight=1366,viewportWidth=1024,screenshotsFolder=cypress/artifacts/tablet/screenshots,videosFolder=cypress/artifacts/tablet/videos,videoUploadOnPasses=false"'
+#
+#                - task: Npm@1
+#                  displayName: Run Cypress (Mobile protrait)
+#                  condition: always()
+#                  inputs:
+#                      workingDir: src\Umbraco.Tests.AcceptanceTest
+#                      command: 'custom'
+#                      customCommand: 'run test -- --config="viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos,videoUploadOnPasses=false"'
+                - task: PublishPipelineArtifact@1
+                  displayName: "Publish test artifacts"
+                  condition: failed()
+                  inputs:
+                    targetPath: '$(Build.SourcesDirectory)/src/Umbraco.Tests.AcceptanceTest/cypress/artifacts'
+                    artifact: 'Test artifacts - Windows'
+          - job: Linux_Acceptance_tests
+            displayName: Linux
+            variables:
+                - name: UmbracoDatabaseServer
+                  value: localhost
+                - name: UmbracoDatabaseName
+                  value: Cypress
+                - name: ConnectionStrings__umbracoDbDSN
+                  value: Server=localhost,1433;Database=$(UmbracoDatabaseName);User Id=sa;Password=$(SA_PASSWORD);
+            services:
+                mssql: mssql
+            pool:
+                vmImage: ubuntu-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+                - task: Bash@3
+                  displayName: Create database
+                  inputs:
+                      targetType: 'inline'
+                      script: 'sqlcmd -S . -U sa -P $SA_PASSWORD -Q "CREATE DATABASE $DBNAME"'
+                  env:
+                      DBNAME: $(UmbracoDatabaseName)
+                      SA_PASSWORD: $(SA_PASSWORD)
+                - task: NodeTool@0
+                  displayName: Use Node 11.x
+                  inputs:
+                      versionSpec: 11.x
+                - task: Npm@1
+                  displayName: npm install (Client)
+                  inputs:
+                      workingDir: src/Umbraco.Web.UI.Client
+                      verbose: false
+                - task: gulp@0
+                  displayName: gulp build
+                  inputs:
+                      gulpFile: src/Umbraco.Web.UI.Client/gulpfile.js
+                      targets: build
+                      workingDirectory: src/Umbraco.Web.UI.Client
+                - task: Bash@3
+                  displayName: dotnet run (Netcore)
+                  inputs:
+                    targetType: 'inline'
+                    script: 'nohup dotnet run  -p ./src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj &'
+                - task: Bash@3
+                  displayName: Generate Cypress.env.json
+                  inputs:
+                    targetType: 'inline'
+                    script: 'echo "{ \"username\": \"$USERNAME\", \"password\": \"$PASSWORD\" }" > "src/Umbraco.Tests.AcceptanceTest/cypress.env.json"'
+                  env:
+                    USERNAME: $(Umbraco__CMS__Unattended__UnattendedUserEmail)
+                    PASSWORD: $(Umbraco__CMS__Unattended__UnattendedUserPassword)
+                - task: Npm@1
+                  name: PrepareTask
+                  displayName: npm install (AcceptanceTest)
+                  inputs:
+                      workingDir: 'src/Umbraco.Tests.AcceptanceTest'
+                - task: Npm@1
+                  displayName: Run Cypress (Desktop)
+                  condition: always()
+                  continueOnError: true
+                  inputs:
+                      workingDir: src/Umbraco.Tests.AcceptanceTest
+                      command: 'custom'
+                      customCommand: 'run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"'
+
+                - task: PublishTestResults@2
+                  condition: always()
+                  inputs:
+                      testResultsFormat: 'JUnit'
+                      testResultsFiles: 'src/Umbraco.Tests.AcceptanceTest/results/test-output-D-*.xml'
+                      mergeTestResults: true
+                      testRunTitle: "Test results Desktop"
+                #                - task: Npm@1
+                #                  displayName: Run Cypress (Tablet portrait)
+                #                  condition: always()
+                #                  inputs:
+                #                      workingDir: src/Umbraco.Tests.AcceptanceTest
+                #                      command: 'custom'
+                #                      customCommand: 'run test -- --config="viewportHeight=1366,viewportWidth=1024,screenshotsFolder=cypress/artifacts/tablet/screenshots,videosFolder=cypress/artifacts/tablet/videos,videoUploadOnPasses=false"'
+                #
+                #                - task: Npm@1
+                #                  displayName: Run Cypress (Mobile protrait)
+                #                  condition: always()
+                #                  inputs:
+                #                      workingDir: src/Umbraco.Tests.AcceptanceTest
+                #                      command: 'custom'
+                #                      customCommand: 'run test -- --config="viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos,videoUploadOnPasses=false"'
+                - task: PublishPipelineArtifact@1
+                  displayName: "Publish test artifacts"
+                  condition: failed()
+                  inputs:
+                      targetPath: '$(Build.SourcesDirectory)/src/Umbraco.Tests.AcceptanceTest/cypress/artifacts'
+                      artifact: 'Test artifacts - Linux'
+    - stage: Artifacts
+      dependsOn: []
+      jobs:
+          - job: Build_Artifacts
+            displayName: Build Artifacts
+            pool:
+                vmImage: windows-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+                - task: NuGetToolInstaller@1
+                  displayName: Use NuGet Latest
+                - task: NuGetCommand@2
+                  displayName: Restore NuGet Packages
+                  inputs:
+                      restoreSolution: '*\src\umbraco.sln'
+                      feedsToUse: config
+                - task: PowerShell@1
+                  displayName: Update Version
+                  condition: 'eq(variables[''Umbraco.IsReleaseBuild''], ''false'')'
+                  inputs:
+                      scriptType: inlineScript
+                      inlineScript: >
+                        Write-Host "Working folder: $pwd"
+
+                        $ubuild = build/build.ps1 -get -continue
+
+
+                        $version = $ubuild.GetUmbracoVersion()
+
+                        if ($version.Comment -ne "")
+                        {
+                          # 8.0.0-beta.33.1234
+                          $continuous = "$($version.Semver).$(Build.BuildNumber)"
+                        }
+                        else
+                        {
+                          # 8.0.0-alpha.1234
+                          $continuous = "$($version.Release)-alpha.$(Build.BuildNumber)"
+                        }
+                        $ubuild.SetUmbracoVersion($continuous)
+
+
+                        #Update the version in templates also
+
+                        $templatePath =
+                        'build/templates/UmbracoProject/.template.config/template.json'
+
+                        $a = Get-Content $templatePath -raw | ConvertFrom-Json
+
+                        $a.symbols.version.defaultValue = $continuous
+
+                        $a | ConvertTo-Json -depth 32| set-content $templatePath
+
+
+                        $templatePath =
+                        'build/templates/UmbracoPackage/.template.config/template.json'
+
+                        $a = Get-Content $templatePath -raw | ConvertFrom-Json
+
+                        $a.symbols.version.defaultValue = $continuous
+
+                        $a | ConvertTo-Json -depth 32| set-content $templatePath
+
+
+                        Write-Host "Building: $continuous"
+                - task: PowerShell@1
+                  displayName: Prepare Build
+                  inputs:
+                      scriptType: inlineScript
+                      inlineScript: |
+                          Write-Host "Working folder: $pwd"
+                          $ubuild = build\build.ps1 -get
+
+                          $ubuild.PrepareBuild("vso")
+                - task: NodeTool@0
+                  displayName: Use Node 11.x
+                  inputs:
+                      versionSpec: 11.x
+                - task: Npm@1
+                  displayName: npm install
+                  inputs:
+                      workingDir: src\Umbraco.Web.UI.Client
+                      verbose: false
+                - task: gulp@0
+                  displayName: gulp build
+                  inputs:
+                      gulpFile: src\Umbraco.Web.UI.Client\gulpfile.js
+                      targets: build
+                      workingDirectory: src\Umbraco.Web.UI.Client
+                      publishJUnitResults: true
+                      testResultsFiles: '**\TESTS-*.xml'
+                - task: PowerShell@1
+                  displayName: Prepare Packages & Zip
+                  inputs:
+                      scriptType: inlineScript
+                      inlineScript: |
+                          Write-Host "Working folder: $pwd"
+                          $ubuild = build\build.ps1 -get -continue
+
+                          $ubuild.CompileUmbraco()
+                          $ubuild.PreparePackages()
+                          $ubuild.PackageZip()
+                - task: CopyFiles@2
+                  displayName: Copy Zip Files to Staging
+                  inputs:
+                      SourceFolder: build.out
+                      Contents: '*.zip'
+                      TargetFolder: $(build.artifactstagingdirectory)
+                      CleanTargetFolder: true
+                - task: PublishBuildArtifacts@1
+                  displayName: Publish Zip Files
+                  inputs:
+                      PathtoPublish: $(build.artifactstagingdirectory)
+                      ArtifactName: zips
+                - task: PowerShell@1
+                  displayName: Verify & Package NuGet
+                  inputs:
+                      scriptType: inlineScript
+                      inlineScript: |
+                          Write-Host "Working folder: $pwd"
+                          $ubuild = build\build.ps1 -get -continue
+
+                          $ubuild.VerifyNuGet()
+                          $ubuild.PackageNuGet()
+                - task: CopyFiles@2
+                  displayName: Copy NuPkg Files to Staging
+                  inputs:
+                      SourceFolder: build.out
+                      Contents: '*.nupkg'
+                      TargetFolder: $(build.artifactstagingdirectory)
+                      CleanTargetFolder: true
+                - task: PublishBuildArtifacts@1
+                  displayName: Publish NuPkg Files
+                  inputs:
+                      PathtoPublish: $(build.artifactstagingdirectory)
+                      ArtifactName: nupkg
+                - task: CopyFiles@2
+                  displayName: Copy Log Files to Staging
+                  inputs:
+                      SourceFolder: build.tmp
+                      Contents: '*.log'
+                      TargetFolder: $(build.artifactstagingdirectory)
+                      CleanTargetFolder: true
+                  condition: succeededOrFailed()
+                - task: PublishBuildArtifacts@1
+                  displayName: Publish Log Files
+                  inputs:
+                      PathtoPublish: $(build.artifactstagingdirectory)
+                      ArtifactName: logs
+                  condition: succeededOrFailed()
+    - stage: Artifacts_Docs
+      displayName: 'Static Code Documentation'
+      dependsOn: []
+      condition: 'ne(variables[''Umbraco.IsReleaseBuild''], ''false'')'
+      jobs:
+          - job: Generate_Docs_CSharp
+            timeoutInMinutes: 60
+            displayName: Generate C# Docs
+            pool:
+                vmImage: windows-latest
+            steps:
+                - task: UseDotNet@2
+                  displayName: Use .Net Core sdk 5.x
+                  inputs:
+                      version: 5.x
+                - task: PowerShell@2
+                  displayName: 'Prep build tool -  C# Docs'
+                  inputs:
+                      targetType: inline
+                      script: |
+                        choco install docfx -y
+                        if ($lastexitcode -ne 0){
+                           throw ("Error installing DocFX")
+                        }
+                        docfx metadata --loglevel Verbose "$(Build.SourcesDirectory)\src\ApiDocs\docfx.json"
+                        if ($lastexitcode -ne 0){
+                           throw ("Error generating docs.")
+                        }
+                        docfx build --loglevel Verbose "$(Build.SourcesDirectory)\src\ApiDocs\docfx.json"
+                        if ($lastexitcode -ne 0){
+                             throw ("Error generating docs.")
+                        }
+                      errorActionPreference: continue
+                      workingDirectory: build
+                - task: ArchiveFiles@2
+                  displayName: 'Zip C# Docs'
+                  inputs:
+                      rootFolderOrFile: $(Build.SourcesDirectory)\src\ApiDocs\_site
+                      includeRootFolder: false
+                      archiveType: zip
+                      archiveFile: $(Build.ArtifactStagingDirectory)\docs\csharp-docs.zip
+                      replaceExistingArchive: true
+                - task: PublishPipelineArtifact@1
+                  displayName: Publish to artifacts - C# Docs
+                  inputs:
+                      targetPath: $(Build.ArtifactStagingDirectory)\docs\csharp-docs.zip
+                      artifact: docs-cs
+                      publishLocation: pipeline
+
+          - job: Generate_Docs_JS
+            timeoutInMinutes: 60
+            displayName: Generate JS Docs
+            pool:
+                vmImage: windows-latest
+            steps:
+                - task: PowerShell@2
+                  displayName: Prep build tool - JS Docs
+                  inputs:
+                      targetType: inline
+                      script: |
+                          $uenv=./build.ps1 -get -doc
+                          $uenv.SandboxNode()
+                          $uenv.CompileBelle()
+                          $uenv.PrepareAngularDocs()
+                          $uenv.RestoreNode()
+                      errorActionPreference: continue
+                      workingDirectory: build
+                - task: PublishPipelineArtifact@1
+                  displayName: Publish to artifacts - JS Docs
+                  inputs:
+                      targetPath: $(Build.Repository.LocalPath)\build.out\
+                      artifact: docs
+                      publishLocation: pipeline

build/build-bootstrap.ps1

@@ -23,7 +23,7 @@
   $cache = 4
   $nuget = "$scriptTemp\nuget.exe"
   # ensure the correct NuGet-source is used. This one is used by Umbraco
-  $nugetsourceUmbraco = "https://www.myget.org/F/umbracocore/api/v3/index.json"
+  $nugetsourceUmbraco = "https://www.myget.org/F/umbracoprereleases/api/v3/index.json"
   if (-not $local)
   {
     $source = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
@@ -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." }
     }

build/build.ps1

@@ -51,12 +51,12 @@
   {
     param ( $semver )
 
-    $release = "" + $semver.Major + "." + $semver.Minor + "." + $semver.Patch
-
-    Write-Host "Update IIS Express port in csproj"
-    $updater = New-Object "Umbraco.Build.ExpressPortUpdater"
-    $csproj = "$($this.SolutionRoot)\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj"
-    $updater.Update($csproj, $release)
+    $port = "" + $semver.Major + $semver.Minor + ("" + $semver.Patch).PadLeft(2, '0')
+    Write-Host "Update port in launchSettings.json to $port"
+    $filePath = "$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Properties\launchSettings.json"
+    $this.ReplaceFileText($filePath, `
+      "http://localhost:(\d+)?", `
+      "http://localhost:$port")
   })
 
   $ubuild.DefineMethod("SandboxNode",
@@ -126,7 +126,7 @@
 
         Write-Output "### gulp build for version $($this.Version.Release)" >> $log 2>&1
         npm run build --buildversion=$this.Version.Release >> $log 2>&1
-		
+
 		# We can ignore this warning, we need to update to node 12 at some point - https://github.com/jsdom/jsdom/issues/2939
 		$indexes = [System.Collections.ArrayList]::new()
 		$index = 0;
@@ -141,7 +141,7 @@
 			# Loop through the list of indexes and remove the errors that we expect and feel confident we can ignore
 			$error.Remove($error[$_])
 		}
-		
+
         if (-not $?) { throw "Failed to build" } # that one is expected to work
     } finally {
         Pop-Location
@@ -168,7 +168,7 @@
     $buildConfiguration = "Release"
 
     $src = "$($this.SolutionRoot)\src"
-    $log = "$($this.BuildTemp)\msbuild.umbraco.log"
+    $log = "$($this.BuildTemp)\build.umbraco.log"
 
     if ($this.BuildEnv.VisualStudio -eq $null)
     {
@@ -178,23 +178,35 @@
     Write-Host "Compile Umbraco"
     Write-Host "Logging to $log"
 
-    # beware of the weird double \\ at the end of paths
-    # see http://edgylogic.com/blog/powershell-and-external-commands-done-right/
-    &$this.BuildEnv.VisualStudio.MsBuild "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
-      /p:WarningLevel=0 `
-      /p:Configuration=$buildConfiguration `
-      /p:Platform=AnyCPU `
-      /p:UseWPP_CopyWebApplication=True `
-      /p:PipelineDependsOnBuild=False `
-      /p:OutDir="$($this.BuildTemp)\bin\\" `
-      /p:WebProjectOutputDir="$($this.BuildTemp)\WebApp\\" `
-      /p:Verbosity=minimal `
-      /t:Clean`;Rebuild `
-      /tv:"$($this.BuildEnv.VisualStudio.ToolsVersion)" `
-      /p:UmbracoBuild=True `
+   & dotnet build "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" `
+      --configuration $buildConfiguration `
+      --output "$($this.BuildTemp)\bin\\" `
       > $log
 
-    if (-not $?) { throw "Failed to compile Umbraco.Web.UI." }
+   # get files into WebApp\bin
+    & dotnet publish "$src\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" `
+      --configuration Release --output "$($this.BuildTemp)\WebApp\bin\\" `
+      > $log
+
+    & dotnet publish "$src\Umbraco.Persistence.SqlCe\Umbraco.Persistence.SqlCe.csproj" `
+      --configuration Release --output "$($this.BuildTemp)\SqlCe\" `
+      > $log
+
+    # remove extra files
+    $webAppBin = "$($this.BuildTemp)\WebApp\bin"
+    $excludeDirs = @("$($webAppBin)\refs","$($webAppBin)\runtimes","$($webAppBin)\Umbraco","$($webAppBin)\wwwroot")
+    $excludeFiles = @("$($webAppBin)\appsettings.*","$($webAppBin)\*.deps.json","$($webAppBin)\*.exe","$($webAppBin)\*.config","$($webAppBin)\*.runtimeconfig.json")
+    $this.RemoveDirectory($excludeDirs)
+    $this.RemoveFile($excludeFiles)
+
+    # copy rest of the files into WebApp
+    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco")
+    $excludeUmbracoDirs = @("$($this.BuildTemp)\WebApp\umbraco\lib")
+    $this.RemoveDirectory($excludeUmbracoDirs)
+    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\Views", "*", "$($this.BuildTemp)\WebApp\Views")
+    Copy-Item "$($this.SolutionRoot)\src\Umbraco.Web.UI.NetCore\appsettings.json" "$($this.BuildTemp)\WebApp"
+
+    if (-not $?) { throw "Failed to compile Umbraco.Web.UI.NetCore." }
 
     # /p:UmbracoBuild tells the csproj that we are building from PS, not VS
   })
@@ -215,7 +227,7 @@
       Write-Host "Create packaging directory"
       mkdir "$($this.BuildTemp)\tests\Packaging" > $null
     }
-    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Tests\Packaging\Packages", "*", "$($this.BuildTemp)\tests\Packaging\Packages")
+    #$this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Tests\Packaging\Packages", "*", "$($this.BuildTemp)\tests\Packaging\Packages")
 
     # required for package install tests
     if (-not (Test-Path -Path "$($this.BuildTemp)\tests\bin" ))
@@ -253,6 +265,9 @@
       /p:UmbracoBuild=True `
       > $log
 
+      # copy Umbraco.Persistence.SqlCe files into WebApp
+      Copy-Item "$($this.BuildTemp)\tests\Umbraco.Persistence.SqlCe.*" "$($this.BuildTemp)\WebApp\bin"
+
     if (-not $?) { throw "Failed to compile tests." }
 
     # /p:UmbracoBuild tells the csproj that we are building from PS
@@ -265,11 +280,12 @@
     $src = "$($this.SolutionRoot)\src"
     $tmp = "$($this.BuildTemp)"
     $out = "$($this.BuildOutput)"
+    $templates = "$($this.SolutionRoot)\build\templates"
 
     $buildConfiguration = "Release"
 
     # restore web.config
-    $this.TempRestoreFile("$src\Umbraco.Web.UI\web.config")
+    #$this.TempRestoreFile("$src\Umbraco.Web.UI\web.config")
 
     # cleanup build
     Write-Host "Clean build"
@@ -282,9 +298,8 @@
 
     # create directories
     Write-Host "Create directories"
-    mkdir "$tmp\Configs" > $null
-    mkdir "$tmp\Configs\Lang" > $null
     mkdir "$tmp\WebApp\App_Data" > $null
+    mkdir "$tmp\Templates" > $null
     #mkdir "$tmp\WebApp\Media" > $null
     #mkdir "$tmp\WebApp\Views" > $null
 
@@ -292,16 +307,8 @@
     Write-Host "Copy xml documentation"
     Copy-Item -force "$tmp\bin\*.xml" "$tmp\WebApp\bin"
 
-    Write-Host "Copy transformed configs and langs"
-    # note: exclude imageprocessor/*.config as imageprocessor pkg installs them
-    $this.CopyFiles("$tmp\WebApp\config", "*.config", "$tmp\Configs", `
-      { -not $_.RelativeName.StartsWith("imageprocessor") })
-    $this.CopyFiles("$tmp\WebApp\config", "*.js", "$tmp\Configs")
-    $this.CopyFiles("$tmp\WebApp\config\lang", "*.xml", "$tmp\Configs\Lang")
-    $this.CopyFile("$tmp\WebApp\web.config", "$tmp\Configs\web.config.transform")
-
-    Write-Host "Copy transformed web.config"
-    $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config")
+    # Write-Host "Copy transformed web.config"
+    # $this.CopyFile("$src\Umbraco.Web.UI\web.$buildConfiguration.Config.transformed", "$tmp\WebApp\web.config")
 
     # offset the modified timestamps on all umbraco dlls, as WebResources
     # break if date is in the future, which, due to timezone offsets can happen.
@@ -318,21 +325,35 @@
     {
       $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
     }
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
-    $this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")
+    #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\bin\x86")
+    #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\bin\amd64")
+    #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x86\native", "*.*", "$tmp\WebApp\bin\x86")
+    #$this.CopyFiles("$nugetPackages\umbraco.sqlserverce\4.0.0.1\runtimes\win-x64\native", "*.*", "$tmp\WebApp\bin\amd64")
 
     # copy Belle
     Write-Host "Copy Belle"
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\assets", "*", "$tmp\WebApp\umbraco\assets")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\js", "*", "$tmp\WebApp\umbraco\js")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\lib", "*", "$tmp\WebApp\umbraco\lib")
-    $this.CopyFiles("$src\Umbraco.Web.UI\umbraco\views", "*", "$tmp\WebApp\umbraco\views")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\assets", "*", "$tmp\WebApp\wwwroot\umbraco\assets")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\js", "*", "$tmp\WebApp\wwwroot\umbraco\js")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\lib", "*", "$tmp\WebApp\wwwroot\umbraco\lib")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\wwwroot\umbraco\views", "*", "$tmp\WebApp\wwwroot\umbraco\views")
+
+
+
+    # Prepare templates
+    Write-Host "Copy template files"
+    $this.CopyFiles("$templates", "*", "$tmp\Templates")
+
+    Write-Host "Copy files for dotnet templates"
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "Program.cs", "$tmp\Templates\UmbracoProject")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore", "Startup.cs", "$tmp\Templates\UmbracoProject")
+    $this.CopyFiles("$src\Umbraco.Web.UI.NetCore\Views", "*", "$tmp\Templates\UmbracoProject\Views")
+
+  $this.RemoveDirectory("$tmp\Templates\UmbracoProject\bin")
   })
 
   $ubuild.DefineMethod("PackageZip",
   {
+
     Write-Host "Create Zip packages"
 
     $src = "$($this.SolutionRoot)\src"
@@ -365,6 +386,7 @@
     $env:UMBRACO_RELEASE=$this.Version.Release
     $env:UMBRACO_COMMENT=$this.Version.Comment
     $env:UMBRACO_BUILD=$this.Version.Build
+    $env:UMBRACO_TMP="$($this.SolutionRoot)\build.tmp"
 
     if ($args -and $args[0] -eq "vso")
     {
@@ -381,16 +403,6 @@
     }
   })
 
-  $ubuild.DefineMethod("PrepareNuGet",
-  {
-    Write-Host "Prepare NuGet"
-
-    # add Web.config transform files to the NuGet package
-    Write-Host "Add web.config transforms to NuGet package"
-    mv "$($this.BuildTemp)\WebApp\Views\Web.config" "$($this.BuildTemp)\WebApp\Views\Web.config.transform"
-
-  })
-
   $nugetsourceUmbraco = "https://api.nuget.org/v3/index.json"
 
   $ubuild.DefineMethod("RestoreNuGet",
@@ -398,27 +410,22 @@
     Write-Host "Restore NuGet"
     Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log"
 	$params = "-Source", $nugetsourceUmbraco
-    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" > "$($this.BuildTemp)\nuget.restore.log" @params
+    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\umbraco-netcore-only.sln" > "$($this.BuildTemp)\nuget.restore.log" @params
     if (-not $?) { throw "Failed to restore NuGet packages." }
   })
 
   $ubuild.DefineMethod("PackageNuGet",
   {
     $nuspecs = "$($this.SolutionRoot)\build\NuSpecs"
+    $templates = "$($this.BuildTemp)\Templates"
 
     Write-Host "Create NuGet packages"
 
-    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
-        -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version "$($this.Version.Semver.ToString())" `
-        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Core." }
-
-    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Web.nuspec" `
-        -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version "$($this.Version.Semver.ToString())" `
-        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." }
+    &dotnet pack "$($this.SolutionRoot)\src\umbraco-netcore-only.sln" `
+        --output "$($this.BuildOutput)" `
+        --verbosity detailed `
+        -c Release `
+        -p:PackageVersion="$($this.Version.Semver.ToString())" > "$($this.BuildTemp)\pack.umbraco.log"
 
     &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
         -Properties BuildTmp="$($this.BuildTemp)" `
@@ -426,6 +433,31 @@
         -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log"
     if (-not $?) { throw "Failed to pack NuGet UmbracoCms." }
 
+    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Examine.Lucene.nuspec" `
+        -Properties BuildTmp="$($this.BuildTemp)" `
+        -Version "$($this.Version.Semver.ToString())" `
+        -Verbosity detailed  `
+        -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.examine.lucene.log"
+    if (-not $?) { throw "Failed to pack Nuget UmbracoCms.Lucene.nuspec"}
+
+    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.SqlCe.nuspec" `
+        -Properties BuildTmp="$($this.BuildTemp)" `
+        -Version "$($this.Version.Semver.ToString())" `
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmssqlce.log"
+    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.SqlCe." }
+
+    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.StaticAssets.nuspec" `
+        -Properties BuildTmp="$($this.BuildTemp)" `
+        -Version "$($this.Version.Semver.ToString())" `
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsstaticassets.log"
+    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.StaticAssets." }
+
+    &$this.BuildEnv.NuGet Pack "$templates\Umbraco.Templates.nuspec" `
+        -Properties BuildTmp="$($this.BuildTemp)" `
+        -Version "$($this.Version.Semver.ToString())" `
+        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.templates.log"
+    if (-not $?) { throw "Failed to pack NuGet Umbraco.Templates." }
+
     # run hook
     if ($this.HasMethod("PostPackageNuGet"))
     {
@@ -438,8 +470,8 @@
   $ubuild.DefineMethod("VerifyNuGet",
   {
     $this.VerifyNuGetConsistency(
-      ("UmbracoCms", "UmbracoCms.Core", "UmbracoCms.Web"),
-      ("Umbraco.Core", "Umbraco.Web", "Umbraco.Web.UI", "Umbraco.Examine"))
+      ("UmbracoCms"),
+      ("Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.Web.UI.NetCore", "Umbraco.Examine.Lucene", "Umbraco.PublishedCache.NuCache", "Umbraco.Web.Common", "Umbraco.Web.Website", "Umbraco.Web.BackOffice", "Umbraco.Persistence.SqlCe"))
     if ($this.OnError()) { return }
   })
 
@@ -476,7 +508,7 @@
     $src = "$($this.SolutionRoot)\src"
     $out = $this.BuildOutput
 
-    # Check if the solution has been built		
+    # Check if the solution has been built
     if (!(Test-Path "$src\Umbraco.Web.UI.Client\node_modules")) {throw "Umbraco needs to be built before generating the Angular Docs"}
 
     "Moving to Umbraco.Web.UI.Docs folder"
@@ -487,7 +519,7 @@
     & npx gulp docs
 
     Pop-Location
-    
+
     # change baseUrl
     $BaseUrl = "https://our.umbraco.com/apidocs/v8/ui/"
     $IndexPath = "./api/index.html"
@@ -520,8 +552,6 @@
     if ($this.OnError()) { return }
     $this.VerifyNuGet()
     if ($this.OnError()) { return }
-    $this.PrepareNuGet()
-    if ($this.OnError()) { return }
     $this.PackageNuGet()
     if ($this.OnError()) { return }
     $this.PrepareAzureGallery()

build/templates/Umbraco.Templates.nuspec

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata minClientVersion="4.1.0">
+        <id>Umbraco.Templates</id>
+        <version>1.0.0</version>
+        <authors>Umbraco HQ</authors>
+        <owners>Umbraco HQ</owners>
+        <license type="expression">MIT</license>
+        <projectUrl>https://umbraco.com/</projectUrl>
+        <iconUrl>https://umbraco.com/dist/nuget/logo-small.png</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Umbraco Cms templates for .NET Core Template Engine available through the dotnet CLI's new command</description>
+        <language>en-US</language>
+        <tags>umbraco</tags>
+        <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
+        <packageTypes>
+            <packageType name="Template" />
+        </packageTypes>
+    </metadata>
+</package>
+

build/templates/UmbracoPackage/.template.config/dotnetcli.host.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "http://json.schemastore.org/dotnetcli.host",
+    "symbolInfo": {
+
+    }
+}

build/templates/UmbracoPackage/.template.config/ide.host.json

@@ -0,0 +1,13 @@
+{
+    "$schema": "http://json.schemastore.org/vs-2017.3.host",
+    "order" : 0,
+    "icon": "icon.png",
+    "description": {
+        "id": "UmbracoPackage",
+        "text": "Umbraco Package - An empty Umbraco CMS package (Plugin)"
+    },
+    "symbolInfo": [
+
+    ]
+
+}

build/templates/UmbracoPackage/.template.config/template.json

@@ -0,0 +1,59 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "Umbraco HQ",
+    "description": "An empty Umbraco Package/Plugin ready to get started",
+    "classifications": [ "Web", "CMS", "Umbraco", "Package", "Plugin"],
+    "groupIdentity": "Umbraco.Templates.UmbracoPackage",
+    "identity": "Umbraco.Templates.UmbracoPackage.CSharp",
+    "name": "Umbraco Package",
+    "shortName": "umbracopackage",
+    "defaultName": "UmbracoPackage1",
+    "preferNameDirectory": true,
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "primaryOutputs": [
+        {
+            "path": "UmbracoPackage.csproj"
+        }
+    ],
+    "sourceName": "UmbracoPackage",
+    "preferNameDirectory": true,
+    "symbols": {
+        "version": {
+            "type": "parameter",
+            "datatype": "string",
+            "defaultValue": "9.0.0-beta001",
+            "description": "The version of Umbraco to load using NuGet",
+            "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
+        },
+        "namespaceReplacer": {
+            "type": "generated",
+            "generator": "coalesce",
+            "parameters": {
+                "sourceVariableName": "name",
+                "defaultValue": "UmbracoPackage",
+                "fallbackVariableName": "name"
+            },
+            "replaces":"UmbracoPackage"
+        },
+        "Framework": {
+            "type": "parameter",
+            "description": "The target framework for the project.",
+            "datatype": "choice",
+            "choices": [
+                {
+                    "choice": "net5.0",
+                    "description": "Target net5.0"
+                },
+                {
+                    "choice": "net6.0",
+                    "description": "Target net6.0"
+                }
+            ],
+            "replaces": "net5.0",
+            "defaultValue": "net5.0"
+        }
+    }
+}

build/templates/UmbracoPackage/App_Plugins/UmbracoPackage/package.manifest

@@ -0,0 +1,2 @@
+{
+}

build/templates/UmbracoPackage/UmbracoPackage.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <ContentTargetFolders>.</ContentTargetFolders>
+        <Product>UmbracoPackage</Product>
+        <PackageId>UmbracoPackage</PackageId>
+        <Title>UmbracoPackage</Title>
+        <Description>...</Description>
+        <Product>...</Product>
+        <PackageTags>umbraco plugin package</PackageTags>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Umbraco.Cms.Web.Website" Version="UMBRACO_VERSION_FROM_TEMPLATE"/>
+        <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="UMBRACO_VERSION_FROM_TEMPLATE"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Content Include="App_Plugins\UmbracoPackage\**\*.*">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+        </Content>
+        <None Include="build\**\*.*">
+            <Pack>True</Pack>
+            <PackagePath>build</PackagePath>
+        </None>
+    </ItemGroup>
+</Project>

build/templates/UmbracoPackage/build/UmbracoPackage.targets

@@ -0,0 +1,27 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <UmbracoPackageContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoPackage\**\*.*</UmbracoPackageContentFilesPath>
+    </PropertyGroup>
+
+    <Target Name="CopyUmbracoPackageAssets" BeforeTargets="Build">
+        <ItemGroup>
+            <UmbracoPackageContentFiles Include="$(UmbracoPackageContentFilesPath)" />
+        </ItemGroup>
+        <Message Text="Copying UmbracoPackage files: $(UmbracoPackageContentFilesPath) - #@(UmbracoPackageContentFiles->Count()) files"  Importance="high" />
+        <Copy
+            SourceFiles="@(UmbracoPackageContentFiles)"
+            DestinationFiles="@(UmbracoPackageContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\%(RecursiveDir)%(Filename)%(Extension)')"
+            SkipUnchangedFiles="true" />
+
+    </Target>
+
+    <Target Name="ClearUmbracoPackageAssets" BeforeTargets="Clean">
+        <ItemGroup>
+            <UmbracoPackageDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\" />
+        </ItemGroup>
+        <Message Text="Clear old UmbracoPackage data"  Importance="high" />
+        <RemoveDir Directories="@(UmbracoPackageDir)"  />
+    </Target>
+
+</Project>

build/templates/UmbracoProject/.template.config/dotnetcli.host.json

@@ -0,0 +1,39 @@
+{
+    "$schema": "http://json.schemastore.org/dotnetcli.host",
+    "symbolInfo": {
+        "PackageTestSiteName": {
+            "longName": "PackageTestSiteName",
+            "shortName": "p"
+        },
+        "UseSqlCe": {
+            "longName": "SqlCe",
+            "shortName": "ce"
+        },
+        "SkipRestore": {
+            "longName": "no-restore",
+            "shortName": ""
+        },
+        "FriendlyName": {
+            "longName": "friendly-name",
+            "shortName": ""
+        },
+        "Email": {
+            "longName": "email",
+            "shortName": ""
+        },
+        "Password": {
+            "longName": "password",
+            "shortName": ""
+        },
+        "ConnectionString":{
+            "longName": "connection-string",
+            "shortName": ""
+        }
+    },
+    "usageExamples": [
+        "dotnet new umbraco -n MyNewProject",
+        "dotnet new umbraco -n MyNewProjectWithCE -ce",
+        "dotnet new umbraco -n MyNewProject --no-restore",
+        "dotnet new umbraco -n MyNewProject --friendly-name "Friendly User" --email user@email.com --password password1234 --connection-string "Server=ConnectionStringHere""
+    ]
+}

build/templates/UmbracoProject/.template.config/ide.host.json

@@ -0,0 +1,60 @@
+{
+    "$schema": "http://json.schemastore.org/vs-2017.3.host",
+    "order" : 0,
+    "icon": "icon.png",
+    "description": {
+        "id": "UmbracoProject",
+        "text": "Umbraco Web Application - An empty Umbraco CMS web application"
+    },
+    "symbolInfo": [
+        {
+            "id": "UseSqlCe",
+            "name": {
+                "text": "Use Sql Compact Edition (SqlCE)"
+            },
+            "isVisible": "true"
+        },
+        {
+            "id": "SkipRestore",
+            "name": {
+                "text": "Skips the automatic NuGet restore of the project on create"
+            },
+            "isVisible": "true"
+        },
+        {
+            "id": "PackageTestSiteName",
+            "name": {
+                "text": "Optional: Specify the name of a package that this should be a test site for"
+            },
+            "isVisible": "true"
+        },
+        {
+            "id": "FriendlyName",
+            "name": {
+                "text": "Optional: The friendly name of the user for Umbraco login when using Unattended install"
+            },
+            "isVisible": "true"
+        },
+        {
+            "id": "Email",
+            "name": {
+                "text": "Optional: Email to use for Umbraco login when using Unattended install"
+            },
+            "isVisible": "true"
+        },
+        {
+            "id": "Password",
+            "name": {
+                "text": "Optional: Password to use for Umbraco login when using Unattended install"
+            },
+            "isVisible": "true"
+        },
+        {
+            "id": "ConnectionString",
+            "name": {
+                "text": "Optional: Database connection string when using Unattended install"
+            },
+            "isVisible": "true"
+        }
+    ]
+}

build/templates/UmbracoProject/.template.config/template.json

@@ -0,0 +1,140 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "Umbraco HQ",
+    "description": "An empty Umbraco Project ready to get started",
+    "classifications": [ "Web", "CMS", "Umbraco"],
+    "groupIdentity": "Umbraco.Templates.UmbracoProject",
+    "identity": "Umbraco.Templates.UmbracoProject.CSharp",
+    "name": "Umbraco Project",
+    "shortName": "umbraco",
+    "defaultName": "UmbracoProject1",
+    "preferNameDirectory": true,
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "primaryOutputs": [
+        {
+        "path": "UmbracoProject.csproj"
+        }
+    ],
+    "postActions": [
+        {
+            "condition": "(!SkipRestore)",
+            "description": "Restore NuGet packages required by this project",
+            "manualInstructions": [{
+              "text": "Run 'dotnet restore'"
+            }],
+            "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025",
+            "continueOnError": true
+        }
+    ],
+    "sourceName": "UmbracoProject",
+    "symbols": {
+        "version": {
+            "type": "parameter",
+            "datatype": "string",
+            "defaultValue": "9.0.0-beta001",
+            "description": "The version of Umbraco to load using NuGet",
+            "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
+        },
+        "namespaceReplacer": {
+            "type": "generated",
+            "generator": "coalesce",
+            "parameters": {
+                "sourceVariableName": "name",
+                "defaultValue": "UmbracoProject",
+                "fallbackVariableName": "name"
+            },
+            "replaces":"Umbraco.Cms.Web.UI.NetCore"
+        },
+        "PackageTestSiteName": {
+            "type": "parameter",
+            "datatype":"text",
+            "defaultValue": "",
+            "replaces":"PackageTestSiteName",
+            "description": "The name of the package this should be a test site for (Default: '')"
+        },
+        "UseSqlCe":{
+            "type": "parameter",
+            "datatype":"bool",
+            "defaultValue": "false",
+            "description": "Adds the required dependencies to use SqlCE (Windows only) (Default: false)"
+        },
+        "Framework": {
+            "type": "parameter",
+            "description": "The target framework for the project",
+            "datatype": "choice",
+            "choices": [
+                {
+                    "choice": "net5.0",
+                    "description": "Target net5.0"
+                },
+                {
+                    "choice": "net6.0",
+                    "description": "Target net6.0"
+                }
+            ],
+            "replaces": "net5.0",
+            "defaultValue": "net5.0"
+        },
+        "SkipRestore": {
+            "type": "parameter",
+            "datatype": "bool",
+            "description": "If specified, skips the automatic restore of the project on create",
+            "defaultValue": "false"
+        },
+        "HttpPort": {
+            "type": "generated",
+            "generator": "port",
+            "replaces": "HTTP_PORT_FROM_TEMPLATE",
+            "parameters": {
+                "high": 65535,
+                "low": 1024,
+                "fallback": 5000
+            }
+        },
+        "HttpsPort": {
+            "type": "generated",
+            "generator": "port",
+            "replaces": "HTTPS_PORT_FROM_TEMPLATE",
+            "parameters": {
+                "low": 44300,
+                "high": 44399,
+                "fallback": 5001
+            }
+        },
+        "FriendlyName":{
+            "type": "parameter",
+            "datatype":"text",
+            "description": "The friendly name of the user for Umbraco login when using Unattended install (Without installer wizard UI)",
+            "replaces": "FRIENDLY_NAME_FROM_TEMPLATE",
+            "defaultValue": ""
+        },
+        "Email":{
+            "type": "parameter",
+            "datatype":"text",
+            "description": "Email to use for Umbraco login when using Unattended install (Without installer wizard UI)",
+            "replaces": "EMAIL_FROM_TEMPLATE",
+            "defaultValue": ""
+        },
+        "Password":{
+            "type": "parameter",
+            "datatype":"text",
+            "description": "Password to use for Umbraco login when using Unattended install (Without installer wizard UI)",
+            "replaces": "PASSWORD_FROM_TEMPLATE",
+            "defaultValue": ""
+        },
+        "ConnectionString":{
+            "type": "parameter",
+            "datatype":"text",
+            "description": "Database connection string when using Unattended install (Without installer wizard UI)",
+            "replaces": "CONNECTION_FROM_TEMPLATE",
+            "defaultValue": ""
+        },
+        "UsingUnattenedInstall":{
+            "type": "computed",
+            "value": "(FriendlyName != \"\" && Email != \"\" && Password != \"\" && ConnectionString != \"\")"
+        }
+    }
+}

build/templates/UmbracoProject/Properties/launchSettings.json

@@ -0,0 +1,26 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:HTTP_PORT_FROM_TEMPLATE",
+      "sslPort": HTTPS_PORT_FROM_TEMPLATE
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Umbraco.Web.UI.NetCore": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:HTTPS_PORT_FROM_TEMPLATE;http://localhost:HTTP_PORT_FROM_TEMPLATE"
+    }
+  }
+}

build/templates/UmbracoProject/UmbracoProject.csproj

@@ -0,0 +1,54 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Umbraco.Cms" Version="UMBRACO_VERSION_FROM_TEMPLATE" />
+        <PackageReference Include="Umbraco.Cms.SqlCe" Version="UMBRACO_VERSION_FROM_TEMPLATE" Condition="'$(UseSqlCe)' == 'true'" />
+        <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" Condition="'$(UseSqlCe)' == 'true'" />
+    </ItemGroup>
+
+    <Import Project="..\PackageTestSiteName\build\PackageTestSiteName.targets" Condition="'$(PackageTestSiteName)' != ''"/>
+    <ItemGroup Condition="'$(PackageTestSiteName)' != ''">
+        <ProjectReference Include="..\PackageTestSiteName\PackageTestSiteName.csproj"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Remove="umbraco\Data\**" />
+        <Compile Remove="umbraco\logs\**" />
+        <Compile Remove="umbraco\MediaCache\**" />
+        <Compile Remove="umbraco\models\**" />
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Remove="umbraco\Data\**" />
+        <EmbeddedResource Remove="umbraco\logs\**" />
+        <EmbeddedResource Remove="umbraco\MediaCache\**" />
+        <EmbeddedResource Remove="umbraco\models\**" />
+    </ItemGroup>
+    <ItemGroup>
+        <None Remove="umbraco\models\**" />
+        <None Remove="umbraco\Data\**" />
+        <None Remove="umbraco\logs\**" />
+        <None Remove="umbraco\MediaCache\**" />
+        <None Include="config\**\*.*">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+        </None>
+        <None Include="umbraco\**\*.*">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+        </None>
+    </ItemGroup>
+    <ItemGroup>
+        <Content Remove="umbraco\Data\**" />
+        <Content Remove="umbraco\logs\**" />
+        <Content Remove="umbraco\MediaCache\**" />
+        <Content Remove="umbraco\models\**" />
+    </ItemGroup>
+
+    <!--Set this to true ModelsBuilder mode is not PureLive -->
+    <PropertyGroup>
+        <RazorCompileOnBuild>false</RazorCompileOnBuild>
+    </PropertyGroup>
+</Project>

build/templates/UmbracoProject/Views/_ViewImports.cshtml

@@ -0,0 +1,4 @@
+@using Umbraco.Web.UI.NetCore
+@using Umbraco.Extensions
+@using Umbraco.Web.PublishedModels
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

build/templates/UmbracoProject/appsettings.Development.json

@@ -0,0 +1,50 @@
+{
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Information"
+    },
+    "WriteTo": [
+      {
+        "Name": "Async",
+        "Args": {
+          "configure": [
+            {
+              "Name": "Console"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  //#if (UsingUnattenedInstall)
+  "ConnectionStrings": {
+    "umbracoDbDSN": "CONNECTION_FROM_TEMPLATE"
+  },
+  //#endif
+  "Umbraco": {
+    "CMS": {
+      //#if (UsingUnattenedInstall)
+      "Unattended": {
+        "InstallUnattended": true,
+        "UnattendedUserName": "FRIENDLY_NAME_FROM_TEMPLATE",
+        "UnattendedUserEmail": "EMAIL_FROM_TEMPLATE",
+        "UnattendedUserPassword": "PASSWORD_FROM_TEMPLATE"
+      },
+      //#endif
+      "Global": {
+        "Smtp": {
+          "From": "your@email.here",
+          "Host": "localhost",
+          "Port": 25
+        }
+      },
+      "Hosting": {
+        "Debug": true
+      },
+      "RuntimeMinification": {
+        "useInMemoryCache": true,
+        "cacheBuster": "Timestamp"
+      }
+    }
+  }
+}

build/templates/UmbracoProject/appsettings.json

@@ -0,0 +1,22 @@
+{
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Warning",
+        "Microsoft.Hosting.Lifetime": "Information",
+        "System": "Warning"
+      }
+    }
+  },
+  "ConnectionStrings": {
+    "umbracoDbDSN": ""
+  },
+  "Umbraco": {
+    "CMS": {
+      "Hosting": {
+        "Debug": false
+      }
+    }
+  }
+}

linting/.editorconfig

@@ -0,0 +1,447 @@
+# Version: 1.6.2 (Using https://semver.org/)
+# Updated: 2020-11-02
+# See https://github.com/RehanSaeed/EditorConfig/releases for release notes.
+# See https://github.com/RehanSaeed/EditorConfig for updates to this file.
+# See http://EditorConfig.org for more information about .editorconfig files.
+
+##########################################
+# Common Settings
+##########################################
+
+# This file is the top-most EditorConfig file
+root = true
+
+# All Files
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+##########################################
+# File Extension Settings
+##########################################
+
+# Visual Studio Solution Files
+[*.sln]
+indent_style = tab
+
+# Visual Studio XML Project Files
+[*.{csproj,vbproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# XML Configuration Files
+[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
+indent_size = 2
+
+# JSON Files
+[*.{json,json5,webmanifest}]
+indent_size = 2
+
+# YAML Files
+[*.{yml,yaml}]
+indent_size = 2
+
+# Markdown Files
+[*.md]
+trim_trailing_whitespace = false
+
+# Web Files
+[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}]
+indent_size = 2
+
+# Batch Files
+[*.{cmd,bat}]
+end_of_line = crlf
+
+# Bash Files
+[*.sh]
+end_of_line = lf
+
+# Makefiles
+[Makefile]
+indent_style = tab
+
+##########################################
+# File Header (Uncomment to support file headers)
+# https://docs.microsoft.com/visualstudio/ide/reference/add-file-header
+##########################################
+
+# [*.{cs,csx,cake,vb,vbx}]
+file_header_template = Copyright (c) Umbraco.\nSee LICENSE for more details.
+
+# SA1636: File header copyright text should match
+# Justification: .editorconfig supports file headers. If this is changed to a value other than "none", a stylecop.json file will need to added to the project.
+# dotnet_diagnostic.SA1636.severity = none
+
+##########################################
+# .NET Language Conventions
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions
+##########################################
+
+# .NET Code Style Settings
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#net-code-style-settings
+[*.{cs,csx,cake,vb,vbx}]
+# "this." and "Me." qualifiers
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#this-and-me
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+# Language keywords instead of framework type names for type references
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#language-keywords
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+# Modifier preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#normalize-modifiers
+dotnet_style_require_accessibility_modifiers = always:warning
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:warning
+dotnet_style_readonly_field = true:warning
+# Parentheses preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parentheses-preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
+# Expression-level preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_explicit_tuple_names = true:warning
+dotnet_style_prefer_inferred_tuple_names = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = false:suggestion
+dotnet_style_prefer_conditional_expression_over_return = false:suggestion
+dotnet_style_prefer_compound_assignment = true:warning
+# Null-checking preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#null-checking-preferences
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+# Parameter preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parameter-preferences
+dotnet_code_quality_unused_parameters = all:warning
+# More style options (Undocumented)
+# https://github.com/MicrosoftDocs/visualstudio-docs/issues/3641
+dotnet_style_operator_placement_when_wrapping = end_of_line
+# https://github.com/dotnet/roslyn/pull/40070
+dotnet_style_prefer_simplified_interpolation = true:warning
+
+# C# Code Style Settings
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-code-style-settings
+[*.{cs,csx,cake}]
+# Implicit and explicit types
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#implicit-and-explicit-types
+csharp_style_var_for_built_in_types = never
+csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_elsewhere = false:warning
+# Expression-bodied members
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-bodied-members
+csharp_style_expression_bodied_methods = true:warning
+csharp_style_expression_bodied_constructors = true:warning
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_lambdas = true:warning
+csharp_style_expression_bodied_local_functions = true:warning
+# Pattern matching
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#pattern-matching
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+# Inlined variable declarations
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#inlined-variable-declarations
+csharp_style_inlined_variable_declaration = true:warning
+# Expression-level preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences
+csharp_prefer_simple_default_expression = true:warning
+# "Null" checking preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-null-checking-preferences
+csharp_style_throw_expression = true:warning
+csharp_style_conditional_delegate_call = true:warning
+# Code block preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#code-block-preferences
+csharp_prefer_braces = true:warning
+# Unused value preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#unused-value-preferences
+csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+# Index and range preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#index-and-range-preferences
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+# Miscellaneous preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#miscellaneous-preferences
+csharp_style_deconstructed_variable_declaration = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+csharp_using_directive_placement = outside_namespace:warning
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:suggestion
+
+##########################################
+# .NET Formatting Conventions
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference#formatting-conventions
+##########################################
+
+# Organize usings
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#organize-using-directives
+dotnet_sort_system_directives_first = true
+# Newline options
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#new-line-options
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+# Indentation options
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#indentation-options
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = no_change
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents_when_block = false
+# Spacing options
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#spacing-options
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_after_comma = true
+csharp_space_before_comma = false
+csharp_space_after_dot = false
+csharp_space_before_dot = false
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_around_declaration_statements = false
+csharp_space_before_open_square_brackets = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_square_brackets = false
+# Wrapping options
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#wrap-options
+csharp_preserve_single_line_statements = false
+csharp_preserve_single_line_blocks = true
+
+##########################################
+# .NET Naming Conventions
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-naming-conventions
+##########################################
+
+[*.{cs,csx,cake,vb,vbx}]
+
+##########################################
+# Styles
+##########################################
+
+# camel_case_style - Define the camelCase style
+dotnet_naming_style.camel_case_style.capitalization = camel_case
+# pascal_case_style - Define the PascalCase style
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+# first_upper_style - The first character must start with an upper-case character
+dotnet_naming_style.first_upper_style.capitalization = first_word_upper
+# prefix_interface_with_i_style - Interfaces must be PascalCase and the first character of an interface must be an 'I'
+dotnet_naming_style.prefix_interface_with_i_style.capitalization = pascal_case
+dotnet_naming_style.prefix_interface_with_i_style.required_prefix = I
+# prefix_type_parameters_with_t_style - Generic Type Parameters must be PascalCase and the first character must be a 'T'
+dotnet_naming_style.prefix_type_parameters_with_t_style.capitalization = pascal_case
+dotnet_naming_style.prefix_type_parameters_with_t_style.required_prefix = T
+# disallowed_style - Anything that has this style applied is marked as disallowed
+dotnet_naming_style.disallowed_style.capitalization  = pascal_case
+dotnet_naming_style.disallowed_style.required_prefix = ____RULE_VIOLATION____
+dotnet_naming_style.disallowed_style.required_suffix = ____RULE_VIOLATION____
+# internal_error_style - This style should never occur... if it does, it indicates a bug in file or in the parser using the file
+dotnet_naming_style.internal_error_style.capitalization  = pascal_case
+dotnet_naming_style.internal_error_style.required_prefix = ____INTERNAL_ERROR____
+dotnet_naming_style.internal_error_style.required_suffix = ____INTERNAL_ERROR____
+
+##########################################
+# .NET Design Guideline Field Naming Rules
+# Naming rules for fields follow the .NET Framework design guidelines
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/index
+##########################################
+
+# All public/protected/protected_internal constant fields must be PascalCase
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/field
+dotnet_naming_symbols.public_protected_constant_fields_group.applicable_accessibilities = public, protected, protected_internal
+dotnet_naming_symbols.public_protected_constant_fields_group.required_modifiers         = const
+dotnet_naming_symbols.public_protected_constant_fields_group.applicable_kinds           = field
+dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.symbols    = public_protected_constant_fields_group
+dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.style      = pascal_case_style
+dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.severity   = warning
+
+# All public/protected/protected_internal static readonly fields must be PascalCase
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/field
+dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_accessibilities = public, protected, protected_internal
+dotnet_naming_symbols.public_protected_static_readonly_fields_group.required_modifiers         = static, readonly
+dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_kinds           = field
+dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.symbols    = public_protected_static_readonly_fields_group
+dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.style      = pascal_case_style
+dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.severity   = warning
+
+# No other public/protected/protected_internal fields are allowed
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/field
+dotnet_naming_symbols.other_public_protected_fields_group.applicable_accessibilities = public, protected, protected_internal
+dotnet_naming_symbols.other_public_protected_fields_group.applicable_kinds           = field
+dotnet_naming_rule.other_public_protected_fields_disallowed_rule.symbols             = other_public_protected_fields_group
+dotnet_naming_rule.other_public_protected_fields_disallowed_rule.style               = disallowed_style
+dotnet_naming_rule.other_public_protected_fields_disallowed_rule.severity            = error
+
+##########################################
+# StyleCop Field Naming Rules
+# Naming rules for fields follow the StyleCop analyzers
+# This does not override any rules using disallowed_style above
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers
+##########################################
+
+# All constant fields must be PascalCase
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1303.md
+dotnet_naming_symbols.stylecop_constant_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected, private
+dotnet_naming_symbols.stylecop_constant_fields_group.required_modifiers         = const
+dotnet_naming_symbols.stylecop_constant_fields_group.applicable_kinds           = field
+dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.symbols    = stylecop_constant_fields_group
+dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.style      = pascal_case_style
+dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.severity   = warning
+
+# All static readonly fields must be PascalCase
+# Ajusted to ignore private fields.
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1311.md
+dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
+dotnet_naming_symbols.stylecop_static_readonly_fields_group.required_modifiers         = static, readonly
+dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_kinds           = field
+dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.symbols    = stylecop_static_readonly_fields_group
+dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.style      = pascal_case_style
+dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.severity   = warning
+
+# No non-private instance fields are allowed
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1401.md
+dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
+dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_kinds           = field
+dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.symbols               = stylecop_fields_must_be_private_group
+dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.style                 = disallowed_style
+dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.severity              = error
+
+# Local variables must be camelCase
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1312.md
+dotnet_naming_symbols.stylecop_local_fields_group.applicable_accessibilities = local
+dotnet_naming_symbols.stylecop_local_fields_group.applicable_kinds           = local
+dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.symbols     = stylecop_local_fields_group
+dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.style       = camel_case_style
+dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.severity    = silent
+
+# This rule should never fire.  However, it's included for at least two purposes:
+# First, it helps to understand, reason about, and root-case certain types of issues, such as bugs in .editorconfig parsers.
+# Second, it helps to raise immediate awareness if a new field type is added (as occurred recently in C#).
+dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_accessibilities = *
+dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_kinds           = field
+dotnet_naming_rule.sanity_check_uncovered_field_case_rule.symbols  = sanity_check_uncovered_field_case_group
+dotnet_naming_rule.sanity_check_uncovered_field_case_rule.style    = internal_error_style
+dotnet_naming_rule.sanity_check_uncovered_field_case_rule.severity = error
+
+
+##########################################
+# Other Naming Rules
+##########################################
+
+# All of the following must be PascalCase:
+# - Namespaces
+#   https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-namespaces
+#   https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md
+# - Classes and Enumerations
+#   https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces
+#   https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md
+# - Delegates
+#   https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces#names-of-common-types
+# - Constructors, Properties, Events, Methods
+#   https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-type-members
+dotnet_naming_symbols.element_group.applicable_kinds = namespace, class, enum, struct, delegate, event, method, property
+dotnet_naming_rule.element_rule.symbols              = element_group
+dotnet_naming_rule.element_rule.style                = pascal_case_style
+dotnet_naming_rule.element_rule.severity             = warning
+
+# Interfaces use PascalCase and are prefixed with uppercase 'I'
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces
+dotnet_naming_symbols.interface_group.applicable_kinds = interface
+dotnet_naming_rule.interface_rule.symbols              = interface_group
+dotnet_naming_rule.interface_rule.style                = prefix_interface_with_i_style
+dotnet_naming_rule.interface_rule.severity             = warning
+
+# Generics Type Parameters use PascalCase and are prefixed with uppercase 'T'
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces
+dotnet_naming_symbols.type_parameter_group.applicable_kinds = type_parameter
+dotnet_naming_rule.type_parameter_rule.symbols              = type_parameter_group
+dotnet_naming_rule.type_parameter_rule.style                = prefix_type_parameters_with_t_style
+dotnet_naming_rule.type_parameter_rule.severity             = warning
+
+# Function parameters use camelCase
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/naming-parameters
+dotnet_naming_symbols.parameters_group.applicable_kinds = parameter
+dotnet_naming_rule.parameters_rule.symbols              = parameters_group
+dotnet_naming_rule.parameters_rule.style                = camel_case_style
+dotnet_naming_rule.parameters_rule.severity             = warning
+
+# Private static fields use camelCase and start with s_
+dotnet_naming_symbols.private_static_field_symbols.applicable_accessibilities                        = private
+dotnet_naming_symbols.private_static_field_symbols.required_modifiers                                = static, shared
+dotnet_naming_symbols.private_static_field_symbols.applicable_kinds                                  = field
+dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.symbols  = private_static_field_symbols
+dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.style    = camel_case_and_prefix_with_s_underscore_style
+dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.severity = warning
+dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.required_prefix                    = s_
+dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.capitalization                     = camel_case
+
+# Instance fields use camelCase and are prefixed with  '_'
+dotnet_naming_symbols.private_field_symbols.applicable_accessibilities                               = private
+dotnet_naming_symbols.private_field_symbols.applicable_kinds                                         = field
+dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.symbols  = private_field_symbols
+dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.style    = camel_case_and_prefix_with_underscore_style
+dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.severity = warning
+dotnet_naming_style.camel_case_and_prefix_with_underscore_style.required_prefix                      = _
+dotnet_naming_style.camel_case_and_prefix_with_underscore_style.capitalization                       = camel_case
+
+##########################################
+# License
+##########################################
+# The following applies as to the .editorconfig file ONLY, and is
+# included below for reference, per the requirements of the license
+# corresponding to this .editorconfig file.
+# See: https://github.com/RehanSaeed/EditorConfig
+#
+# MIT License
+#
+# Copyright (c) 2017-2019 Muhammad Rehan Saeed
+# Copyright (c) 2019 Henry Gabryjelski
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+##########################################

linting/codeanalysis.ruleset

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="CodeAnalysis" ToolsVersion="16.0">
+  <Rules AnalyzerId="Roslynator.CSharp.Analyzers" RuleNamespace="Roslynator.CSharp">
+    <Rule Id="RCS1090" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="SA1101" Action="None" />
+    <Rule Id="SA1200" Action="None" />
+    <Rule Id="SA1308" Action="None" />
+    <Rule Id="SA1309" Action="None" />
+    <Rule Id="SA1311" Action="None" />
+    <Rule Id="SA1402" Action="None" />
+    <Rule Id="SA1413" Action="None" />
+    <Rule Id="SA1611" Action="None" />
+    <Rule Id="SA1615" Action="None" />
+    <Rule Id="SA1629" Action="None" />
+  </Rules>
+</RuleSet>

linting/codeanalysis.tests.ruleset

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="CodeAnalysis.Tests" ToolsVersion="16.0">
+  <Include Path="codeanalysis.ruleset" Action="Default" />
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
+    <Rule Id="CS1591" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
+    <Rule Id="IDE0058" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="SA0001" Action="None" />
+    <Rule Id="SA1115" Action="None" />
+    <Rule Id="SA1201" Action="None" />
+    <Rule Id="SA1202" Action="None" />
+    <Rule Id="SA1203" Action="None" />
+    <Rule Id="SA1204" Action="None" />
+    <Rule Id="SA1310" Action="None" />
+    <Rule Id="SA1401" Action="None" />
+    <Rule Id="SA1600" Action="None" />
+    <Rule Id="SA1601" Action="None" />
+    <Rule Id="SA1602" Action="None" />
+    <Rule Id="SA1611" Action="None" />
+    <Rule Id="SA1618" Action="None" />
+    <Rule Id="SA1642" Action="None" />
+  </Rules>
+</RuleSet>

linting/stylecop.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
+  "settings": {
+    "orderingRules": {
+      "usingDirectivesPlacement": "outsideNamespace",
+      "elementOrder": [
+        "kind"
+      ]
+    },
+    "documentationRules": {
+      "xmlHeader": false,
+      "documentInternalElements": false,
+      "copyrightText": "Copyright (c) Umbraco.\nSee LICENSE for more details."
+    }
+  }
+}

src/.editorconfig

@@ -0,0 +1,447 @@
+# Version: 1.6.2 (Using https://semver.org/)
+# Updated: 2020-11-02
+# See https://github.com/RehanSaeed/EditorConfig/releases for release notes.
+# See https://github.com/RehanSaeed/EditorConfig for updates to this file.
+# See http://EditorConfig.org for more information about .editorconfig files.
+
+##########################################
+# Common Settings
+##########################################
+
+# This file is the top-most EditorConfig file
+root = true
+
+# All Files
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+##########################################
+# File Extension Settings
+##########################################
+
+# Visual Studio Solution Files
+[*.sln]
+indent_style = tab
+
+# Visual Studio XML Project Files
+[*.{csproj,vbproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# XML Configuration Files
+[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
+indent_size = 2
+
+# JSON Files
+[*.{json,json5,webmanifest}]
+indent_size = 2
+
+# YAML Files
+[*.{yml,yaml}]
+indent_size = 2
+
+# Markdown Files
+[*.md]
+trim_trailing_whitespace = false
+
+# Web Files
+[*.{htm,html,js,jsm,ts,tsx,css,sass,scss,less,svg,vue}]
+indent_size = 2
+
+# Batch Files
+[*.{cmd,bat}]
+end_of_line = crlf
+
+# Bash Files
+[*.sh]
+end_of_line = lf
+
+# Makefiles
+[Makefile]
+indent_style = tab
+
+##########################################
+# File Header (Uncomment to support file headers)
+# https://docs.microsoft.com/visualstudio/ide/reference/add-file-header
+##########################################
+
+# [*.{cs,csx,cake,vb,vbx}]
+file_header_template = Copyright (c) Umbraco.\nSee LICENSE for more details.
+
+# SA1636: File header copyright text should match
+# Justification: .editorconfig supports file headers. If this is changed to a value other than "none", a stylecop.json file will need to added to the project.
+# dotnet_diagnostic.SA1636.severity = none
+
+##########################################
+# .NET Language Conventions
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions
+##########################################
+
+# .NET Code Style Settings
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#net-code-style-settings
+[*.{cs,csx,cake,vb,vbx}]
+# "this." and "Me." qualifiers
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#this-and-me
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+# Language keywords instead of framework type names for type references
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#language-keywords
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+# Modifier preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#normalize-modifiers
+dotnet_style_require_accessibility_modifiers = always:warning
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:warning
+dotnet_style_readonly_field = true:warning
+# Parentheses preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parentheses-preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
+# Expression-level preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_explicit_tuple_names = true:warning
+dotnet_style_prefer_inferred_tuple_names = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = false:suggestion
+dotnet_style_prefer_conditional_expression_over_return = false:suggestion
+dotnet_style_prefer_compound_assignment = true:warning
+# Null-checking preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#null-checking-preferences
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+# Parameter preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#parameter-preferences
+dotnet_code_quality_unused_parameters = all:warning
+# More style options (Undocumented)
+# https://github.com/MicrosoftDocs/visualstudio-docs/issues/3641
+dotnet_style_operator_placement_when_wrapping = end_of_line
+# https://github.com/dotnet/roslyn/pull/40070
+dotnet_style_prefer_simplified_interpolation = true:warning
+
+# C# Code Style Settings
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-code-style-settings
+[*.{cs,csx,cake}]
+# Implicit and explicit types
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#implicit-and-explicit-types
+csharp_style_var_for_built_in_types = never
+csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_var_elsewhere = false:warning
+# Expression-bodied members
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-bodied-members
+csharp_style_expression_bodied_methods = true:warning
+csharp_style_expression_bodied_constructors = true:warning
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_lambdas = true:warning
+csharp_style_expression_bodied_local_functions = true:warning
+# Pattern matching
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#pattern-matching
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+# Inlined variable declarations
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#inlined-variable-declarations
+csharp_style_inlined_variable_declaration = true:warning
+# Expression-level preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-level-preferences
+csharp_prefer_simple_default_expression = true:warning
+# "Null" checking preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#c-null-checking-preferences
+csharp_style_throw_expression = true:warning
+csharp_style_conditional_delegate_call = true:warning
+# Code block preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#code-block-preferences
+csharp_prefer_braces = true:warning
+# Unused value preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#unused-value-preferences
+csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+# Index and range preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#index-and-range-preferences
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+# Miscellaneous preferences
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#miscellaneous-preferences
+csharp_style_deconstructed_variable_declaration = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+csharp_using_directive_placement = outside_namespace:warning
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:suggestion
+
+##########################################
+# .NET Formatting Conventions
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference#formatting-conventions
+##########################################
+
+# Organize usings
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#organize-using-directives
+dotnet_sort_system_directives_first = true
+# Newline options
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#new-line-options
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+# Indentation options
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#indentation-options
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = no_change
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents_when_block = false
+# Spacing options
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#spacing-options
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_after_comma = true
+csharp_space_before_comma = false
+csharp_space_after_dot = false
+csharp_space_before_dot = false
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_around_declaration_statements = false
+csharp_space_before_open_square_brackets = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_square_brackets = false
+# Wrapping options
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-formatting-conventions#wrap-options
+csharp_preserve_single_line_statements = false
+csharp_preserve_single_line_blocks = true
+
+##########################################
+# .NET Naming Conventions
+# https://docs.microsoft.com/visualstudio/ide/editorconfig-naming-conventions
+##########################################
+
+[*.{cs,csx,cake,vb,vbx}]
+
+##########################################
+# Styles
+##########################################
+
+# camel_case_style - Define the camelCase style
+dotnet_naming_style.camel_case_style.capitalization = camel_case
+# pascal_case_style - Define the PascalCase style
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+# first_upper_style - The first character must start with an upper-case character
+dotnet_naming_style.first_upper_style.capitalization = first_word_upper
+# prefix_interface_with_i_style - Interfaces must be PascalCase and the first character of an interface must be an 'I'
+dotnet_naming_style.prefix_interface_with_i_style.capitalization = pascal_case
+dotnet_naming_style.prefix_interface_with_i_style.required_prefix = I
+# prefix_type_parameters_with_t_style - Generic Type Parameters must be PascalCase and the first character must be a 'T'
+dotnet_naming_style.prefix_type_parameters_with_t_style.capitalization = pascal_case
+dotnet_naming_style.prefix_type_parameters_with_t_style.required_prefix = T
+# disallowed_style - Anything that has this style applied is marked as disallowed
+dotnet_naming_style.disallowed_style.capitalization  = pascal_case
+dotnet_naming_style.disallowed_style.required_prefix = ____RULE_VIOLATION____
+dotnet_naming_style.disallowed_style.required_suffix = ____RULE_VIOLATION____
+# internal_error_style - This style should never occur... if it does, it indicates a bug in file or in the parser using the file
+dotnet_naming_style.internal_error_style.capitalization  = pascal_case
+dotnet_naming_style.internal_error_style.required_prefix = ____INTERNAL_ERROR____
+dotnet_naming_style.internal_error_style.required_suffix = ____INTERNAL_ERROR____
+
+##########################################
+# .NET Design Guideline Field Naming Rules
+# Naming rules for fields follow the .NET Framework design guidelines
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/index
+##########################################
+
+# All public/protected/protected_internal constant fields must be PascalCase
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/field
+dotnet_naming_symbols.public_protected_constant_fields_group.applicable_accessibilities = public, protected, protected_internal
+dotnet_naming_symbols.public_protected_constant_fields_group.required_modifiers         = const
+dotnet_naming_symbols.public_protected_constant_fields_group.applicable_kinds           = field
+dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.symbols    = public_protected_constant_fields_group
+dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.style      = pascal_case_style
+dotnet_naming_rule.public_protected_constant_fields_must_be_pascal_case_rule.severity   = warning
+
+# All public/protected/protected_internal static readonly fields must be PascalCase
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/field
+dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_accessibilities = public, protected, protected_internal
+dotnet_naming_symbols.public_protected_static_readonly_fields_group.required_modifiers         = static, readonly
+dotnet_naming_symbols.public_protected_static_readonly_fields_group.applicable_kinds           = field
+dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.symbols    = public_protected_static_readonly_fields_group
+dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.style      = pascal_case_style
+dotnet_naming_rule.public_protected_static_readonly_fields_must_be_pascal_case_rule.severity   = warning
+
+# No other public/protected/protected_internal fields are allowed
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/field
+dotnet_naming_symbols.other_public_protected_fields_group.applicable_accessibilities = public, protected, protected_internal
+dotnet_naming_symbols.other_public_protected_fields_group.applicable_kinds           = field
+dotnet_naming_rule.other_public_protected_fields_disallowed_rule.symbols             = other_public_protected_fields_group
+dotnet_naming_rule.other_public_protected_fields_disallowed_rule.style               = disallowed_style
+dotnet_naming_rule.other_public_protected_fields_disallowed_rule.severity            = error
+
+##########################################
+# StyleCop Field Naming Rules
+# Naming rules for fields follow the StyleCop analyzers
+# This does not override any rules using disallowed_style above
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers
+##########################################
+
+# All constant fields must be PascalCase
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1303.md
+dotnet_naming_symbols.stylecop_constant_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected, private
+dotnet_naming_symbols.stylecop_constant_fields_group.required_modifiers         = const
+dotnet_naming_symbols.stylecop_constant_fields_group.applicable_kinds           = field
+dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.symbols    = stylecop_constant_fields_group
+dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.style      = pascal_case_style
+dotnet_naming_rule.stylecop_constant_fields_must_be_pascal_case_rule.severity   = warning
+
+# All static readonly fields must be PascalCase
+# Ajusted to ignore private fields.
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1311.md
+dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
+dotnet_naming_symbols.stylecop_static_readonly_fields_group.required_modifiers         = static, readonly
+dotnet_naming_symbols.stylecop_static_readonly_fields_group.applicable_kinds           = field
+dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.symbols    = stylecop_static_readonly_fields_group
+dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.style      = pascal_case_style
+dotnet_naming_rule.stylecop_static_readonly_fields_must_be_pascal_case_rule.severity   = warning
+
+# No non-private instance fields are allowed
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1401.md
+dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_accessibilities = public, internal, protected_internal, protected, private_protected
+dotnet_naming_symbols.stylecop_fields_must_be_private_group.applicable_kinds           = field
+dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.symbols               = stylecop_fields_must_be_private_group
+dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.style                 = disallowed_style
+dotnet_naming_rule.stylecop_instance_fields_must_be_private_rule.severity              = error
+
+# Local variables must be camelCase
+# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1312.md
+dotnet_naming_symbols.stylecop_local_fields_group.applicable_accessibilities = local
+dotnet_naming_symbols.stylecop_local_fields_group.applicable_kinds           = local
+dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.symbols     = stylecop_local_fields_group
+dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.style       = camel_case_style
+dotnet_naming_rule.stylecop_local_fields_must_be_camel_case_rule.severity    = silent
+
+# This rule should never fire.  However, it's included for at least two purposes:
+# First, it helps to understand, reason about, and root-case certain types of issues, such as bugs in .editorconfig parsers.
+# Second, it helps to raise immediate awareness if a new field type is added (as occurred recently in C#).
+dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_accessibilities = *
+dotnet_naming_symbols.sanity_check_uncovered_field_case_group.applicable_kinds           = field
+dotnet_naming_rule.sanity_check_uncovered_field_case_rule.symbols  = sanity_check_uncovered_field_case_group
+dotnet_naming_rule.sanity_check_uncovered_field_case_rule.style    = internal_error_style
+dotnet_naming_rule.sanity_check_uncovered_field_case_rule.severity = error
+
+
+##########################################
+# Other Naming Rules
+##########################################
+
+# All of the following must be PascalCase:
+# - Namespaces
+#   https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-namespaces
+#   https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md
+# - Classes and Enumerations
+#   https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces
+#   https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1300.md
+# - Delegates
+#   https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces#names-of-common-types
+# - Constructors, Properties, Events, Methods
+#   https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-type-members
+dotnet_naming_symbols.element_group.applicable_kinds = namespace, class, enum, struct, delegate, event, method, property
+dotnet_naming_rule.element_rule.symbols              = element_group
+dotnet_naming_rule.element_rule.style                = pascal_case_style
+dotnet_naming_rule.element_rule.severity             = warning
+
+# Interfaces use PascalCase and are prefixed with uppercase 'I'
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces
+dotnet_naming_symbols.interface_group.applicable_kinds = interface
+dotnet_naming_rule.interface_rule.symbols              = interface_group
+dotnet_naming_rule.interface_rule.style                = prefix_interface_with_i_style
+dotnet_naming_rule.interface_rule.severity             = warning
+
+# Generics Type Parameters use PascalCase and are prefixed with uppercase 'T'
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/names-of-classes-structs-and-interfaces
+dotnet_naming_symbols.type_parameter_group.applicable_kinds = type_parameter
+dotnet_naming_rule.type_parameter_rule.symbols              = type_parameter_group
+dotnet_naming_rule.type_parameter_rule.style                = prefix_type_parameters_with_t_style
+dotnet_naming_rule.type_parameter_rule.severity             = warning
+
+# Function parameters use camelCase
+# https://docs.microsoft.com/dotnet/standard/design-guidelines/naming-parameters
+dotnet_naming_symbols.parameters_group.applicable_kinds = parameter
+dotnet_naming_rule.parameters_rule.symbols              = parameters_group
+dotnet_naming_rule.parameters_rule.style                = camel_case_style
+dotnet_naming_rule.parameters_rule.severity             = warning
+
+# Private static fields use camelCase and start with s_
+dotnet_naming_symbols.private_static_field_symbols.applicable_accessibilities                        = private
+dotnet_naming_symbols.private_static_field_symbols.required_modifiers                                = static, shared
+dotnet_naming_symbols.private_static_field_symbols.applicable_kinds                                  = field
+dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.symbols  = private_static_field_symbols
+dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.style    = camel_case_and_prefix_with_s_underscore_style
+dotnet_naming_rule.private_static_fields_must_be_camel_cased_and_prefixed_with_s_underscore.severity = warning
+dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.required_prefix                    = s_
+dotnet_naming_style.camel_case_and_prefix_with_s_underscore_style.capitalization                     = camel_case
+
+# Instance fields use camelCase and are prefixed with  '_'
+dotnet_naming_symbols.private_field_symbols.applicable_accessibilities                               = private
+dotnet_naming_symbols.private_field_symbols.applicable_kinds                                         = field
+dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.symbols  = private_field_symbols
+dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.style    = camel_case_and_prefix_with_underscore_style
+dotnet_naming_rule.private_instance_fields_must_be_camel_cased_and_prefixed_with_underscore.severity = warning
+dotnet_naming_style.camel_case_and_prefix_with_underscore_style.required_prefix                      = _
+dotnet_naming_style.camel_case_and_prefix_with_underscore_style.capitalization                       = camel_case
+
+##########################################
+# License
+##########################################
+# The following applies as to the .editorconfig file ONLY, and is
+# included below for reference, per the requirements of the license
+# corresponding to this .editorconfig file.
+# See: https://github.com/RehanSaeed/EditorConfig
+#
+# MIT License
+#
+# Copyright (c) 2017-2019 Muhammad Rehan Saeed
+# Copyright (c) 2019 Henry Gabryjelski
+#
+# 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:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+##########################################

src/ApiDocs/docfx.filter.yml

@@ -1,10 +1,8 @@
 apiRules:
   - include:
-      uidRegex: ^Umbraco\.Core
-  - exclude:
-      uidRegex: ^umbraco\.Web\.org
+      uidRegex: ^Umbraco\.Cms
   - include:
-      uidRegex: ^Umbraco\.Web
+      uidRegex: ^Umbraco\.Extensions
   - exclude:
       hasAttribute:
       uid: System.ComponentModel.EditorBrowsableAttribute
@@ -13,6 +11,6 @@ apiRules:
   - exclude:
       uidRegex: ^umbraco\.
   - exclude:
-      uidRegex: ^CookComputing\.	  
+      uidRegex: ^CookComputing\.
   - exclude:
-      uidRegex: ^.*$
+      uidRegex: ^.*$

src/ApiDocs/docfx.json

@@ -2,15 +2,20 @@
   "metadata": [
     {
       "src": [
-        { 
+        {
           "src": "../",
           "files": [
-            "Umbraco.Core/Umbraco.Core.csproj",
-            "Umbraco.Web/Umbraco.Web.csproj"
+            "**/*.csproj",
+            "**/Umbraco.Infrastructure/**/*.cs"
           ],
           "exclude": [
             "**/obj/**",
-            "**/bin/**"
+            "**/bin/**",
+            "**/Umbraco.Web.csproj",
+            "**/Umbraco.Infrastructure.csproj",
+            "**/Umbraco.Web.UI.csproj",
+            "**/Umbraco.Web.UI.Netcore.csproj",
+            "**/**.Test**/*.csproj"
           ]
         }
       ],
@@ -53,7 +58,7 @@
       "_enableSearch": true,
       "_disableContribution": false
     },
-    "dest": "../../build.tmp/_site",
+    "dest": "_site",
     "template": [
       "default", "umbracotemplate"
     ]

src/ApiDocs/index.md

@@ -3,5 +3,9 @@
 
 ## Quick Links:
 
-### [Umbraco.Core](api/Umbraco.Core.html) docs
-### [Umbraco.Web](api/Umbraco.Web.html) docs
+### [Core](api/Umbraco.Cms.Core.html) docs
+### [Infrastructure](api/Umbraco.Cms.Infrastructure.html) docs
+### [Web](api/Umbraco.Cms.Web.Common.html) docs
+### [Extensions](api/Umbraco.Extensions.html) docs
+
+

src/ApiDocs/toc.yml

@@ -1,5 +1,9 @@
+- name: Core
+  href: api/Umbraco.Cms.Core.html
+- name: Infrastructure
+  href: api/Umbraco.Cms.Infrastructure.html
+- name: Web
+  href: api/Umbraco.Cms.Web.Common.html
+- name: Extensions
+  href: api/Umbraco.Extensions.html
 
-- name: Umbraco.Core Documentation
-  href: https://our.umbraco.com/apidocs/csharp/api/Umbraco.Core.html
-- name: Umbraco.Web Documentation
-  href: https://our.umbraco.com/apidocs/csharp/api/Umbraco.Web.html

src/ApiDocs/umbracotemplate/partials/navbar.tmpl.partial

@@ -9,7 +9,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-	  <a class="navbar-brand" href="/" alt="Our Umbraco"></a>
+	  <a class="navbar-brand" href="{{_rel}}" alt="Our Umbraco"></a>
     </div>
     <div class="collapse navbar-collapse" id="navbar">
       <form class="navbar-form navbar-right" role="search" id="search">

src/Directory.Build.props

@@ -0,0 +1,21 @@
+<Project>
+  <PropertyGroup>
+    <Version>9.0.0</Version>
+    <AssemblyVersion>9.0.0</AssemblyVersion>
+    <InformationalVersion>9.0.0-beta001</InformationalVersion>
+    <FileVersion>9.0.0</FileVersion>
+    <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Company>Umbraco CMS</Company>
+    <Copyright>Copyright © Umbraco 2021</Copyright>
+    <Authors>Umbraco HQ</Authors>
+    <PackageProjectUrl>https://umbraco.com/</PackageProjectUrl>
+    <PackageIconUrl>https://umbraco.com/dist/nuget/logo-small.png</PackageIconUrl>
+    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageTags>umbraco</PackageTags>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/umbraco/umbraco-cms</RepositoryUrl>
+  </PropertyGroup>
+</Project>
+

src/SolutionInfo.cs

@@ -1,22 +0,0 @@
-using System.Reflection;
-using System.Resources;
-
-[assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// versions
-// read https://stackoverflow.com/questions/64602/what-are-differences-between-assemblyversion-assemblyfileversion-and-assemblyin
-
-// note: do NOT change anything here manually, use the build scripts
-
-// this is the ONLY ONE the CLR cares about for compatibility
-// should change ONLY when "hard" breaking compatibility (manual change)
-[assembly: AssemblyVersion("8.0.0")]
-
-// these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.8.4")]
-[assembly: AssemblyInformationalVersion("8.8.4")]

src/Umbraco.Core/Actions/ActionAssignDomain.cs

@@ -1,8 +1,4 @@
-using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when a domain is being assigned to a document

src/Umbraco.Core/Actions/ActionBrowse.cs

@@ -1,8 +1,4 @@
-using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is used as a security constraint that grants a user the ability to view nodes in a tree

src/Umbraco.Core/Actions/ActionChangeDocType.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     // TODO: Add this back in when we support this functionality again
     ///// <summary>

src/Umbraco.Core/Actions/ActionCollection.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Cms.Core.Composing;
+using Umbraco.Cms.Core.Models.Membership;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Core.Actions
+{
+    public class ActionCollection : BuilderCollectionBase<IAction>
+    {
+        public ActionCollection(IEnumerable<IAction> items)
+            : base(items)
+        { }
+
+        public T GetAction<T>()
+            where T : IAction
+        {
+            return this.OfType<T>().FirstOrDefault();
+        }
+
+        public IEnumerable<IAction> GetByLetters(IEnumerable<string> letters)
+        {
+            var actions = this.ToArray(); // no worry: internally, it's already an array
+            return letters
+                .Where(x => x.Length == 1)
+                .Select(x => actions.FirstOrDefault(y => y.Letter == x[0]))
+                .WhereNotNull()
+                .ToList();
+        }
+
+        public IReadOnlyList<IAction> FromEntityPermission(EntityPermission entityPermission)
+        {
+            var actions = this.ToArray(); // no worry: internally, it's already an array
+            return entityPermission.AssignedPermissions
+                .Where(x => x.Length == 1)
+                .SelectMany(x => actions.Where(y => y.Letter == x[0]))
+                .WhereNotNull()
+                .ToList();
+        }
+    }
+}

src/Umbraco.Core/Actions/ActionCollectionBuilder.cs

@@ -1,14 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Composing;
-namespace Umbraco.Web.Actions
+using Umbraco.Cms.Core.Composing;
+
+namespace Umbraco.Cms.Core.Actions
 {
-    internal class ActionCollectionBuilder : LazyCollectionBuilderBase<ActionCollectionBuilder, ActionCollection, IAction>
+    public class ActionCollectionBuilder : LazyCollectionBuilderBase<ActionCollectionBuilder, ActionCollection, IAction>
     {
         protected override ActionCollectionBuilder This => this;
 
-        protected override IEnumerable<IAction> CreateItems(IFactory factory)
+        protected override IEnumerable<IAction> CreateItems(IServiceProvider factory)
         {
             var items = base.CreateItems(factory).ToList();
 

src/Umbraco.Core/Actions/ActionCopy.cs

@@ -1,13 +1,13 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when copying a document, media, member
     /// </summary>
     public class ActionCopy : IAction
     {
-        public char Letter => 'O';
+        public const char ActionLetter = 'O';
+
+        public char Letter => ActionLetter;
         public string Alias => "copy";
         public string Category => Constants.Conventions.PermissionCategories.StructureCategory;
         public string Icon => "documents";

src/Umbraco.Core/Actions/ActionCreateBlueprintFromContent.cs

@@ -1,8 +1,4 @@
-using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     public class ActionCreateBlueprintFromContent : IAction
     {

src/Umbraco.Core/Actions/ActionDelete.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when a document, media, member is deleted

src/Umbraco.Core/Actions/ActionMove.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked upon creation of a document, media, member

src/Umbraco.Core/Actions/ActionNew.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked upon creation of a document

src/Umbraco.Core/Actions/ActionProtect.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when a document is protected or unprotected

src/Umbraco.Core/Actions/ActionPublish.cs

@@ -1,8 +1,4 @@
-using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when a document is being published

src/Umbraco.Core/Actions/ActionRestore.cs

@@ -1,6 +1,6 @@
 
 
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when the content/media item is to be restored from the recycle bin

src/Umbraco.Core/Actions/ActionRights.cs

@@ -1,13 +1,13 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when rights are changed on a document
     /// </summary>
     public class ActionRights : IAction
     {
-        public char Letter => 'R';
+        public const char ActionLetter = 'R';
+
+        public char Letter => ActionLetter;
         public string Alias => "rights";
         public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
         public string Icon => "vcard";

src/Umbraco.Core/Actions/ActionRollback.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when copying a document is being rolled back

src/Umbraco.Core/Actions/ActionSort.cs

@@ -1,15 +1,13 @@
-using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when children to a document, media, member is being sorted
     /// </summary>
     public class ActionSort : IAction
     {
-        public char Letter => 'S';
+        public const char ActionLetter = 'S';
+
+        public char Letter => ActionLetter;
         public string Alias => "sort";
         public string Category => Constants.Conventions.PermissionCategories.StructureCategory;
         public string Icon => "navigation-vertical";

src/Umbraco.Core/Actions/ActionToPublish.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when children to a document is being sent to published (by an editor without publishrights)

src/Umbraco.Core/Actions/ActionUnpublish.cs

@@ -1,8 +1,4 @@
-using Umbraco.Core;
-using Umbraco.Core.CodeAnnotations;
-
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
 
     /// <summary>
@@ -10,7 +6,9 @@ namespace Umbraco.Web.Actions
     /// </summary>
     public class ActionUnpublish : IAction
     {
-        public char Letter => 'Z';
+        public const char ActionLetter = 'Z';
+
+        public char Letter => ActionLetter;
         public string Alias => "unpublish";
         public string Category => Constants.Conventions.PermissionCategories.ContentCategory;
         public string Icon => "circle-dotted";

src/Umbraco.Core/Actions/ActionUpdate.cs

@@ -1,6 +1,4 @@
-using Umbraco.Core;
-
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// This action is invoked when copying a document or media

src/Umbraco.Core/Actions/IAction.cs

@@ -1,6 +1,6 @@
-using Umbraco.Core.Composing;
+using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Web.Actions
+namespace Umbraco.Cms.Core.Actions
 {
     /// <summary>
     /// Defines a back office action that can be permission assigned or subscribed to for notifications

src/Umbraco.Core/AssemblyExtensions.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace Umbraco.Core
-{
-    internal static class AssemblyExtensions
-    {
-        /// <summary>
-        /// Returns the file used to load the assembly
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static FileInfo GetAssemblyFile(this Assembly assembly)
-        {
-            var codeBase = assembly.CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            return new FileInfo(path);
-        }
-
-        /// <summary>
-        /// Returns true if the assembly is the App_Code assembly
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static bool IsAppCodeAssembly(this Assembly assembly)
-        {
-            if (assembly.FullName.StartsWith("App_Code"))
-            {
-                try
-                {
-                    Assembly.Load("App_Code");
-                    return true;
-                }
-                catch (FileNotFoundException)
-                {
-                    //this will occur if it cannot load the assembly
-                    return false;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Returns true if the assembly is the compiled global asax.
-        /// </summary>
-        /// <param name="assembly"></param>
-        /// <returns></returns>
-        public static bool IsGlobalAsaxAssembly(this Assembly assembly)
-        {
-            //only way I can figure out how to test is by the name
-            return assembly.FullName.StartsWith("App_global.asax");
-        }
-
-        /// <summary>
-        ///  Returns the file used to load the assembly
-        /// </summary>
-        /// <param name="assemblyName"></param>
-        /// <returns></returns>
-        public static FileInfo GetAssemblyFile(this AssemblyName assemblyName)
-        {
-            var codeBase = assemblyName.CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            return new FileInfo(path);
-        }
-
-    }
-}

src/Umbraco.Core/Attempt.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core
+namespace Umbraco.Cms.Core
 {
     /// <summary>
     /// Provides ways to create attempts.

src/Umbraco.Core/AttemptOfTResult.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core
+namespace Umbraco.Cms.Core
 {
     /// <summary>
     /// Represents the result of an operation attempt.

src/Umbraco.Core/AttemptOfTResultTStatus.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Umbraco.Core
+namespace Umbraco.Cms.Core
 {
     /// <summary>
     /// Represents the result of an operation attempt.

src/Umbraco.Core/BindingRedirects.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Reflection;
-using System.Web;
-using Umbraco.Core;
-
-// no binding redirect for now = de-activate
-//[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")]
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Manages any assembly binding redirects that cannot be done via config (i.e. unsigned --> signed assemblies)
-    /// </summary>
-    public sealed class BindingRedirects
-    {
-        public static void Initialize()
-        {
-            // this only gets called when an assembly can't be resolved
-            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
-        }
-
-        /// <summary>
-        /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
-        {
-            // When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another.
-
-            // keep here for reference - we don't use AutoMapper
-            /*
-            //AutoMapper:
-            // this is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code.
-            // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
-            // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
-            if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null"))
-                return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
-            */
-
-            return null;
-        }
-    }
-}

src/Umbraco.Core/Cache/AppCacheExtensions.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Caching;
+using Umbraco.Cms.Core.Cache;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Extensions
 {
     /// <summary>
     /// Extensions for strongly typed access
@@ -15,11 +15,9 @@ namespace Umbraco.Core.Cache
             Func<T> getCacheItem,
             TimeSpan? timeout,
             bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
             string[] dependentFiles = null)
         {
-            var result = provider.Get(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            var result = provider.Get(cacheKey, () => getCacheItem(), timeout, isSliding, dependentFiles);
             return result == null ? default(T) : result.TryConvertTo<T>().Result;
         }
 
@@ -28,11 +26,9 @@ namespace Umbraco.Core.Cache
             Func<T> getCacheItem,
             TimeSpan? timeout = null,
             bool isSliding = false,
-            CacheItemPriority priority = CacheItemPriority.Normal,
-            CacheItemRemovedCallback removedCallback = null,
             string[] dependentFiles = null)
         {
-            provider.Insert(cacheKey, () => getCacheItem(), timeout, isSliding, priority, removedCallback, dependentFiles);
+            provider.Insert(cacheKey, () => getCacheItem(), timeout, isSliding, dependentFiles);
         }
 
         public static IEnumerable<T> GetCacheItemsByKeySearch<T>(this IAppCache provider, string keyStartsWith)

src/Umbraco.Core/Cache/AppCaches.cs

@@ -1,36 +1,18 @@
 using System;
-using System.Web;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Represents the application caches.
     /// </summary>
     public class AppCaches
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppCaches"/> for use in a web application.
-        /// </summary>
-        public AppCaches()
-            : this(HttpRuntime.Cache)
-        { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AppCaches"/> for use in a web application.
-        /// </summary>
-        public AppCaches(System.Web.Caching.Cache cache)
-            : this(
-                new WebCachingAppCache(cache),
-                new HttpRequestAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache()))
-        { }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="AppCaches"/> with cache providers.
         /// </summary>
         public AppCaches(
             IAppPolicyCache runtimeCache,
-            IAppCache requestCache,
+            IRequestCache requestCache,
             IsolatedCaches isolatedCaches)
         {
             RuntimeCache = runtimeCache ?? throw new ArgumentNullException(nameof(runtimeCache));
@@ -63,7 +45,7 @@ namespace Umbraco.Core.Cache
         /// <para>The per-request caches works on top of the current HttpContext items.</para>
         /// <para>Outside a web environment, the behavior of that cache is unspecified.</para>
         /// </remarks>
-        public IAppCache RequestCache { get; }
+        public IRequestCache RequestCache { get; }
 
         /// <summary>
         /// Gets the runtime cache.
@@ -82,5 +64,13 @@ namespace Umbraco.Core.Cache
         /// search through all keys on a global scale.</para>
         /// </remarks>
         public IsolatedCaches IsolatedCaches { get; }
+
+        public static AppCaches Create(IRequestCache requestCache)
+        {
+            return new AppCaches(
+                new DeepCloneAppCache(new ObjectCacheAppCache()),
+                requestCache,
+                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
+        }
     }
 }

src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Provides a base class for implementing a dictionary of <see cref="IAppPolicyCache"/>.
@@ -17,24 +17,24 @@ namespace Umbraco.Core.Cache
         /// <param name="cacheFactory"></param>
         protected AppPolicedCacheDictionary(Func<TKey, IAppPolicyCache> cacheFactory)
         {
-            CacheFactory = cacheFactory;
+            _cacheFactory = cacheFactory;
         }
 
         /// <summary>
         /// Gets the internal cache factory, for tests only!
         /// </summary>
-        internal readonly Func<TKey, IAppPolicyCache> CacheFactory;
+        private readonly Func<TKey, IAppPolicyCache> _cacheFactory;
 
         /// <summary>
         /// Gets or creates a cache.
         /// </summary>
         public IAppPolicyCache GetOrCreate(TKey key)
-            => _caches.GetOrAdd(key, k => CacheFactory(k));
+            => _caches.GetOrAdd(key, k => _cacheFactory(k));
 
         /// <summary>
         /// Tries to get a cache.
         /// </summary>
-        public Attempt<IAppPolicyCache> Get(TKey key)
+        protected Attempt<IAppPolicyCache> Get(TKey key)
             => _caches.TryGetValue(key, out var cache) ? Attempt.Succeed(cache) : Attempt.Fail<IAppPolicyCache>();
 
         /// <summary>
@@ -56,7 +56,7 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Clears a cache.
         /// </summary>
-        public void ClearCache(TKey key)
+        protected void ClearCache(TKey key)
         {
             if (_caches.TryGetValue(key, out var cache))
                 cache.Clear();
@@ -71,4 +71,4 @@ namespace Umbraco.Core.Cache
                 cache.Clear();
         }
     }
-}
+}

src/Umbraco.Core/Cache/ApplicationCacheRefresher.cs

@@ -0,0 +1,45 @@
+using System;
+using Umbraco.Cms.Core.Events;
+
+namespace Umbraco.Cms.Core.Cache
+{
+    public sealed class ApplicationCacheRefresher : CacheRefresherBase<ApplicationCacheRefresherNotification>
+    {
+        public ApplicationCacheRefresher(AppCaches appCaches, IEventAggregator eventAggregator, ICacheRefresherNotificationFactory factory)
+            : base(appCaches, eventAggregator, factory)
+        {
+        }
+
+        #region Define
+
+        public static readonly Guid UniqueId = Guid.Parse("B15F34A1-BC1D-4F8B-8369-3222728AB4C8");
+
+        public override Guid RefresherUniqueId => UniqueId;
+
+        public override string Name => "Application Cache Refresher";
+
+        #endregion
+
+        #region Refresher
+
+        public override void RefreshAll()
+        {
+            AppCaches.RuntimeCache.Clear(CacheKeys.ApplicationsCacheKey);
+            base.RefreshAll();
+        }
+
+        public override void Refresh(int id)
+        {
+            Remove(id);
+            base.Refresh(id);
+        }
+
+        public override void Remove(int id)
+        {
+            AppCaches.RuntimeCache.Clear(CacheKeys.ApplicationsCacheKey);
+            base.Remove(id);
+        }
+
+        #endregion
+    }
+}

src/Umbraco.Core/Cache/ApplicationCacheRefresherNotification.cs

@@ -0,0 +1,11 @@
+using Umbraco.Cms.Core.Sync;
+
+namespace Umbraco.Cms.Core.Cache
+{
+    public class ApplicationCacheRefresherNotification : CacheRefresherNotification
+    {
+        public ApplicationCacheRefresherNotification(object messageObject, MessageType messageType) : base(messageObject, messageType)
+        {
+        }
+    }
+}

src/Umbraco.Core/Cache/CacheKeys.cs

@@ -1,4 +1,4 @@
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// Constants storing cache keys used in caching
@@ -12,5 +12,15 @@
 
         public const string MacroContentCacheKey = "macroContent_"; // used in MacroRenderers
         public const string MacroFromAliasCacheKey = "macroFromAlias_";
+
+        public const string UserGroupGetByAliasCacheKeyPrefix = "UserGroupRepository_GetByAlias_";
+
+        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";
     }
 }

src/Umbraco.Core/Cache/CacheRefresherBase.cs

@@ -1,42 +1,31 @@
-using System;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models.Entities;
-using Umbraco.Core.Sync;
+using System;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Sync;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     /// <summary>
     /// A base class for cache refreshers that handles events.
     /// </summary>
     /// <typeparam name="TInstanceType">The actual cache refresher type.</typeparam>
     /// <remarks>The actual cache refresher type is used for strongly typed events.</remarks>
-    public abstract class CacheRefresherBase<TInstanceType> : ICacheRefresher
-        where TInstanceType : class, ICacheRefresher
+    public abstract class CacheRefresherBase<TNotification> : ICacheRefresher
+        where TNotification : CacheRefresherNotification
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CacheRefresherBase{TInstanceType}"/>.
         /// </summary>
         /// <param name="appCaches">A cache helper.</param>
-        protected CacheRefresherBase(AppCaches appCaches)
+        protected CacheRefresherBase(AppCaches appCaches, IEventAggregator eventAggregator, ICacheRefresherNotificationFactory factory)
         {
             AppCaches = appCaches;
+            EventAggregator = eventAggregator;
+            NotificationFactory = factory;
         }
 
-        /// <summary>
-        /// Triggers when the cache is updated on the server.
-        /// </summary>
-        /// <remarks>
-        /// Triggers on each server configured for an Umbraco project whenever a cache refresher is updated.
-        /// </remarks>
-        public static event TypedEventHandler<TInstanceType, CacheRefresherEventArgs> CacheUpdated;
-
         #region Define
 
-        /// <summary>
-        /// Gets the typed 'this' for events.
-        /// </summary>
-        protected abstract TInstanceType This { get; }
-
         /// <summary>
         /// Gets the unique identifier of the refresher.
         /// </summary>
@@ -47,6 +36,11 @@ namespace Umbraco.Core.Cache
         /// </summary>
         public abstract string Name { get; }
 
+        /// <summary>
+        /// Gets the <see cref="TNotificationFactory"/> for <see cref="TNotification"/>
+        /// </summary>
+        protected ICacheRefresherNotificationFactory NotificationFactory { get; }
+
         #endregion
 
         #region Refresher
@@ -56,7 +50,12 @@ namespace Umbraco.Core.Cache
         /// </summary>
         public virtual void RefreshAll()
         {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(null, MessageType.RefreshAll));
+            // NOTE: We pass in string.Empty here because if we pass in NULL this causes problems with
+            // the underlying ActivatorUtilities.CreateInstance which doesn't seem to support passing in
+            // null to an 'object' parameter and we end up with "A suitable constructor for type 'ZYZ' could not be located."
+            // In this case, all cache refreshers should be checking for the type first before checking for a msg value
+            // so this shouldn't cause any issues.
+            OnCacheUpdated(NotificationFactory.Create<TNotification>(string.Empty, MessageType.RefreshAll));
         }
 
         /// <summary>
@@ -65,7 +64,7 @@ namespace Umbraco.Core.Cache
         /// <param name="id">The entity's identifier.</param>
         public virtual void Refresh(int id)
         {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RefreshById));
+            OnCacheUpdated(NotificationFactory.Create<TNotification>(id, MessageType.RefreshById));
         }
 
         /// <summary>
@@ -74,7 +73,7 @@ namespace Umbraco.Core.Cache
         /// <param name="id">The entity's identifier.</param>
         public virtual void Refresh(Guid id)
         {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RefreshById));
+            OnCacheUpdated(NotificationFactory.Create<TNotification>(id, MessageType.RefreshById));
         }
 
         /// <summary>
@@ -83,7 +82,7 @@ namespace Umbraco.Core.Cache
         /// <param name="id">The entity's identifier.</param>
         public virtual void Remove(int id)
         {
-            OnCacheUpdated(This, new CacheRefresherEventArgs(id, MessageType.RemoveById));
+            OnCacheUpdated(NotificationFactory.Create<TNotification>(id, MessageType.RemoveById));
         }
 
         #endregion
@@ -95,6 +94,8 @@ namespace Umbraco.Core.Cache
         /// </summary>
         protected AppCaches AppCaches { get; }
 
+        protected IEventAggregator EventAggregator { get; }
+
         /// <summary>
         /// Clears the cache for all repository entities of a specified type.
         /// </summary>
@@ -110,9 +111,9 @@ namespace Umbraco.Core.Cache
         /// </summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="args">The event arguments.</param>
-        protected static void OnCacheUpdated(TInstanceType sender, CacheRefresherEventArgs args)
+        protected void OnCacheUpdated(CacheRefresherNotification notification)
         {
-            CacheUpdated?.Invoke(sender, args);
+            EventAggregator.Publish(notification);
         }
 
         #endregion

src/Umbraco.Core/Cache/CacheRefresherCollection.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Umbraco.Core.Composing;
+using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     public class CacheRefresherCollection : BuilderCollectionBase<ICacheRefresher>
     {

src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs

@@ -1,6 +1,6 @@
-using Umbraco.Core.Composing;
+using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Cms.Core.Cache
 {
     public class CacheRefresherCollectionBuilder : LazyCollectionBuilderBase<CacheRefresherCollectionBuilder, CacheRefresherCollection, ICacheRefresher>
     {

src/Umbraco.Core/Cache/CacheRefresherEventArgs.cs

@@ -1,19 +0,0 @@
-using System;
-using Umbraco.Core.Sync;
-
-namespace Umbraco.Core.Cache
-{
-    /// <summary>
-    /// Event args for cache refresher updates
-    /// </summary>
-    public class CacheRefresherEventArgs : EventArgs
-    {
-        public CacheRefresherEventArgs(object msgObject, MessageType type)
-        {
-            MessageType = type;
-            MessageObject = msgObject;
-        }
-        public object MessageObject { get; private set; }
-        public MessageType MessageType { get; private set; }
-    }
-}

src/Umbraco.Core/Cache/CacheRefresherNotification.cs

@@ -0,0 +1,22 @@
+using System;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Sync;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Core.Cache
+{
+    /// <summary>
+    /// Base class for cache refresher notifications
+    /// </summary>
+    public abstract class CacheRefresherNotification : INotification
+    {
+        public CacheRefresherNotification(object messageObject, MessageType messageType)
+        {
+            MessageObject = messageObject ?? throw new ArgumentNullException(nameof(messageObject));
+            MessageType = messageType;
+        }
+
+        public object MessageObject { get; }
+        public MessageType MessageType { get; }
+    }
+}

src/Umbraco.Core/Cache/CacheRefresherNotificationFactory.cs

@@ -0,0 +1,23 @@
+using System;
+using Umbraco.Extensions;
+using Umbraco.Cms.Core.Sync;
+
+namespace Umbraco.Cms.Core.Cache
+{
+    /// <summary>
+    /// A <see cref="ICacheRefresherNotificationFactory"/> that uses ActivatorUtilities to create the <see cref="CacheRefresherNotification"/> instances
+    /// </summary>
+    public sealed class CacheRefresherNotificationFactory : ICacheRefresherNotificationFactory
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public CacheRefresherNotificationFactory(IServiceProvider serviceProvider) => _serviceProvider = serviceProvider;
+
+        /// <summary>
+        /// Create a <see cref="CacheRefresherNotification"/> using ActivatorUtilities
+        /// </summary>
+        /// <typeparam name="TNotification">The <see cref="CacheRefresherNotification"/> to create</typeparam>
+        public TNotification Create<TNotification>(object msgObject, MessageType type) where TNotification : CacheRefresherNotification
+            => _serviceProvider.CreateInstance<TNotification>(new object[] { msgObject, type });
+    }
+}

src/Umbraco.Core/Cache/ContentCacheRefresher.cs

@@ -1,38 +1,40 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Core;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.Repositories;
-using Umbraco.Core.Persistence.Repositories.Implement;
-using Umbraco.Core.Services;
-using Umbraco.Core.Services.Changes;
-using Umbraco.Web.Composing;
-using Umbraco.Web.PublishedCache;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Persistence.Repositories;
+using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Core.Serialization;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.Changes;
+using Umbraco.Extensions;
 
-namespace Umbraco.Web.Cache
+namespace Umbraco.Cms.Core.Cache
 {
-    public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCacheRefresher, ContentCacheRefresher.JsonPayload>
+    public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCacheRefresherNotification, ContentCacheRefresher.JsonPayload>
     {
         private readonly IPublishedSnapshotService _publishedSnapshotService;
-        private readonly IdkMap _idkMap;
+        private readonly IIdKeyMap _idKeyMap;
         private readonly IDomainService _domainService;
 
-        public ContentCacheRefresher(AppCaches appCaches, IPublishedSnapshotService publishedSnapshotService, IdkMap idkMap, IDomainService domainService)
-            : base(appCaches)
+        public ContentCacheRefresher(
+            AppCaches appCaches,
+            IJsonSerializer serializer,
+            IPublishedSnapshotService publishedSnapshotService,
+            IIdKeyMap idKeyMap,
+            IDomainService domainService,
+            IEventAggregator eventAggregator,
+            ICacheRefresherNotificationFactory factory)
+            : base(appCaches, serializer, eventAggregator, factory)
         {
             _publishedSnapshotService = publishedSnapshotService;
-            _idkMap = idkMap;
+            _idKeyMap = idKeyMap;
             _domainService = domainService;
         }
 
         #region Define
 
-        protected override ContentCacheRefresher This => this;
-
         public static readonly Guid UniqueId = Guid.Parse("900A4FBE-DF3C-41E6-BB77-BE896CD158EA");
 
         public override Guid RefresherUniqueId => UniqueId;
@@ -46,6 +48,7 @@ namespace Umbraco.Web.Cache
         public override void Refresh(JsonPayload[] payloads)
         {
             AppCaches.RuntimeCache.ClearOfType<PublicAccessEntry>();
+            AppCaches.RuntimeCache.ClearByKey(CacheKeys.ContentRecycleBinCacheKey);
 
             var idsRemoved = new HashSet<int>();
             var isolatedCache = AppCaches.IsolatedCaches.GetOrCreate<IContent>();
@@ -53,11 +56,11 @@ namespace Umbraco.Web.Cache
             foreach (var payload in payloads.Where(x => x.Id != default))
             {
                 //By INT Id
-                isolatedCache.Clear(RepositoryCacheKeys.GetKey<IContent>(payload.Id));
+                isolatedCache.Clear(RepositoryCacheKeys.GetKey<IContent, int>(payload.Id));
                 //By GUID Key
-                isolatedCache.Clear(RepositoryCacheKeys.GetKey<IContent>(payload.Key));
+                isolatedCache.Clear(RepositoryCacheKeys.GetKey<IContent, Guid?>(payload.Key));
 
-                _idkMap.ClearCache(payload.Id);
+                _idKeyMap.ClearCache(payload.Id);
 
                 // remove those that are in the branch
                 if (payload.ChangeTypes.HasTypesAny(TreeChangeTypes.RefreshBranch | TreeChangeTypes.Remove))
@@ -140,14 +143,6 @@ namespace Umbraco.Web.Cache
 
         public class JsonPayload
         {
-            [Obsolete("Use the constructor specifying a GUID instead, using this constructor will result in not refreshing all caches")]
-            public JsonPayload(int id, TreeChangeTypes changeTypes)
-            {
-                Id = id;
-                ChangeTypes = changeTypes;
-            }
-
-            [JsonConstructor]
             public JsonPayload(int id, Guid? key, TreeChangeTypes changeTypes)
             {
                 Id = id;

src/Umbraco.Core/Cache/ContentCacheRefresherNotification.cs

@@ -0,0 +1,11 @@
+using Umbraco.Cms.Core.Sync;
+
+namespace Umbraco.Cms.Core.Cache
+{
+    public class ContentCacheRefresherNotification : CacheRefresherNotification
+    {
+        public ContentCacheRefresherNotification(object messageObject, MessageType messageType) : base(messageObject, messageType)
+        {
+        }
+    }
+}