Merge branch 'release/10.8.11' into v10/dev

# Conflicts:
#	version.json

.artifactignore

@@ -0,0 +1,3 @@
+**/*
+!**/bin/**
+!**/obj/**

.devcontainer/Dockerfile

@@ -1,36 +1,15 @@
-# [Choice] .NET Core version: 5.0, 3.1, 2.1
-ARG VARIANT=3.1
-FROM mcr.microsoft.com/vscode/devcontainers/dotnetcore:0-${VARIANT}
+# [Choice] .NET version: 6.0, 3.1, 6.0-bullseye, 3.1-bullseye, 6.0-focal, 3.1-focal
+ARG VARIANT=6.0-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
 
-# [Option] Install Node.js
-ARG INSTALL_NODE="true"
-ARG NODE_VERSION="lts/*"
-RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# [Option] Install Azure CLI
-ARG INSTALL_AZURE_CLI="false"
-COPY library-scripts/azcli-debian.sh /tmp/library-scripts/
-RUN if [ "$INSTALL_AZURE_CLI" = "true" ]; then bash /tmp/library-scripts/azcli-debian.sh; fi \
-    && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
-
-# Install SQL Tools: SQLPackage and sqlcmd
-COPY mssql/installSQLtools.sh installSQLtools.sh
-RUN bash ./installSQLtools.sh \
-     && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
-
-# Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then groupmod --gid $USER_GID vscode && usermod --uid $USER_UID --gid $USER_GID vscode; fi
+# [Choice] Node.js version: none, lts/*, 18, 16, 14
+ARG NODE_VERSION="none"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
 
 # [Optional] Uncomment this section to install additional OS packages.
-# Following added by Warren...
-# Needed to add as Gifsicle used by gulp-imagemin does not ship a Linux binary and has to be compiled from source
-# And this Linux package is needed in order to build it
-# https://github.com/imagemin/imagemin-gifsicle/issues/40#issuecomment-616487214
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends dh-autoreconf chromium-browser
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
 
 # [Optional] Uncomment this line to install global node packages.
 # RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
@@ -42,7 +21,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # Needing to set unsafe-perm as root is the user setup
 # https://docs.npmjs.com/cli/v6/using-npm/config#unsafe-perm
 # Default: false if running as root, true otherwise (we are ROOT)
-RUN npm -g config set user vscode && npm -g config set unsafe-perm
+#RUN npm -g config set user vscode && npm -g config set unsafe-perm
 
 # Generate and trust a local developer certificate for Kestrel
 # This is needed for Kestrel to bind on https

.devcontainer/devcontainer.json

@@ -1,41 +1,25 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.158.0/containers/dotnet-mssql
+// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
 {
-	"name": "C# (.NET) and MS SQL",
+	"name": "C# (.NET) Umbraco & SMTP4Dev",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "app",
 	"workspaceFolder": "/workspace",
-
+	
 	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash",
-		"mssql.connections": [
-			{
-				"server": "localhost,1433",
-				"database": "",
-				"authenticationType": "SqlLogin",
-				"user": "sa",
-				"password": "P@ssw0rd",
-				"emptyPasswordInput": false,
-				"savePassword": false,
-				"profileName": "mssql-container"
-			}
-		],
-		"omnisharp.defaultLaunchSolution": "umbraco-netcore-only.sln",
+	"settings": {		
+		"omnisharp.defaultLaunchSolution": "umbraco.sln",
 		"omnisharp.enableDecompilationSupport": true,
 		"omnisharp.enableRoslynAnalyzers": true
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-		"ms-dotnettools.csharp",
-		"ms-mssql.mssql"
+		"ms-dotnettools.csharp"
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// 1433 for SQL if you want to connect from local into the one running inside the container
-	// Can connect to the SQL Server running in the image on local with 'host.docker.internal' as hostname
-	"forwardPorts": [1433, 9000, 5000, 25],
+	"forwardPorts": [9000, 5000, 25]
 
 	// [Optional] To reuse of your local HTTPS dev cert:
 	//
@@ -56,6 +40,4 @@
 	//      2. Drag ~/.aspnet/https/aspnetapp.pfx into the root of the file explorer
 	//      3. Open a terminal in VS Code and run "mkdir -p /home/vscode/.aspnet/https && mv aspnetapp.pfx /home/vscode/.aspnet/https"
 
-	// postCreateCommand.sh parameters: $1=SA password, $2=dacpac path, $3=sql script(s) path
-	"postCreateCommand": "bash .devcontainer/mssql/postCreateCommand.sh 'P@ssw0rd' './bin/Debug/' './.devcontainer/mssql/'"	
 }

.devcontainer/docker-compose.yml

@@ -6,15 +6,10 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        # [Choice] Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
-        VARIANT: 5.0
+        # [Choice] .NET version: 6.0, 3.1, 6.0-bullseye, 3.1-bullseye, 6.0-focal, 3.1-focal
+        VARIANT: 6.0-bullseye
         # Options
-        INSTALL_NODE: "true"
         NODE_VERSION: "lts/*"
-        INSTALL_AZURE_CLI: "false"
-        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
-        USER_UID: 1000
-        USER_GID: 1000
 
     volumes:
       - ..:/workspace:cached
@@ -22,9 +17,6 @@ services:
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-    network_mode: service:db
-
     # Uncomment the next line to use a non-root user for all processes.
     # user: vscode
 
@@ -34,7 +26,8 @@ services:
     # DotNetCore ENV Variables
     # https://docs.microsoft.com/en-us/aspnet/core/fundamentals/configuration/?view=aspnetcore-5.0#environment-variables
     environment:
-    - ConnectionStrings__umbracoDbDSN=server=localhost;database=UmbracoUnicore;user id=sa;password='P@ssw0rd'
+    - ConnectionStrings__umbracoDbDSN=Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True
+    - ConnectionStrings__umbracoDbDSN_ProviderName=Microsoft.Data.Sqlite
     - Umbraco__CMS__Unattended__InstallUnattended=true
     - Umbraco__CMS__Unattended__UnattendedUserName=Admin
     - Umbraco__CMS__Unattended__UnattendedUserEmail=test@umbraco.com
@@ -43,16 +36,6 @@ services:
     - Umbraco__CMS__Global__Smtp__Port=25
     - Umbraco__CMS__Global__Smtp__From=noreply@umbraco.test
 
-  db:
-    image: mcr.microsoft.com/mssql/server:2019-latest
-    restart: unless-stopped
-    environment:
-      SA_PASSWORD: P@ssw0rd
-      ACCEPT_EULA: Y
-
-    # Add "forwardPorts": ["1433"] to **devcontainer.json** to forward MSSQL locally.
-    # (Adding the "ports" property to this file will not forward from a Codespace.)
-
   smtp4dev:
     image: rnwood/smtp4dev:v3
     restart: always

.devcontainer/library-scripts/azcli-debian.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-#
-# Docs: https://github.com/microsoft/vscode-dev-containers/blob/master/script-library/docs/azcli.md
-#
-# Syntax: ./azcli-debian.sh
-
-set -e
-
-if [ "$(id -u)" -ne 0 ]; then
-    echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
-    exit 1
-fi
-
-export DEBIAN_FRONTEND=noninteractive
-
-# Install curl, apt-transport-https, lsb-release, or gpg if missing
-if ! dpkg -s apt-transport-https curl ca-certificates lsb-release > /dev/null 2>&1 || ! type gpg > /dev/null 2>&1; then
-    if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then
-        apt-get update
-    fi
-    apt-get -y install --no-install-recommends apt-transport-https curl ca-certificates lsb-release gnupg2 
-fi
-
-# Install the Azure CLI
-echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list
-curl -sL https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT)
-apt-get update
-apt-get install -y azure-cli
-echo "Done!"

.devcontainer/mssql/BlankDb.sql

@@ -1,11 +0,0 @@
-/*
-    This will generate a blank database when the container is spun up
-    that you can use to connect to for the SQL configuration in the web installer flow
-
-    ---- NOTE ----
-    Any .sql files in this folder will be executed 
-    Along with any .dacpac will be restored as databases 
-    See postCreateCommand.sh for specifics 
-*/
-CREATE DATABASE UmbracoUnicore;
-GO

.devcontainer/mssql/installSQLtools.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-set -echo
-echo "Installing mssql-tools"
-curl -sSL https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT)
-DISTRO=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
-CODENAME=$(lsb_release -cs)
-echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-${DISTRO}-${CODENAME}-prod ${CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
-apt-get update
-ACCEPT_EULA=Y apt-get -y install unixodbc-dev msodbcsql17 libunwind8 mssql-tools
-
-echo "Installing sqlpackage"
-curl -sSL -o sqlpackage.zip "https://aka.ms/sqlpackage-linux"
-mkdir /opt/sqlpackage
-unzip sqlpackage.zip -d /opt/sqlpackage 
-rm sqlpackage.zip
-chmod a+x /opt/sqlpackage/sqlpackage

.devcontainer/mssql/postCreateCommand.sh

@@ -1,64 +0,0 @@
-#!/bin/bash
-dacpac="false"
-sqlfiles="false"
-SApassword=$1
-dacpath=$2
-sqlpath=$3
-
-echo "SELECT * FROM SYS.DATABASES" | dd of=testsqlconnection.sql
-for i in {1..60};
-do
-    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SApassword -d master -i testsqlconnection.sql > /dev/null
-    if [ $? -eq 0 ]
-    then
-        echo "SQL server ready"
-        break
-    else
-        echo "Not ready yet..."
-        sleep 1
-    fi
-done
-rm testsqlconnection.sql
-
-for f in $dacpath/*
-do
-    if [ $f == $dacpath/*".dacpac" ]
-    then
-        dacpac="true"
-        echo "Found dacpac $f"
-    fi
-done
-
-for f in $sqlpath/*
-do
-    if [ $f == $sqlpath/*".sql" ]
-    then
-        sqlfiles="true"
-        echo "Found SQL file $f"
-    fi
-done
-
-if [ $sqlfiles == "true" ]
-then
-    for f in $sqlpath/*
-    do
-        if [ $f == $sqlpath/*".sql" ]
-        then
-            echo "Executing $f"
-            /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SApassword -d master -i $f
-        fi
-    done
-fi
-
-if [ $dacpac == "true" ] 
-then
-    for f in $dacpath/*
-    do
-        if [ $f == $dacpath/*".dacpac" ]
-        then
-            dbname=$(basename $f ".dacpac")
-            echo "Deploying dacpac $f"
-            /opt/sqlpackage/sqlpackage /Action:Publish /SourceFile:$f /TargetServerName:localhost /TargetDatabaseName:$dbname /TargetUser:sa /TargetPassword:$SApassword
-        fi
-    done
-fi

.editorconfig

@@ -282,7 +282,7 @@ dotnet_naming_style.internal_error_style.required_suffix = ____INTERNAL_ERROR___
 
 # 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.applicable_accessibilities = public, protected, protected_internal, internal, private
 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
@@ -356,24 +356,13 @@ 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
+dotnet_naming_rule.instance_fields_should_be_camel_case.severity = warning
+dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
+dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
+dotnet_naming_symbols.instance_fields.applicable_kinds = field
+dotnet_naming_style.instance_field_style.capitalization = camel_case
+dotnet_naming_style.instance_field_style.required_prefix = _
 
 ##########################################
 # License
@@ -408,4 +397,4 @@ dotnet_naming_style.camel_case_and_prefix_with_underscore_style.capitalization
 # 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.
-##########################################
+##########################################

.github/BUILD.md

@@ -1,33 +1,99 @@
-# Umbraco CMS Build
+# Umbraco CMS Build
 
 ## Are you sure?
 
 In order to use Umbraco as a CMS and build your website with it, you should not build it yourself. If you're reading this then you're trying to contribute to Umbraco or you're debugging a complex issue.
 
-- Are you about to create a pull request for Umbraco?
+- Are you about to [create a pull request for Umbraco][contribution guidelines]?
 - Are you trying to get to the bottom of a problem in your existing Umbraco installation?
 
 If the answer is yes, please read on. Otherwise, make sure to head on over [to the download page](https://our.umbraco.com/download) and start using Umbraco CMS as intended.
 
-**Table of contents**
+## Table of contents
 
-[Building from source](#building-from-source)
-  * [The quick build](#quick)
-  * [Build infrastructure](#build-infrastructure)
-    * [Properties](#properties)
-    * [GetUmbracoVersion](#getumbracoversion)
-    * [SetUmbracoVersion](#setumbracoversion)
-    * [Build](#build)
-    * [Build-UmbracoDocs](#build-umbracodocs)
-    * [Verify-NuGet](#verify-nuget)
-  * [Cleaning up](#cleaning-up)
+↖️ You can jump to any section by using the "table of contents" button ( ![Table of contents icon](img/tableofcontentsicon.svg) ) above.
 
-[Azure DevOps](#azure-devops)
 
-[Quirks](#quirks)
-  * [Powershell quirks](#powershell-quirks)
-  * [Git quirks](#git-quirks)
+## Debugging source locally
 
+Did you read ["Are you sure"](#are-you-sure)?
+
+[More details about contributing to Umbraco and how to use the GitHub tooling can be found in our guide to contributing.][contribution guidelines]
+
+If you want to run a build without debugging, see [Building from source](#building-from-source) below. This runs the build in the same way it is run on our build servers.
+
+#### Debugging with VS Code
+
+In order to build the Umbraco source code locally with Visual Studio Code, first make sure you have the following installed.
+
+  * [Visual Studio Code](https://code.visualstudio.com/)
+  * [dotnet SDK v6.0.2+](https://dotnet.microsoft.com/en-us/download)
+  * [Node.js v14+](https://nodejs.org/en/download/)
+  * npm v7+ (installed with Node.js)
+  * [Git command line](https://git-scm.com/download/)
+
+Open the root folder of the repository in Visual Studio Code.
+
+To build the front end you'll need to open the command pallet (<kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>) and run `>Tasks: Run Task` followed by `Client Watch` and then run the `Client Build` task in the same way.
+
+You can also run the tasks manually on the command line:
+
+```
+cd src\Umbraco.Web.UI.Client
+npm install
+npm run dev
+```
+
+or
+
+```
+cd src\Umbraco.Web.UI.Client
+npm install
+gulp dev
+```
+
+**The initial Gulp build might take a long time - don't worry, this will be faster on subsequent runs.**
+
+You might run into [Gulp quirks](#gulp-quirks).
+
+The caching for the back office has been described as 'aggressive' so we often find it's best when making back office changes to [disable caching in the browser (check "Disable cache" on the "Network" tab of developer tools)][disable browser caching] to help you to see the changes you're making.
+
+To run the C# portion of the project, either hit <kbd>F5</kbd> to begin debugging, or manually using the command line:
+
+```
+dotnet watch --project .\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj
+```
+
+**The initial C# build might take a _really_ long time (seriously, go and make a cup of coffee!) - but don't worry, this will be faster on subsequent runs.**
+
+When the page eventually loads in your web browser, you can follow the installer to set up a database for debugging. You may also wish to install a [starter kit][starter kits] to ease your debugging.
+
+#### Debugging with Visual Studio
+
+In order to build the Umbraco source code locally with Visual Studio, first make sure you have the following installed.
+
+  * [Visual Studio 2019 v16.8+ with .NET 6.0.2+](https://visualstudio.microsoft.com/vs/) ([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)
+  * [Node.js v14+](https://nodejs.org/en/download/)
+  * npm v7+ (installed with Node.js)
+  * [Git command line](https://git-scm.com/download/)
+
+The easiest way to get started is to open `umbraco.sln` in Visual Studio.
+
+To build the front end, you'll first need to run `cd src\Umbraco.Web.UI.Client && npm install`  in the command line (or `cd src\Umbraco.Web.UI.Client; npm install` in PowerShell). Then find the Task Runner Explorer (View → Other Windows → Task Runner Explorer) and run the `build` task under `Gulpfile.js`. You may need to refresh the Task Runner Explorer before the tasks load.
+
+If you're working on the backoffice, you may wish to run the `dev` command instead while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
+
+**The initial Gulp build might take a long time - don't worry, this will be faster on subsequent runs.**
+
+You might run into [Gulp quirks](#gulp-quirks).
+
+The caching for the back office has been described as 'aggressive' so we often find it's best when making back office changes to [disable caching in the browser (check "Disable cache" on the "Network" tab of developer tools)][disable browser caching] to help you to see the changes you're making.
+
+"The rest" is a C# based codebase, which is mostly ASP.NET Core MVC based. You can make changes, build them in Visual Studio, and hit <kbd>F5</kbd> to see the result.
+
+**The initial C# build might take a _really_ long time (seriously, go and make a cup of coffee!) - but don't worry, this will be faster on subsequent runs.**
+
+When the page eventually loads in your web browser, you can follow the installer to set up a database for debugging. You may also wish to install a [starter kit][starter kits] to ease your debugging.
 
 ## Building from source
 
@@ -38,13 +104,14 @@ Did you read ["Are you sure"](#are-you-sure)?
 To build Umbraco, fire up PowerShell and move to Umbraco's repository root (the directory that contains `src`, `build`, `LICENSE.md`...). There, trigger the build with the following command:
 
     build/build.ps1
-    
+
 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).
 
 If it runs without errors; Hooray! Now you can continue with [the next step](CONTRIBUTING.md#how-do-i-begin) and open the solution and build it.
 
+
 ### Build Infrastructure
 
 The Umbraco Build infrastructure relies on a PowerShell object. The object can be retrieved with:
@@ -145,7 +212,7 @@ To perform a more complete clear, you will want to also delete the content of th
 The following command will force remove all untracked files and directories, whether they are ignored by Git or not. Combined with `git reset` it can recreate a pristine working directory. 
 
     git clean -xdf .
-    
+
 For git documentation see:
 * git [clean](<https://git-scm.com/docs/git-clean>)
 * git [reset](<https://git-scm.com/docs/git-reset>)
@@ -214,3 +281,19 @@ The best solution is to unblock the Zip file before un-zipping: right-click the
 ### Git Quirks
 
 Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).
+
+### Gulp Quirks
+
+You may need to run the following commands to set up gulp properly:
+
+  ```
+npm cache clean --force
+npm ci
+npm run build
+  ```
+
+
+
+[ contribution guidelines]: CONTRIBUTING.md	"Read the guide to contributing for more details on contributing to Umbraco"
+[ starter kits ]: https://our.umbraco.com/packages/?category=Starter%20Kits&version=9	"Browse starter kits available for v9 on Our "
+[ disable browser caching ]: https://techwiser.com/disable-cache-google-chrome-firefox "Instructions on how to disable browser caching in Chrome and Firefox"

.github/CONTRIBUTING.md

@@ -2,192 +2,131 @@
 
 👍🎉 First off, thanks for taking the time to contribute! 🎉👍
 
-The following is a set of guidelines, for contributing to Umbraco CMS.
+These contribution guidelines are mostly just that - guidelines, not rules. This is what we've found to work best over the years, but if you choose to ignore them, we still love you! 💖 Use your best judgement, and feel free to propose changes to this document in a pull request.
 
-These are mostly guidelines, not rules. Use your best judgement, and feel free to propose changes to this document in a pull request.
+## Coding not your thing? Or want more ways to contribute?
 
-Remember, we're a friendly bunch and are happy with whatever contribution you might provide. Below are guidelines for success that we've gathered over the years. If you choose to ignore them then we still love you 💖.
+This document covers contributing to the codebase of the CMS but [the community site has plenty of inspiration for other ways to get involved.][get involved]
 
-**Code of conduct**
+If you don't feel you'd like to make code changes here, you can visit our [documentation repository][docs repo] and use your experience to contribute to making the docs we have, even better.
 
-This project and everyone participating in it, is governed by the [our Code of Conduct](https://github.com/umbraco/.github/blob/main/.github/CODE_OF_CONDUCT.md).
+We also encourage community members to feel free to comment on others' pull requests and issues - the expertise we have is not limited to the Core Collaborators and HQ. So, if you see something on the issue tracker or pull requests you feel you can add to, please don't be shy.
 
-**Table of contents**
+## Table of contents
 
-[Contributing code changes](#contributing-code-changes)
-  * [Guidelines for contributions we welcome](#guidelines-for-contributions-we-welcome)
-    * [Ownership and copyright](#ownership-and-copyright)
-  * [What can I start with?](#what-can-i-start-with)
-  * [How do I begin?](#how-do-i-begin)
-  * [Pull requests](#pull-requests)
+- [Before you start](#before-you-start)
+  * [Code of Conduct](#code-of-conduct)
+  * [What can I contribute?](#what-can-i-contribute)
+    + [Making larger changes](#making-larger-changes)
+    + [Pull request or package?](#pull-request-or-package)
+    + [Ownership and copyright](#ownership-and-copyright)
+- [Finding your first issue: Up for grabs](#finding-your-first-issue-up-for-grabs)
+- [Making your changes](#making-your-changes)
+    + [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
+    + [Style guide](#style-guide)
+    + [Questions?](#questions)
+- [Creating a pull request](#creating-a-pull-request)
+- [The review process](#the-review-process)
+  * [Dealing with requested changes](#dealing-with-requested-changes)
+    + [No longer available?](#no-longer-available)
+  * [The Core Collaborators team](#the-core-collaborators-team)
 
-[Reviews](#reviews)
-  * [Styleguides](#styleguides)
-  * [The Core Contributors](#the-core-contributors-team)
-  * [Questions?](#questions)
+## Before you start
 
-[Working with the code](#working-with-the-code)
-  * [Building Umbraco from source code](#building-umbraco-from-source-code)
-  * [Working with the source code](#working-with-the-source-code)
-  * [Making changes after the PR is open](#making-changes-after-the-pr-is-open)
-  * [Which branch should I target for my contributions?](#which-branch-should-i-target-for-my-contributions)
-  * [Keeping your Umbraco fork in sync with the main repository](#keeping-your-umbraco-fork-in-sync-with-the-main-repository)
 
-## Contributing code changes
+### Code of Conduct
 
-This document gives you a quick overview on how to get started.
+This project and everyone participating in it, is governed by the [our Code of Conduct][code of conduct].
 
-### Guidelines for contributions we welcome
+### What can I contribute?
 
-Not all changes are wanted, so on occasion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valuable time.
+We categorise pull requests (PRs) into two categories:
 
-We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md). Make sure to talk to us before making large changes, so we can ensure that you don't put all your hard work into something we would not be able to merge.
+| PR type   | Definition                                                   |
+| --------- | ------------------------------------------------------------ |
+| Small PRs | Bug fixes and small improvements - can be recognized by seeing a small number of changes and possibly a small number of new files. |
+| Large PRs | New features and large refactorings - can be recognized by seeing a large number of changes, plenty of new files, updates to package manager files (NuGet’s packages.config, NPM’s packages.json, etc.). |
 
-Remember, it is always worth working on an issue from the `Up for grabs` list or even asking for some feedback before you send us a PR. This way, your PR will not be closed as unwanted.
+We’re usually able to handle small PRs pretty quickly. A community volunteer will do the initial review and flag it for Umbraco HQ as “community tested”. If everything looks good, it will be merged pretty quickly [as per the described process][review process].
+
+We would love to follow the same process for larger PRs but this is not always possible due to time limitations and priorities that need to be aligned. We don’t want to put up any barriers, but this document should set the correct expectations. 
+
+Not all changes are wanted, so on occasion we might close a PR without merging it but if we do, we will give you feedback why we can't accept your changes. **So make sure to [talk to us before making large changes][making larger changes]**, so we can ensure that you don't put all your hard work into something we would not be able to merge.
+
+#### Making larger changes
+
+[making larger changes]: #making-larger-changes
+
+Please make sure to describe your larger ideas in an [issue (bugs)][issues] or [discussion (new features)][discussions], it helps to put in mock up screenshots or videos. If the change makes sense for HQ to include in Umbraco CMS we will leave you some feedback on how we’d like to see it being implemented. 
+
+If a larger pull request is encouraged by Umbraco HQ, the process will be similar to what is described in the small PRs process above, we strive to feedback within 14 days. Finalizing and merging the PR might take longer though as it will likely need to be picked up by the development team to make sure everything is in order. We’ll keep you posted on the progress.
+
+#### Pull request or package?
+
+[pr or package]: #pull-request-or-package
+
+If you're unsure about whether your changes belong in the core Umbraco CMS or if you should turn your idea into a package instead, make sure to [talk to us][making larger changes].
+
+If it doesn’t fit in CMS right now, we will likely encourage you to make it into a package instead. A package is a great way to check out popularity of a feature, learn how people use it, validate good usability and fix bugs. Eventually, a package could "graduate" to be included in the CMS.
 
 #### Ownership and copyright
 
-It is your responsibility to make sure that you're allowed to share the code you're providing us.
-For example, you should have permission from your employer or customer to share code.
+It is your responsibility to make sure that you're allowed to share the code you're providing us. For example, you should have permission from your employer or customer to share code.
 
 Similarly, if your contribution is copied or adapted from somewhere else, make sure that the license allows you to reuse that for a contribution to Umbraco-CMS.
 
 If you're not sure, leave a note on your contribution and we will be happy to guide you.
 
-When your contribution has been accepted, it will be [MIT licensed](https://github.com/umbraco/Umbraco-CMS/blob/v8/contrib/LICENSE.md) from that time onwards.
+When your contribution has been accepted, it will be [MIT licensed][MIT license] from that time onwards.
 
-### What can I start with?
+## Finding your first issue: Up for grabs
 
-Unsure where to begin contributing to Umbraco? You can start by looking through [these `Up for grabs` issues](https://github.com/umbraco/Umbraco-CMS/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs+)
+Umbraco HQ will regularly mark newly created issues on the issue tracker with [the `community/up-for-grabs` tag][up for grabs issues]. This means that the proposed changes are wanted in Umbraco but the HQ does not have the time to make them at this time. We encourage anyone to pick them up and help out.
 
-### How do I begin?
+If you do start working on something, make sure to leave a small comment on the issue saying something like: "I'm working on this". That way other people stumbling upon the issue know they don't need to pick it up, someone already has.
+
+## Making your changes
 
 Great question! The short version goes like this:
 
-  * **Fork** - create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
+1. **Fork**
 
-  ![Fork the repository](img/forkrepository.png)
+    Create a fork of [`Umbraco-CMS` on GitHub][Umbraco CMS repo]
+    
+    ![Fork the repository](img/forkrepository.png)
+    
+1. **Clone**
 
-  * **Clone** - when GitHub has created your fork, you can clone it in your favorite Git tool
+    When GitHub has created your fork, you can clone it in your favorite Git tool
+    
+    ![Clone the fork](img/clonefork.png) 
+    
+1. **Switch to the correct branch**
 
-  ![Clone the fork](img/clonefork.png)
+    Switch to the `v10/contrib` branch
 
-  * **Switch to the correct branch** - switch to the `v9/contrib` branch
-  * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
-  * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
-  * **Commit** - done? Yay! 🎉 **Important:** create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`. When you have a branch, commit your changes. Don't commit to `v9/contrib`, create a new branch first.
-  * **Push** - great, now you can push the changes up to your fork on GitHub
-  * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress - you can now make use of GitHub's draft pull request status, detailed [here](https://github.blog/2019-02-14-introducing-draft-pull-requests/)). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
+1. **Build**
 
-  ![Create a pull request](img/createpullrequest.png)
+    Build your fork of Umbraco locally as described in the build documentation: you can [debug with Visual Studio Code][build - debugging with code] or [with Visual Studio][build - debugging with vs].
 
-### Pull requests
-The most successful pull requests usually look a like this:
+1. **Branch**
 
-  * Fill in the required template (shown when starting a PR on GitHub), and link your pull request to an issue on the [issue tracker,](https://github.com/umbraco/Umbraco-CMS/issues) if applicable.
-  * Include screenshots and animated GIFs in your pull request whenever possible.
-  * Unit tests, while optional, are awesome. Thank you!
-  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated.
+    Create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case issue number `12345`.  Don't commit to `v10/contrib`, create a new branch first.
 
-Again, these are guidelines, not strict requirements. However, the more information that you give to us, the more we have to work with when considering your contributions. Good documentation of a pull request can really speed up the time it takes to review and merge your work!
+1. **Change**
 
-## Reviews
+    Make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback][questions].
 
-You've sent us your first contribution - congratulations! Now what?
+1. **Commit and push**
 
-The [pull request team](#the-pr-team) can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request that you make some additional changes.
+    Done? Yay! 🎉
 
-We have [a process in place which you can read all about](REVIEW_PROCESS.md). The very abbreviated version is:
+    Remember to commit to your new `temp` branch, and don't commit to `v10/contrib`. Then you can push the changes up to your fork on GitHub.
 
-- Your PR will get a reply within 48 hours
-- An in-depth reply will be added within at most 2 weeks
-- The PR will be either merged or rejected within at most 4 weeks
-- Sometimes it is difficult to meet these timelines and we'll talk to you if this is the case.
+#### Keeping your Umbraco fork in sync with the main repository
+[sync fork]: #keeping-your-umbraco-fork-in-sync-with-the-main-repository
 
-### Styleguides
-
-To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
-
-That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
-
-### The Core Contributors team
-
-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:
-
-- [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.
-
-### Questions?
-
-You can get in touch with [the core contributors team](#the-core-contributors-team) in multiple ways; we love open conversations and we are a friendly bunch. No question you have is stupid. Any question you have usually helps out multiple people with the same question. Ask away:
-
-- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward.
-- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum. The team monitors that one closely, so one of us will be on hand and ready to point you in the right direction.
-
-## Working with the code
-
-### Building Umbraco from source code
-
-In order to build the Umbraco source code locally, first make sure you have the following installed.
-
-  * [Visual Studio 2019 v16.8+ (with .NET Core 3.0)](https://visualstudio.microsoft.com/vs/)
-  * [Node.js v10+](https://nodejs.org/en/download/)
-  * npm v6.4.1+ (installed with Node.js)
-  * [Git command line](https://git-scm.com/download/)
-
-The easiest way to get started is to open `src\umbraco.sln` in Visual Studio 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.
-
-![Gulp build in Visual Studio](img/gulpbuild.png)
-
-After this build completes, you should be able to hit `F5` in Visual Studio to build and run the project. A IISExpress webserver will start and the Umbraco installer will pop up in your browser. Follow the directions there to get a working Umbraco install up and running.
-
-### Working with the source code
-
-Some parts of our source code are over 10 years old now. And when we say "old", we mean "mature" of course!
-
-There are two big areas that you should know about:
-
-  1. The Umbraco backoffice is a extensible AngularJS app and requires you to run a `gulp dev` command while you're working with it, so changes are copied over to the appropriate directories and you can refresh your browser to view the results of your changes.
-  You may need to run the following commands to set up gulp properly:
-  ```
-  npm cache clean --force
-  npm ci
-  npm run build
-  ```
-  The caching for the back office has been described as 'aggressive' so we often find it's best when making back office changes to disable caching in the browser to help you to see the changes you're making.
-
-  2. "The rest" is a C# based codebase, which is mostly ASP.NET MVC based. You can make changes, build them in Visual Studio, and hit `F5` to see the result.
-
-To find the general areas for something you're looking to fix or improve, have a look at the following two parts of the API documentation.
-
-  * [The AngularJS based backoffice files](https://apidocs.umbraco.com/v9/ui#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
-  * [The C# application](https://apidocs.umbraco.com/v9/csharp/)
-
-### Which branch should I target for my contributions?
-
-We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `v9/contrib`. If you are working on v9, this is the branch you should be targetting. For v8 contributions, please target 'v8/contrib'
-
-Please note: we are no longer accepting features for v7 but will continue to merge bug fixes as and when they arise.
-
-![Which branch should I target?](img/defaultbranch.png)
-
-### Making changes after the PR is open
-
-If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
-
-### Keeping your Umbraco fork in sync with the main repository
-
-We recommend you to sync with our repository before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
-
-Also, if you have submitted a pull request three weeks ago and want to work on something new, you'll want to get the latest code to build against of course.
+Once you've already got a fork and cloned your fork locally, you can skip steps 1 and 2 going forward. Just remember to keep your fork up to date before making further changes.
 
 To sync your fork with this original one, you'll have to add the upstream url. You only have to do this once:
 
@@ -199,13 +138,110 @@ Then when you want to get the changes from the main repository:
 
 ```
 git fetch upstream
-git rebase upstream/v9/contrib
+git rebase upstream/v10/contrib
 ```
 
-In this command we're syncing with the `v9/contrib` branch, but you can of course choose another one if needed.
+In this command we're syncing with the `v10/contrib` branch, but you can of course choose another one if needed.
 
-(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
+[More information on how this works can be found on the thoughtbot blog.][sync fork ext]
 
-### And finally
+#### Style guide
 
-We welcome all kinds of contributions to this repository. If you don't feel you'd like to make code changes here, you can visit our [documentation repository](https://github.com/umbraco/UmbracoDocs) and use your experience to contribute to making the docs we have, even better. We also encourage community members to feel free to comment on others' pull requests and issues - the expertise we have is not limited to the Core Contributors and HQ. So, if you see something on the issue tracker or pull requests you feel you can add to, please don't be shy.
+To be honest, we don't like rules very much. We trust you have the best of intentions and we encourage you to create working code. If it doesn't look perfect then we'll happily help clean it up.
+
+That said, the Umbraco development team likes to follow the hints that ReSharper gives us (no problem if you don't have this installed) and we've added a `.editorconfig` file so that Visual Studio knows what to do with whitespace, line endings, etc.
+
+#### Questions?
+[questions]: #questions
+
+You can get in touch with [the core contributors team][core collabs] in multiple ways; we love open conversations and we are a friendly bunch. No question you have is stupid. Any question you have usually helps out multiple people with the same question. Ask away:
+
+- If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward.
+- If you want to ask questions on some code you've already written you can create a draft pull request, [detailed in a GitHub blog post][draft prs].
+- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"][contrib forum] forum. The team monitors that one closely, so one of us will be on hand and ready to point you in the right direction.
+
+## Creating a pull request
+
+Exciting! You're ready to show us your changes.
+
+We recommend you to [sync with our repository][sync fork] before you submit your pull request. That way, you can fix any potential merge conflicts and make our lives a little bit easier.
+
+GitHub will have picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
+![Create a pull request](img/createpullrequest.png)
+
+We like to use [git flow][git flow] as much as possible, but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `v10/contrib`. If you are working on v9, this is the branch you should be targeting.
+
+Please note: we are no longer accepting features for v8 and below but will continue to merge security fixes as and when they arise.
+
+## The review process
+[review process]: #the-review-process
+
+You've sent us your first contribution - congratulations! Now what?
+
+The [Core Collaborators team][Core collabs] can now start reviewing your proposed changes and give you feedback on them. If it's not perfect, we'll either fix up what we need or we can request that you make some additional changes.
+
+You will get an initial automated reply from our [Friendly Umbraco Robot, Umbrabot][Umbrabot], to acknowledge that we’ve seen your PR and we’ll pick it up as soon as we can. You can take this opportunity to double check everything is in order based off the handy checklist Umbrabot provides.
+
+You will get feedback as soon as the [Core Collaborators team][Core collabs] can after opening the PR. You’ll most likely get feedback within a couple of weeks. Then there are a few possible outcomes:
+
+- Your proposed change is awesome! We merge it in and it will be included in the next minor release of Umbraco
+- If the change is a high priority bug fix, we will cherry-pick it into the next patch release as well so that we can release it as soon as possible
+- Your proposed change is awesome but needs a bit more work, we’ll give you feedback on the changes we’d like to see
+- Your proposed change is awesome but... not something we’re looking to include at this point. We’ll close your PR and the related issue (we’ll be nice about it!). See [making larger changes][making larger changes] and [pull request or package?][pr or package]
+
+### Dealing with requested changes
+
+If you make the corrections we ask for in the same branch and push them to your fork again, the pull request automatically updates with the additional commit(s) so we can review it again. If all is well, we'll merge the code and your commits are forever part of Umbraco!
+
+#### No longer available?
+
+We understand you have other things to do and can't just drop everything to help us out.
+
+So if we’re asking for your help to improve the PR we’ll wait for two weeks to give you a fair chance to make changes. We’ll ask for an update if we don’t hear back from you after that time.  
+
+If we don’t hear back from you for 4 weeks, we’ll close the PR so that it doesn’t just hang around forever. You’re very welcome to re-open it once you have some more time to spend on it.  
+
+There will be times that we really like your proposed changes and we’ll finish the final improvements we’d like to see ourselves. You still get the credits and your commits will live on in the git repository.
+
+### The Core Collaborators team
+[Core collabs]: #the-core-collaborators-team
+
+The Core Contributors team consists of one member of Umbraco HQ, [Sebastiaan][Sebastiaan], who gets assistance from the following community members who have committed to volunteering their free time:
+
+- [Nathan Woulfe][Nathan Woulfe]
+- [Joe Glombek][Joe Glombek]
+- [Laura Weatherhead][Laura Weatherhead]
+- [Michael Latouche][Michael Latouche]
+- [Owain Williams][Owain Williams]
+
+
+These wonderful people aim to provide you with a 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.
+
+<!-- Reference links for easy updating -->
+
+<!-- Local -->
+
+[MIT license]: ../LICENSE.md	"Umbraco's license declaration"
+[build - debugging with vs]: BUILD.md#debugging-with-visual-studio	"Details on building and debugging Umbraco with Visual Studio"
+[build - debugging with code]: BUILD.md#debugging-with-vs-code	"Details on building and debugging Umbraco with Visual Studio Code"
+
+<!-- External -->
+
+[Nathan Woulfe]: https://github.com/nathanwoulfe	"Nathan's GitHub profile"
+[Joe Glombek]: https://github.com/glombek	"Joe's GitHub profile"
+[Laura Weatherhead]: https://github.com/lssweatherhead	"Laura's GitHub profile"
+[Michael Latouche]: https://github.com/mikecp	"Michael's GitHub profile"
+[Owain Williams]: https://github.com/OwainWilliams	"Owain's GitHub profile"
+[Sebastiaan]: https://github.com/nul800sebastiaan	"Senastiaan's GitHub profile"
+[ Umbrabot ]: https://github.com/umbrabot
+[git flow]: https://jeffkreeftmeijer.com/git-flow/	"An explanation of git flow"
+[sync fork ext]: http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated	"Details on keeping a git fork updated"
+[draft prs]: https://github.blog/2019-02-14-introducing-draft-pull-requests/	"Github's blog post providing details on draft pull requests"
+[contrib forum]: https://our.umbraco.com/forum/contributing-to-umbraco-cms/
+[get involved]: https://community.umbraco.com/get-involved/
+[docs repo]: https://github.com/umbraco/UmbracoDocs
+[code of conduct]: https://github.com/umbraco/.github/blob/main/.github/CODE_OF_CONDUCT.md
+[up for grabs issues]: https://github.com/umbraco/Umbraco-CMS/issues?q=is%3Aissue+is%3Aopen+label%3Acommunity%2Fup-for-grabs
+[Umbraco CMS repo]: https://github.com/umbraco/Umbraco-CMS
+[issues]: https://github.com/umbraco/Umbraco-CMS/issues
+[discussions]: https://github.com/umbraco/Umbraco-CMS/discussions

.github/CONTRIBUTION_GUIDELINES.md

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

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -6,7 +6,7 @@ body:
 - type: input
   id: "version"
   attributes:
-    label: "Which *exact* Umbraco version are you using? For example: 9.0.1 - don't just write v9"
+    label: "Which Umbraco version are you using? (Please write the *exact* version, example: 10.1.0)"
     description: "Use the help icon in the Umbraco backoffice to find the version you're using"
   validations:
     required: true

.github/New BackOffice - README.md

@@ -0,0 +1,18 @@
+# New backoffice
+
+> **Warning**:
+> This is an early WIP and is set not to be packable since we don't want to release this yet. There will be breaking changes in these projects.
+
+This solution folder contains the projects for the new backoffice. If you're looking to fix or improve the existing CMS, this is not the place to do it, although we do very much appreciate your efforts.
+
+### Project structure
+
+Since the new backoffice API is still very much a work in progress, we've created new projects for the new backoffice API:
+
+* Umbrao.Cms.ManagementApi - The "presentation layer" for the management API
+* "New" versions of existing projects, should be merged with the existing projects when the new API is released:
+    * Umbraco.New.Cms.Core
+    * Umbraco.New.Cms.Infrastructure
+    * Umbraco.New.Cms.Web.Common
+
+This also means that we have to use "InternalsVisibleTo" for the new projects since these should be able to access the internal classes since they will when they get merged.

.github/README.md

@@ -25,7 +25,7 @@ If you want to DIY, then you can [download Umbraco]((https://our.umbraco.com/dow
 
 ## Documentation
 
-The documentation for Umbraco CMS can be found [on Our Umbraco](https://our.umbraco.com/documentation/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions.
+The documentation for Umbraco CMS can be found [on Our Umbraco](https://docs.umbraco.com/). The source for the Umbraco docs is [open source as well](https://github.com/umbraco/UmbracoDocs) and we're happy to look at your documentation contributions.
 
 ## Join the Umbraco community
 

.github/REVIEW_PROCESS.md

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

.github/config/codeql-config.yml

@@ -5,4 +5,5 @@ paths:
 
 paths-ignore:
   - '**/node_modules'
-  - 'src/Umbraco.Web.UI/wwwroot'
+  - 'src/Umbraco.Web.UI/wwwroot'
+  - 'src/Umbraco.Cms.StaticAssets/wwwroot'

.github/img/tableofcontentsicon.svg

@@ -0,0 +1,3 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" height="16" viewBox="0 0 16 16" version="1.1" width="16">
+    <path fill-rule="evenodd" d="M2 4a1 1 0 100-2 1 1 0 000 2zm3.75-1.5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zm0 5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zm0 5a.75.75 0 000 1.5h8.5a.75.75 0 000-1.5h-8.5zM3 8a1 1 0 11-2 0 1 1 0 012 0zm-1 6a1 1 0 100-2 1 1 0 000 2z" fill="#57606A"></path>
+</svg>

.github/workflows/add-issues-to-review-project.yml

@@ -0,0 +1,58 @@
+name: Add issues to review project
+
+on:
+  issues:
+    types:
+      - opened
+
+permissions:
+  contents: read
+
+jobs:
+  get-user-type:
+    runs-on: ubuntu-latest
+    outputs:
+      ignored: ${{ steps.set-output.outputs.ignored }}
+    steps:
+      - name: Install dependencies
+        run: |
+          npm install node-fetch@2
+      - uses: actions/github-script@v5
+        name: "Determing HQ user or not"
+        id: set-output
+        with:
+          script: |
+            const fetch = require('node-fetch');
+            const response = await fetch('https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/users/IsIgnoredUser', {
+              method: 'post',
+              body: JSON.stringify('${{ github.event.issue.user.login }}'),
+              headers: {
+                'Authorization': 'Bearer ${{ secrets.OUR_BOT_API_TOKEN }}',
+                'Content-Type': 'application/json'
+              }
+            });
+
+            var isIgnoredUser = true;
+            try {                
+                if(response.status === 200) {
+                    const data = await response.text();
+                    isIgnoredUser = data === "true";
+                } else {
+                    console.log("Returned data not indicate success:", response.status);
+                }
+            } catch(error) {
+                console.log(error);
+            };
+            core.setOutput("ignored", isIgnoredUser);
+            console.log("Ignored is", isIgnoredUser);
+  add-to-project:
+    permissions:
+      repository-projects: write # for actions/add-to-project
+    if: needs.get-user-type.outputs.ignored == 'false'
+    runs-on: ubuntu-latest
+    needs: [get-user-type]
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/${{ github.repository_owner }}/projects/21
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

.github/workflows/codeql-analysis.yml

@@ -2,28 +2,59 @@ name: "Code scanning - action"
 
 on:
   push:
-    branches: ['*/dev','*/contrib']
+    branches:
+    - '*/dev'
+    - '*/contrib'
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: ['*/dev','*/contrib']
+    branches:
+    - '*/dev'
+    - '*/contrib'
+
+permissions:
+  contents: read
+
+env:
+  dotnetVersion: 6.x
+  dotnetIncludePreviewVersions: false
+  solution: umbraco.sln
+  buildConfiguration: SkipTests
+  DOTNET_NOLOGO: true
+  DOTNET_GENERATE_ASPNET_CERTIFICATE: false
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
 
 jobs:
   CodeQL-Build:
-
+    permissions:
+      actions: read # for github/codeql-action/init to get workflow details
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/analyze to upload SARIF results
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         config-file: ./.github/config/codeql-config.yml
 
-    - name: dotnet build
-      run: dotnet build umbraco-netcore-only.sln
+    - name: Use .NET ${{ env.dotnetVersion }}
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: ${{ env.dotnetVersion }}
+        include-prerelease: ${{ env.dotnetIncludePreviewVersions }}
+
+    - name: Run dotnet restore
+      run: dotnet restore ${{ env.solution }}
+
+    - name: Run dotnet build
+      run: dotnet build ${{ env.solution }} --configuration ${{ env.buildConfiguration }} --no-restore -p:ContinuousIntegrationBuild=true
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/issues-first-response.yml

@@ -0,0 +1,53 @@
+name: issue-first-response
+
+on:
+  issues:
+    types: [opened]
+
+jobs: 
+  send-response:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write    
+    steps:
+      - name: Install dependencies
+        run: |
+          npm install node-fetch@2
+      - name: Fetch random comment 🗣️ and add it to the issue
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const fetch = require('node-fetch')
+
+            const response = await fetch('https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/comments/PostComment', {
+              method: 'post',
+              body: JSON.stringify({
+                repo: '${{ github.repository }}',
+                number: '${{ github.event.number }}',
+                actor: '${{ github.actor }}',
+                commentType: 'opened-issue-first-comment'
+              }),
+              headers: {
+                'Authorization': 'Bearer ${{ secrets.OUR_BOT_API_TOKEN }}',
+                'Content-Type': 'application/json'
+              }
+            });
+
+            try {
+                const data = await response.text();
+
+                if(response.status === 200 && data !== '') {
+                    github.rest.issues.createComment({
+                        issue_number: context.issue.number,
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        body: data
+                    });
+                } else {
+                    console.log("Status code did not indicate success:", response.status);
+                    console.log("Returned data:", data);
+                }
+            } catch(error) {
+                console.log(error);
+            }

.github/workflows/pr-first-response.yml

@@ -1,26 +1,57 @@
 name: pr-first-response
 
 on:
-  pull_request:
+  pull_request_target:
     types: [opened]
 
-jobs: 
+jobs:
   send-response:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
-      - name: Fetch random comment 🗣️
-        uses: JamesIves/fetch-api-data-action@v2.1.0
-        with:
-          ENDPOINT: https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/comments/PostComment
-          CONFIGURATION: '{ "method": "POST", "headers": {"Authorization": "Bearer ${{ secrets.OUR_BOT_API_TOKEN }}", "Content-Type": "application/json" }, "body": { "repo": "${{ github.repository }}", "number": "${{ github.event.number }}", "actor": "${{ github.actor }}", "commentType": "opened-pr-first-comment"} }'
-      - name: Add PR comment
-        if: "${{ env.fetch-api-data != '' }}"
-        uses: actions/github-script@v5
+      - name: Fetch random comment 🗣️ and add it to the PR
+        uses: actions/github-script@v6
         with:
           script: |
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `${{ env.fetch-api-data }}`
-            })
+            const response = await fetch('https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/comments/PostComment', {
+              method: 'post',
+              body: JSON.stringify({
+                repo: '${{ github.repository }}',
+                number: '${{ github.event.number }}',
+                actor: '${{ github.actor }}',
+                commentType: 'opened-pr-first-comment'
+              }),
+              headers: {
+                'Authorization': 'Bearer ${{ secrets.OUR_BOT_API_TOKEN }}',
+                'Content-Type': 'application/json'
+              }
+            });
+
+            try {
+                const data = await response.text();
+
+                if(response.status === 200 && data !== '') {
+                    github.rest.issues.createComment({
+                        issue_number: context.issue.number,
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        body: data
+                    });
+                } else {
+                    console.log("Returned data not indicate success.");
+
+                    if(response.status !== 200) {
+                      console.log("Status code:", response.status)
+                    }
+
+                    console.log("Returned data:", data);
+
+                    if(data === '') {
+                      console.log("An empty response usually indicates that either no comment was found or the actor user was not eligible for getting an automated response (HQ users are not getting auto-responses).")
+                    }
+                }
+            } catch(error) {
+                console.log(error);
+            }

.github/workflows/up-for-grabs-response.yml

@@ -0,0 +1,63 @@
+name: labeled-up-for-grabs-first-comment
+
+on:
+  issues:
+    types:
+      - labeled
+
+jobs:
+  send-response:
+    if: github.event.label.name == 'community/up-for-grabs'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Install dependencies
+        run: |
+          npm install node-fetch@2
+      - name: Fetch comment 🗣️ and add it to the issue
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const fetch = require('node-fetch');
+            const response = await fetch('https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/comments/PostComment', {
+              method: 'post',
+              body: JSON.stringify({
+                repo: '${{ github.repository }}',
+                number: '${{ github.event.issue.number }}',
+                actor: '${{ github.event.issue.user.login }}',
+                commentType: 'labeled-up-for-grabs-first-comment'
+              }),
+              headers: {
+                'Authorization': 'Bearer ${{ secrets.OUR_BOT_API_TOKEN }}',
+                'Content-Type': 'application/json'
+              }
+            });
+
+            try {
+                const data = await response.text();
+
+                if(response.status === 200 && data !== '') {
+                    github.rest.issues.createComment({
+                        issue_number: context.issue.number,
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        body: data
+                    });
+                } else {
+                    console.log("Returned data not indicate success.");
+
+                    if(response.status !== 200) {
+                      console.log("Status code:", response.status)
+                    }
+
+                    console.log("Returned data:", data);
+                    
+                    if(data === '') {
+                      console.log("An empty response usually indicates that either no comment was found or the actor user was not eligible for getting an automated response (HQ users are not getting auto-responses).")
+                    }
+                }
+            } catch(error) {
+                console.log(error);
+            };

.gitignore

@@ -37,73 +37,70 @@ _NCrunch_*/
 tools/NDepend/
 [Tt]est[Rr]esult*
 [Bb]uild[Ll]og.*
-[sS]ource
-[sS]andbox
+[Ss]ource
+[Ss]andbox
 node_modules
 lib-bower
 *.psess
 *.vspx
-NDependOut/*
+NDependOut/
 QueryResult.htm
-tools/docfx/*
+tools/docfx/
 
 # Ignore rule for clearing out Belle (avoid rebuilding all the time)
 preserve.belle
 
 # Ignore rule for output of generated documentation files from grunt docserve
-src/Umbraco.Web.UI.Docs/api
-src/Umbraco.Web.UI.Docs/package-lock.json
+/src/Umbraco.Web.UI.Docs/api/
+/src/Umbraco.Web.UI.Docs/package-lock.json
+
+# csharp-docs
+/build/csharp-docs/api/
+/build/csharp-docs/_site/
 
 # Build
-build.out/
-build.tmp/
-build/hooks/
-build/temp/
+/build.out/
+/build.tmp/
+/build/hooks/
+/build/temp/
 
 # Build output
-build/docs.zip
-build/ui-docs.zip
-build/csharp-docs.zip
-build/ApiDocs/*
-build/ApiDocs/Output/*
-src/ApiDocs/api/*
+/build/docs.zip
+/build/ui-docs.zip
+/build/csharp-docs.zip
+/src/Umbraco.Cms.StaticAssets/wwwroot/umbraco/
 
 # Environment specific data
-src/Umbraco.Web.UI.Client/[Bb]uild/*
-src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
-src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
-src/Umbraco.Web.UI.Client/TESTS-*.xml
-src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/*
-src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs
-src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/*
-src/Umbraco.Web.UI/appsettings.Development.json
-src/Umbraco.Web.UI/appsettings.json
-src/Umbraco.Web.UI/appsettings.Local.json
-src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/assets/*
-src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/*
-src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/*
-src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/*
-src/Umbraco.Web.UI/wwwroot/Media/*
-src/Umbraco.Web.UI/Smidge/
-src/Umbraco.Web.UI/App_Code/
-src/Umbraco.Web.UI/App_Plugins/
-src/Umbraco.Web.UI/Views/
-!src/Umbraco.Web.UI/Views/Partials/blocklist/
-!src/Umbraco.Web.UI/Views/Partials/grid/
-!src/Umbraco.Web.UI/Views/_ViewImports.cshtml
+/src/Umbraco.Web.UI.Client/[Bb]uild/
+/src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
+/src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
+/src/Umbraco.Web.UI.Client/TESTS-*.xml
+/src/Umbraco.Web.UI/wwwroot/[Mm]edia/
+/src/Umbraco.Web.UI/App_Code/
+/src/Umbraco.Web.UI/App_Plugins/
+/src/Umbraco.Web.UI/[Uu]mbraco/[Dd]ata/
+/src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ogs/
+/src/Umbraco.Web.UI/[Uu]mbraco/[Mm]odels/
+/src/Umbraco.Web.UI/Views/
+!/src/Umbraco.Web.UI/Views/Partials/blocklist/
+!/src/Umbraco.Web.UI/Views/Partials/grid/
+!/src/Umbraco.Web.UI/Views/_ViewImports.cshtml
+/src/Umbraco.Web.UI/appsettings.json
+/src/Umbraco.Web.UI/appsettings.Development.json
+/src/Umbraco.Web.UI/appsettings.Local.json
 
 # Tests
-cypress.env.json
-tests/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
-tests/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
-tests/Umbraco.Tests.AcceptanceTest/cypress/videos/
-tests/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
-tests/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/
-tests/Umbraco.Tests.Integration/TEMP/*
-tests/Umbraco.Tests.Integration/umbraco/Data/
-tests/Umbraco.Tests.Integration/umbraco/logs/
-tests/Umbraco.Tests.Integration/Views/
-tests/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/
+/tests/Umbraco.Tests.AcceptanceTest/.env
+/tests/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
+/tests/Umbraco.Tests.Integration.SqlCe/[Uu]mbraco/[Dd]ata/TEMP/
+/tests/Umbraco.Tests.Integration/appsettings.Tests.Local.json
+/tests/Umbraco.Tests.Integration/TEMP/
+/tests/Umbraco.Tests.Integration/[Uu]mbraco/[Dd]ata/
+/tests/Umbraco.Tests.Integration/[Uu]mbraco/[Ll]ogs/
+/tests/Umbraco.Tests.Integration/Views/
+/tests/Umbraco.Tests.UnitTests/[Uu]mbraco/[Dd]ata/TEMP/
 
 # Ignore auto-generated schema
-src/Umbraco.Web.UI/umbraco/config/appsettings-schema.json
+/src/Umbraco.Cms/appsettings-schema.json
+/src/Umbraco.Web.UI/appsettings-schema.json
+/tests/Umbraco.Tests.Integration/appsettings-schema.json

.globalconfig

@@ -50,6 +50,7 @@ dotnet_analyzer_diagnostic.category-StyleCop.CSharp.LayoutRules.severity = sugge
 
 dotnet_diagnostic.SA1636.severity = none # SA1636: File header copyright text should match
 dotnet_diagnostic.SA1101.severity = none # PrefixLocalCallsWithThis - stylecop appears to be ignoring dotnet_style_qualification_for_*
+dotnet_diagnostic.SA1309.severity = none # FieldNamesMustNotBeginWithUnderscore
 
 dotnet_diagnostic.SA1503.severity = warning # BracesMustNotBeOmitted
 dotnet_diagnostic.SA1117.severity = warning # ParametersMustBeOnSameLineOrSeparateLines
@@ -70,8 +71,8 @@ dotnet_diagnostic.SA1132.severity = warning # DoNotCombineFields
 dotnet_diagnostic.SA1134.severity = warning # AttributesMustNotShareLine
 dotnet_diagnostic.SA1106.severity = warning # CodeMustNotContainEmptyStatements
 dotnet_diagnostic.SA1312.severity = warning # VariableNamesMustBeginWithLowerCaseLetter
-dotnet_diagnostic.SA1303.severity = warning # ConstFieldNamesMustBeginWithUpperCaseLetter
 dotnet_diagnostic.SA1310.severity = warning # FieldNamesMustNotContainUnderscore
+dotnet_diagnostic.SA1303.severity = warning # ConstFieldNamesMustBeginWithUpperCaseLetter
 dotnet_diagnostic.SA1130.severity = warning # UseLambdaSyntax
 dotnet_diagnostic.SA1405.severity = warning # DebugAssertMustProvideMessageText
 dotnet_diagnostic.SA1205.severity = warning # PartialElementsMustDeclareAccess
@@ -79,4 +80,4 @@ dotnet_diagnostic.SA1306.severity = warning # FieldNamesMustBeginWithLowerCaseLe
 dotnet_diagnostic.SA1209.severity = warning # UsingAliasDirectivesMustBePlacedAfterOtherUsingDirectives
 dotnet_diagnostic.SA1216.severity = warning # UsingStaticDirectivesMustBePlacedAtTheCorrectLocation
 dotnet_diagnostic.SA1133.severity = warning # DoNotCombineAttributes
-dotnet_diagnostic.SA1135.severity = warning # UsingDirectivesMustBeQualified
+dotnet_diagnostic.SA1135.severity = warning # UsingDirectivesMustBeQualified

.vscode/launch.json

@@ -9,9 +9,8 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "Dotnet build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/Umbraco.Web.UI/bin/Debug/net5.0/Umbraco.Web.UI.dll",
-            "args": [],
+            "program": "dotnet",
+            "args": ["run"],
             "cwd": "${workspaceFolder}/src/Umbraco.Web.UI",
             "stopAtEntry": false,
             "requireExactSource": false,

.vscode/tasks.json

@@ -33,6 +33,18 @@
                 "$gulp-tsc"
             ]
         },
+        {
+            "label": "Client Watch",
+            "detail": "runs npm run dev for Umbraco.Web.UI.Client",
+            "promptOnClose": true,
+            "group": "build",
+            "type": "npm",
+            "script": "dev",
+            "path": "src/Umbraco.Web.UI.Client/",
+            "problemMatcher": [
+                "$gulp-tsc"
+            ]
+        },
         {
             "label": "Dotnet build",
             "detail": "Dotnet build of SLN",
@@ -42,7 +54,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/src/umbraco-netcore-only.sln",
+                "${workspaceFolder}/umbraco.sln",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -57,6 +69,7 @@
             "args": [
                 "watch",
                 "run",
+                "--project",
                 "${workspaceFolder}/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"

Directory.Build.props

@@ -1,7 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <!-- Package references and additional files which are consumed by all projects -->
-    <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" IsImplicitlyDefined="true" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Company>Umbraco HQ</Company>
+    <Authors>Umbraco</Authors>
+    <Copyright>Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy'))</Copyright>
+    <Product>Umbraco CMS</Product>
+    <PackageProjectUrl>https://umbraco.com/</PackageProjectUrl>
+    <PackageIconUrl>https://umbraco.com/dist/nuget/logo-small.png</PackageIconUrl>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageTags>umbraco</PackageTags>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <!-- SourceLink -->
+  <PropertyGroup>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+
+  <!-- Package Validation -->
+  <PropertyGroup>
+    <EnablePackageValidation>true</EnablePackageValidation>
+    <PackageValidationBaselineVersion>10.0.0</PackageValidationBaselineVersion>
+    <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
+    <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Umbraco.Code" Version="2.0.0" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.1.1" PrivateAssets="all" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="" Visible="false" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
+  </PropertyGroup>
+
 </Project>

build/NuSpecs/UmbracoCms.SqlCe.nuspec

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

@@ -1,29 +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>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" />
-
-        <!-- UmbracoCms props and targets used to copy the content into the solution -->
-        <file src="buildTransitive\**" target="buildTransitive\" />
-    </files>
-</package>

build/NuSpecs/UmbracoCms.nuspec

@@ -1,33 +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>Umbraco.Cms</id>
-        <version>9.0.0</version>
-        <title>Umbraco Cms</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>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="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>
-</package>

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

@@ -1,8 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <DefaultItemExcludes>$(DefaultItemExcludes);App_Plugins/**</DefaultItemExcludes>
-    <DefaultItemExcludes>$(DefaultItemExcludes);umbraco/Data/**</DefaultItemExcludes>
-    <DefaultItemExcludes>$(DefaultItemExcludes);umbraco/Logs/**</DefaultItemExcludes>
-    <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot/media/**</DefaultItemExcludes>
-  </PropertyGroup>
-</Project>

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

@@ -1,91 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-    <PropertyGroup>
-        <ContentFilesPath>$(MSBuildThisFileDirectory)..\content\umbraco\**\*.*</ContentFilesPath>
-        <ContentWwwrootFilesPath>$(MSBuildThisFileDirectory)..\content\wwwroot\umbraco\**\*.*</ContentWwwrootFilesPath>
-        <UmbracoWwwrootName Condition="'$(UmbracoWwwrootName)' == ''">umbraco</UmbracoWwwrootName>
-    </PropertyGroup>
-
-    <Target Name="CopyUmbracoAssets" BeforeTargets="BeforeBuild">
-        <ItemGroup>
-            <ContentFiles Include="$(ContentFilesPath)" />
-            <ContentWwwrootFiles Include="$(ContentWwwrootFilesPath)" />
-        </ItemGroup>
-        <Message Text="Copying Umbraco content files: $(ContentFilesPath) - #@(ContentFiles->Count()) files"  Importance="high" />
-        <Message Text="Copying Umbraco wwwroot content files: $(ContentWwwrootFilesPath) - #@(ContentWwwrootFiles->Count()) files"  Importance="high" />
-        <Copy
-            SourceFiles="@(ContentFiles)"
-            DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
-            SkipUnchangedFiles="true" />
-        <Copy
-            SourceFiles="@(ContentWwwrootFiles)"
-            DestinationFiles="@(ContentWwwrootFiles->'$(MSBuildProjectDirectory)\wwwroot\$(UmbracoWwwrootName)\%(RecursiveDir)%(Filename)%(Extension)')"
-            SkipUnchangedFiles="true" />
-    </Target>
-
-    <Target Name="IncludeAppPluginsContent" BeforeTargets="GetCopyToOutputDirectoryItems;GetCopyToPublishDirectoryItems;">
-        <ItemGroup>
-            <_AppPluginsFiles Include="App_Plugins\**" />
-
-            <ContentWithTargetPath
-                Include="@(_AppPluginsFiles)"
-                Exclude="@(ContentWithTargetPath)"
-                TargetPath="%(Identity)"
-                CopyToOutputDirectory="PreserveNewest"
-                CopyToPublishDirectory="PreserveNewest"/>
-        </ItemGroup>
-    </Target>
-
-    <!-- 
-        The set of files to publish is generated really early and doesn't currently account for files added by targets e.g. BeforeBuild.
-        A fix was put in place in Web SDK to update for wwwwroot in case someone runs npm build etc in a target, we're borrowing their trick.
-        https://github.com/dotnet/sdk/blob/e2b2b1a4ac56c955b84d62fe71cda3b6f258b42b/src/WebSdk/Publish/Targets/ComputeTargets/Microsoft.NET.Sdk.Publish.ComputeFiles.targets
-     -->
-    <Target Name="IncludeUmbracoFolderContent" BeforeTargets="GetCopyToOutputDirectoryItems;GetCopyToPublishDirectoryItems;">
-        <ItemGroup>
-            <_UmbracoFolderFiles Include="umbraco\config\**" />
-            <_UmbracoFolderFiles Include="umbraco\PartialViewMacros\**" />
-            <_UmbracoFolderFiles Include="umbraco\UmbracoBackOffice\**" />
-            <_UmbracoFolderFiles Include="umbraco\UmbracoInstall\**" />
-            <_UmbracoFolderFiles Include="umbraco\UmbracoWebsite\**" />
-            <_UmbracoFolderFiles Include="umbraco\UmbracoWebsite\**" />
-            <_UmbracoFolderFiles Include="umbraco\Licenses\**" />
-
-            <!-- This could be handled in deploy if it's not already -->
-            <_UmbracoFolderFiles Include="umbraco\Deploy\**" />
-
-            <ContentWithTargetPath
-                Include="@(_UmbracoFolderFiles)"
-                Exclude="@(ContentWithTargetPath)"
-                TargetPath="%(Identity)"
-                CopyToOutputDirectory="PreserveNewest"
-                CopyToPublishDirectory="PreserveNewest"/>
-        </ItemGroup>
-    </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\$(UmbracoWwwrootName)\" />
-        </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>
-
-    <Target Name="IncludeUmbracoRazorFiles" BeforeTargets="ResolveRazorGenerateInputs">
-        <ItemGroup>
-            <Content Include="$(MSBuildProjectDirectory)\umbraco\**\*.cshtml" Exclude="@(Content)" />
-        </ItemGroup>
-    </Target>
-
-</Project>

build/build-bootstrap.ps1

@@ -1,95 +0,0 @@
-
-  # this script should be dot-sourced into the build.ps1 scripts
-  # right after the parameters declaration
-  # ie
-  # . "$PSScriptRoot\build-bootstrap.ps1"
-
-  # THIS FILE IS DISTRIBUTED AS PART OF UMBRACO.BUILD
-  # DO NOT MODIFY IT - ALWAYS USED THE COMMON VERSION
-
-  # ################################################################
-  # BOOTSTRAP
-  # ################################################################
-
-  # reset errors
-  $error.Clear()
-
-  # ensure we have temp folder for downloads
-  $scriptRoot = "$PSScriptRoot"
-  $scriptTemp = "$scriptRoot\temp"
-  if (-not (test-path $scriptTemp)) { mkdir $scriptTemp > $null }
-
-  # get NuGet
-  $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/umbracoprereleases/api/v3/index.json"
-  if (-not $local)
-  {
-    $source = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-    if ((test-path $nuget) -and ((ls $nuget).CreationTime -lt [DateTime]::Now.AddDays(-$cache)))
-    {
-      Remove-Item $nuget -force -errorAction SilentlyContinue > $null
-    }
-    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." }
-    }
-  }
-  elseif (-not (test-path $nuget))
-  {
-    throw "Failed to locate NuGet.exe."
-  }
-
-  # NuGet notes
-  # As soon as we use -ConfigFile, NuGet uses that file, and only that file, and does not
-  # merge configuration from system level. See comments in NuGet.Client solution, class
-  # NuGet.Configuration.Settings, method LoadDefaultSettings.
-  # For NuGet to merge configurations, it needs to "find" the file in the current directory,
-  # or above. Which means we cannot really use -ConfigFile but instead have to have Umbraco's
-  # NuGet.config file at root, and always run NuGet.exe while at root or in a directory below
-  # root.
-
-  $solutionRoot = "$scriptRoot\.."
-  $testPwd = [System.IO.Path]::GetFullPath($pwd.Path) + "\"
-  $testRoot = [System.IO.Path]::GetFullPath($solutionRoot) + "\"
-  if (-not $testPwd.ToLower().StartsWith($testRoot.ToLower()))
-  {
-      throw "Cannot run outside of the solution's root."
-  }
-
-  # get the build system
-  if (-not $local)
-  {
-    $params = "-OutputDirectory", $scriptTemp, "-Verbosity", "quiet", "-PreRelease", "-Source", $nugetsourceUmbraco
-    &$nuget install Umbraco.Build @params
-    if (-not $?) { throw "Failed to download Umbraco.Build." }
-  }
-
-  # ensure we have the build system
-  $ubuildPath = ls "$scriptTemp\Umbraco.Build.*" | sort -property CreationTime -descending | select -first 1
-  if (-not $ubuildPath)
-  {
-    throw "Failed to locate the build system."
-  }
-
-  # boot the build system
-  # this creates $global:ubuild
-  return &"$ubuildPath\ps\Boot.ps1"
-
-  # at that point the build.ps1 script must boot the build system
-  # eg
-  # $ubuild.Boot($ubuildPath.FullName, [System.IO.Path]::GetFullPath("$scriptRoot\.."),
-  #   @{ Local = $local; With7Zip = $false; WithNode = $false },
-  #   @{ continue = $continue })
-  # if (-not $?) { throw "Failed to boot the build system." }
-  #
-  # and it's good practice to report
-  # eg
-  # Write-Host "Umbraco.Whatever Build"
-  # Write-Host "Umbraco.Build v$($ubuild.BuildVersion)"
-
-  # eof

build/build.ps1

@@ -1,526 +0,0 @@
-
-  param (
-    # get, don't execute
-    [Parameter(Mandatory=$false)]
-    [Alias("g")]
-    [switch] $get = $false,
-
-    # run local, don't download, assume everything is ready
-    [Parameter(Mandatory=$false)]
-    [Alias("l")]
-    [Alias("loc")]
-    [switch] $local = $false,
-
-	  # enable docfx
-    [Parameter(Mandatory=$false)]
-    [Alias("doc")]
-    [switch] $docfx = $false,
-
-    # keep the build directories, don't clear them
-    [Parameter(Mandatory=$false)]
-    [Alias("c")]
-    [Alias("cont")]
-    [switch] $continue = $false,
-
-    # execute a command
-    [Parameter(Mandatory=$false, ValueFromRemainingArguments=$true)]
-    [String[]]
-    $command
-  )
-
-  # ################################################################
-  # BOOTSTRAP
-  # ################################################################
-
-  # create and boot the buildsystem
-  $ubuild = &"$PSScriptRoot\build-bootstrap.ps1"
-  if (-not $?) { return }
-  $ubuild.Boot($PSScriptRoot,
-    @{ Local = $local; WithDocFx = $docfx },
-    @{ Continue = $continue })
-  if ($ubuild.OnError()) { return }
-
-  Write-Host "Umbraco CMS Build"
-  Write-Host "Umbraco.Build v$($ubuild.BuildVersion)"
-
-  # ################################################################
-  # TASKS
-  # ################################################################
-
-  $ubuild.DefineMethod("SetMoreUmbracoVersion",
-  {
-    param ( $semver )
-
-    $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\Properties\launchSettings.json"
-    $this.ReplaceFileText($filePath, `
-      "http://localhost:(\d+)?", `
-      "http://localhost:$port")
-  })
-
-  $ubuild.DefineMethod("SandboxNode",
-  {
-    $global:node_path = $env:path
-    $nodePath = $this.BuildEnv.NodePath
-    $gitExe = (Get-Command git).Source
-    if (-not $gitExe) { $gitExe = (Get-Command git).Path }
-    $gitPath = [System.IO.Path]::GetDirectoryName($gitExe)
-    $env:path = "$nodePath;$gitPath"
-
-    $global:node_nodepath = $this.ClearEnvVar("NODEPATH")
-    $global:node_npmcache = $this.ClearEnvVar("NPM_CONFIG_CACHE")
-    $global:node_npmprefix = $this.ClearEnvVar("NPM_CONFIG_PREFIX")
-
-    # https://github.com/gruntjs/grunt-contrib-connect/issues/235
-    $this.SetEnvVar("NODE_NO_HTTP2", "1")
-  })
-
-  $ubuild.DefineMethod("RestoreNode",
-  {
-    $env:path = $node_path
-
-    $this.SetEnvVar("NODEPATH", $node_nodepath)
-    $this.SetEnvVar("NPM_CONFIG_CACHE", $node_npmcache)
-    $this.SetEnvVar("NPM_CONFIG_PREFIX", $node_npmprefix)
-
-    $this.ClearEnvVar("NODE_NO_HTTP2")
-  })
-
-  $ubuild.DefineMethod("CompileBelle",
-  {
-    $src = "$($this.SolutionRoot)\src"
-    $log = "$($this.BuildTemp)\belle.log"
-
-
-    Write-Host "Compile Belle"
-    Write-Host "Logging to $log"
-
-    # get a temp clean node env (will restore)
-    $this.SandboxNode()
-
-    # stupid PS is going to gather all "warnings" in $error
-    # so we have to take care of it else they'll bubble and kill the build
-    if ($error.Count -gt 0) { return }
-
-    try {
-        Push-Location "$($this.SolutionRoot)\src\Umbraco.Web.UI.Client"
-        Write-Output "" > $log
-
-        Write-Output "### node version is:" > $log
-        node -v >> $log 2>&1
-        if (-not $?) { throw "Failed to report node version." }
-
-        Write-Output "### npm version is:" >> $log 2>&1
-        npm -v >> $log 2>&1
-        if (-not $?) { throw "Failed to report npm version." }
-
-        Write-Output "### clean npm cache" >> $log 2>&1
-        npm cache clean --force >> $log 2>&1
-        $error.Clear() # that one can fail 'cos security bug - ignore
-
-        Write-Output "### npm ci" >> $log 2>&1
-        npm ci >> $log 2>&1
-        Write-Output ">> $? $($error.Count)" >> $log 2>&1
-        # Don't really care about the messages from npm ci making us think there are errors
-        $error.Clear()
-
-        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;
-		$error | ForEach-Object {
-			# Find which of the errors is the ExperimentalWarning
-			if($_.ToString().Contains("ExperimentalWarning: The fs.promises API is experimental")) {
-				[void]$indexes.Add($index)
-			}
-			$index++
-		}
-		$indexes | ForEach-Object {
-			# 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
-
-        # FIXME: should we filter the log to find errors?
-        #get-content .\build.tmp\belle.log | %{ if ($_ -match "build") { write $_}}
-
-        # restore
-        $this.RestoreNode()
-    }
-
-    # setting node_modules folder to hidden
-    # used to prevent VS13 from crashing on it while loading the websites project
-    # also makes sure aspnet compiler does not try to handle rogue files and chokes
-    # in VSO with Microsoft.VisualC.CppCodeProvider -related errors
-    # use get-item -force 'cos it might be hidden already
-    Write-Host "Set hidden attribute on node_modules"
-    $dir = Get-Item -force "$src\Umbraco.Web.UI.Client\node_modules"
-    $dir.Attributes = $dir.Attributes -bor ([System.IO.FileAttributes]::Hidden)
-  })
-
-  $ubuild.DefineMethod("CompileUmbraco",
-  {
-    $buildConfiguration = "Release"
-
-    $src = "$($this.SolutionRoot)\src"
-    $log = "$($this.BuildTemp)\build.umbraco.log"
-
-    Write-Host "Compile Umbraco"
-    Write-Host "Logging to $log"
-
-   & dotnet build "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
-      --configuration $buildConfiguration `
-      --output "$($this.BuildTemp)\bin\\" `
-      > $log
-
-   # get files into WebApp\bin
-    & dotnet publish "$src\Umbraco.Web.UI\Umbraco.Web.UI.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\umbraco", "*", "$($this.BuildTemp)\WebApp\umbraco")
-    $excludeUmbracoDirs = @("$($this.BuildTemp)\WebApp\umbraco\lib","$($this.BuildTemp)\WebApp\umbraco\Data","$($this.BuildTemp)\WebApp\umbraco\Logs")
-    $this.RemoveDirectory($excludeUmbracoDirs)
-    $this.CopyFiles("$($this.SolutionRoot)\src\Umbraco.Web.UI\Views", "*", "$($this.BuildTemp)\WebApp\Views")
-    Copy-Item "$($this.SolutionRoot)\src\Umbraco.Web.UI\appsettings.json" "$($this.BuildTemp)\WebApp"
-
-    if (-not $?) { throw "Failed to compile Umbraco.Web.UI." }
-
-    # /p:UmbracoBuild tells the csproj that we are building from PS, not VS
-  })
-
-  $ubuild.DefineMethod("CompileJsonSchema",
-  {
-    Write-Host "Generating JSON Schema for AppSettings"
-    Write-Host "Logging to $($this.BuildTemp)\json.schema.log"
-
-    ## NOTE: Need to specify the outputfile to point to the build temp folder
-    &dotnet run --project "$($this.SolutionRoot)\src\JsonSchema\JsonSchema.csproj" `
-        -c Release > "$($this.BuildTemp)\json.schema.log" `
-        -- `
-        --outputFile "$($this.BuildTemp)\WebApp\umbraco\config\appsettings-schema.json"
-  })
-
-  $ubuild.DefineMethod("PrepareTests",
-  {
-    Write-Host "Prepare Tests"
-
-    # FIXME: - idea is to avoid rebuilding everything for tests
-    # but because of our weird assembly versioning (with .* stuff)
-    # everything gets rebuilt all the time...
-    #Copy-Files "$tmp\bin" "." "$tmp\tests"
-
-    # data
-    Write-Host "Copy data files"
-    if (-not (Test-Path -Path "$($this.BuildTemp)\tests\Packaging" ))
-    {
-      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")
-
-    # required for package install tests
-    if (-not (Test-Path -Path "$($this.BuildTemp)\tests\bin" ))
-    {
-      Write-Host "Create bin directory"
-      mkdir "$($this.BuildTemp)\tests\bin" > $null
-    }
-  })
-
-  $ubuild.DefineMethod("CompileTests",
-  {
-    $buildConfiguration = "Release"
-    $log = "$($this.BuildTemp)\msbuild.tests.log"
-
-    Write-Host "Compile Tests"
-    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/
-    &dotnet msbuild "$($this.SolutionRoot)\tests\Umbraco.Tests\Umbraco.Tests.csproj" `
-      -target:Build `
-      -property:WarningLevel=0 `
-      -property:Configuration=$buildConfiguration `
-      -property:Platform=AnyCPU `
-      -property:UseWPP_CopyWebApplication=True `
-      -property:PipelineDependsOnBuild=False `
-      -property:OutDir="$($this.BuildTemp)\tests\\" `
-      -property:Verbosity=minimal `
-      -property: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
-  })
-
-  $ubuild.DefineMethod("PreparePackages",
-  {
-    Write-Host "Prepare Packages"
-
-    $src = "$($this.SolutionRoot)\src"
-    $tmp = "$($this.BuildTemp)"
-
-    # cleanup build
-    Write-Host "Clean build"
-    $this.RemoveFile("$tmp\bin\*.dll.config")
-    $this.RemoveFile("$tmp\WebApp\bin\*.dll.config")
-
-    # cleanup presentation
-    Write-Host "Cleanup presentation"
-    $this.RemoveDirectory("$tmp\WebApp\umbraco.presentation")
-
-    # create directories
-    Write-Host "Create directories"
-    mkdir "$tmp\WebApp\App_Data" > $null
-    #mkdir "$tmp\WebApp\Media" > $null
-    #mkdir "$tmp\WebApp\Views" > $null
-
-    # copy various files
-    Write-Host "Copy xml documentation"
-    Copy-Item -force "$tmp\bin\*.xml" "$tmp\WebApp\bin"
-
-    # offset the modified timestamps on all umbraco dlls, as WebResources
-    # break if date is in the future, which, due to timezone offsets can happen.
-    Write-Host "Offset dlls timestamps"
-    Get-ChildItem -r "$tmp\*.dll" | ForEach-Object {
-      $_.CreationTime = $_.CreationTime.AddHours(-11)
-      $_.LastWriteTime = $_.LastWriteTime.AddHours(-11)
-    }
-
-    # copy libs
-    Write-Host "Copy SqlCE libraries"
-    $nugetPackages = $env:NUGET_PACKAGES
-    if (-not $nugetPackages)
-    {
-      $nugetPackages = [System.Environment]::ExpandEnvironmentVariables("%userprofile%\.nuget\packages")
-    }
-
-    # copy Belle
-    Write-Host "Copy Belle"
-    $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\assets", "*", "$tmp\WebApp\wwwroot\umbraco\assets")
-    $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\js", "*", "$tmp\WebApp\wwwroot\umbraco\js")
-    $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\lib", "*", "$tmp\WebApp\wwwroot\umbraco\lib")
-    $this.CopyFiles("$src\Umbraco.Web.UI\wwwroot\umbraco\views", "*", "$tmp\WebApp\wwwroot\umbraco\views")
-  })
-
-
-  $ubuild.DefineMethod("PrepareBuild",
-  {
-    Write-host "Set environment"
-    $env:UMBRACO_VERSION=$this.Version.Semver.ToString()
-    $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")
-    {
-      Write-host "Set VSO environment"
-      # set environment variable for VSO
-      # https://github.com/Microsoft/vsts-tasks/issues/375
-      # https://github.com/Microsoft/vsts-tasks/blob/master/docs/authoring/commands.md
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_VERSION;]$($this.Version.Semver.ToString())")
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_RELEASE;]$($this.Version.Release)")
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_COMMENT;]$($this.Version.Comment)")
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_BUILD;]$($this.Version.Build)")
-
-      Write-Host ("##vso[task.setvariable variable=UMBRACO_TMP;]$($this.SolutionRoot)\build.tmp")
-    }
-  })
-
-  $nugetsourceUmbraco = "https://api.nuget.org/v3/index.json"
-
-  $ubuild.DefineMethod("RestoreNuGet",
-  {
-    Write-Host "Restore NuGet"
-    Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log"
-  	$params = "-Source", $nugetsourceUmbraco
-    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\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.SolutionRoot)\templates"
-
-    Write-Host "Create NuGet packages"
-
-    &dotnet pack "$($this.SolutionRoot)\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)" `
-        -Version "$($this.Version.Semver.ToString())" `
-        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cms.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms." }
-
-    &$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())" `
-        -NoDefaultExcludes `
-        -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"))
-    {
-      Write-Host "Run PostPackageNuGet hook"
-      $this.PostPackageNuGet();
-      if (-not $?) { throw "Failed to run hook." }
-    }
-  })
-
-  $ubuild.DefineMethod("VerifyNuGet",
-  {
-    $this.VerifyNuGetConsistency(
-      ("UmbracoCms"),
-      ("Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.Web.UI", "Umbraco.Examine.Lucene", "Umbraco.PublishedCache.NuCache", "Umbraco.Web.Common", "Umbraco.Web.Website", "Umbraco.Web.BackOffice", "Umbraco.Persistence.SqlCe"))
-    if ($this.OnError()) { return }
-  })
-
-  $ubuild.DefineMethod("PrepareCSharpDocs",
-  {
-    Write-Host "Prepare C# Documentation"
-
-    $src = "$($this.SolutionRoot)\src"
-    $tmp = $this.BuildTemp
-    $out = $this.BuildOutput
-    $DocFxJson = Join-Path -Path $src "\ApiDocs\docfx.json"
-    $DocFxSiteOutput = Join-Path -Path $tmp "\_site\*.*"
-
-    # run DocFx
-    $DocFx = $this.BuildEnv.DocFx
-
-    & $DocFx metadata $DocFxJson
-    & $DocFx build $DocFxJson
-
-    # zip it
-    & $this.BuildEnv.Zip a -tzip -r "$out\csharp-docs.zip" $DocFxSiteOutput
-  })
-
-  $ubuild.DefineMethod("PrepareAngularDocs",
-  {
-    Write-Host "Prepare Angular Documentation"
-
-    $src = "$($this.SolutionRoot)\src"
-    $out = $this.BuildOutput
-
-    # 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"
-    cd $src\Umbraco.Web.UI.Docs
-
-    "Generating the docs and waiting before executing the next commands"
-	  & npm ci
-    & npx gulp docs
-
-    Pop-Location
-
-    # change baseUrl
-    $BaseUrl = "https://apidocs.umbraco.com/v9/ui/"
-    $IndexPath = "./api/index.html"
-    (Get-Content $IndexPath).replace('origin + location.href.substr(origin.length).replace(rUrl, indexFile)', "`'" + $BaseUrl + "`'") | Set-Content $IndexPath
-
-    # zip it
-    & $this.BuildEnv.Zip a -tzip -r "$out\ui-docs.zip" "$src\Umbraco.Web.UI.Docs\api\*.*"
-  })
-
-  $ubuild.DefineMethod("Build",
-  {
-    $error.Clear()
-
-    $this.PrepareBuild()
-    if ($this.OnError()) { return }
-    $this.RestoreNuGet()
-    if ($this.OnError()) { return }
-    $this.CompileBelle()
-    if ($this.OnError()) { return }
-    $this.CompileUmbraco()
-    if ($this.OnError()) { return }
-    $this.CompileJsonSchema()
-    if ($this.OnError()) { return }
-    $this.PrepareTests()
-    if ($this.OnError()) { return }
-    $this.CompileTests()
-    if ($this.OnError()) { return }
-    # not running tests
-    $this.PreparePackages()
-    if ($this.OnError()) { return }
-    $this.VerifyNuGet()
-    if ($this.OnError()) { return }
-    $this.PackageNuGet()
-    if ($this.OnError()) { return }
-    $this.PostPackageHook()
-    if ($this.OnError()) { return }
-
-    Write-Host "Done"
-  })
-
-  $ubuild.DefineMethod("PostPackageHook",
-  {
-    # run hook
-    if ($this.HasMethod("PostPackage"))
-    {
-      Write-Host "Run PostPackage hook"
-      $this.PostPackage();
-      if (-not $?) { throw "Failed to run hook." }
-    }
-  })
-
-  # ################################################################
-  # RUN
-  # ################################################################
-
-  # configure
-  $ubuild.ReleaseBranches = @( "master" )
-
-  # run
-  if (-not $get)
-  {
-    if ($command.Length -eq 0)
-    {
-      $command = @( "Build" )
-    }
-    $ubuild.RunMethod($command);
-    if ($ubuild.OnError()) { return }
-  }
-  if ($get) { return $ubuild }

build/csharp-docs/docfx.json

@@ -3,18 +3,17 @@
     {
       "src": [
         {
-          "src": "../",
+          "src": "../../src",
           "files": [
-            "**/*.csproj",
-            "**/Umbraco.Infrastructure/**/*.cs"
+            "**/*.csproj"
           ],
           "exclude": [
             "**/obj/**",
             "**/bin/**",
             "**/Umbraco.Web.csproj",
-            "**/Umbraco.Infrastructure.csproj",
             "**/Umbraco.Web.UI.csproj",
-            "**/**.Test**/*.csproj"
+            "**/Umbraco.Cms.StaticAssets.csproj",
+            "**/JsonSchema.csproj"
           ]
         }
       ],

build/nightly-build-trigger.yml

@@ -0,0 +1,35 @@
+name: Nightly_$(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+pr: none
+trigger: none
+
+schedules:
+- cron: '0 0 * * *'
+  displayName: Daily midnight build
+  branches:
+    include:
+    - v10/dev
+    - v12/dev
+    - v13/dev
+    - v14/dev
+
+steps:
+- checkout: none
+- task: TriggerBuild@4
+  inputs:
+    definitionIsInCurrentTeamProject: true
+    buildDefinition: '301'
+    queueBuildForUserThatTriggeredBuild: true
+    ignoreSslCertificateErrors: false
+    useSameSourceVersion: false
+    useCustomSourceVersion: false
+    useSameBranch: true
+    waitForQueuedBuildsToFinish: false
+    storeInEnvironmentVariable: false
+    templateParameters: 'sqlServerIntegrationTests: true, forceReleaseTestFilter: true, myGetDeploy: true, isNightly: true'
+    authenticationMethod: 'OAuth Token'
+    enableBuildInQueueCondition: false
+    dependentOnSuccessfulBuildCondition: false
+    dependentOnFailedBuildCondition: false
+    checkbuildsoncurrentbranch: false
+    failTaskIfConditionsAreNotFulfilled: false

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.300",
+    "rollForward": "latestFeature"
+  }
+}

opened-issue-first-comment.yml

@@ -0,0 +1,53 @@
+name: issue-first-response
+
+on:
+  issues:
+    types: [opened]
+
+jobs: 
+  send-response:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write    
+    steps:
+      - name: Install dependencies
+        run: |
+          npm install node-fetch@2
+      - name: Fetch random comment 🗣️ and add it to the issue
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const fetch = require('node-fetch')
+
+            const response = await fetch('https://collaboratorsv2.euwest01.umbraco.io/umbraco/api/comments/PostComment', {
+              method: 'post',
+              body: JSON.stringify({
+                repo: '${{ github.repository }}',
+                number: '${{ github.event.number }}',
+                actor: '${{ github.actor }}',
+                commentType: 'opened-issue-first-comment'
+              }),
+              headers: {
+                'Authorization': 'Bearer ${{ secrets.OUR_BOT_API_TOKEN }}',
+                'Content-Type': 'application/json'
+              }
+            });
+
+            try {
+                const data = await response.text();
+
+                if(response.status === 200 && data !== '') {
+                    github.rest.issues.createComment({
+                        issue_number: context.issue.number,
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        body: data
+                    });
+                } else {
+                    console.log("Status code did not indicate success:", response.status);
+                    console.log("Returned data:", data);
+                }
+            } catch(error) {
+                console.log(error);
+            }

src/Directory.Build.props

@@ -1,42 +0,0 @@
-<Project>
-  <!-- Enable multi-level merging -->
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-  <PropertyGroup>
-    <Version>9.5.1</Version>
-    <AssemblyVersion>9.5.1</AssemblyVersion>
-    <InformationalVersion>9.5.1</InformationalVersion>
-    <FileVersion>9.5.1</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>
-
-  <PropertyGroup>
-    <!-- SourceLink: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element)-->
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-
-    <!-- SourceLink: Embed source files that are not tracked by the source control manager in the PDB -->
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-    <!-- SourceLink: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
-
-  <!-- SourceLink: Deterministic -->
-  <!-- https://github.com/clairernovotny/DeterministicBuilds -->
-  <!-- Only for Azure Pipelines CI Build -->
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-</Project>

src/Directory.Packages.props

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <NoWarn>NU1507</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
+    <PackageVersion Include="Examine" Version="3.0.1" />
+    <PackageVersion Include="Examine.Core" Version="3.0.1" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.11.54" />
+    <PackageVersion Include="IPNetwork2" Version="2.6.618" />
+    <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.6" />
+    <PackageVersion Include="MailKit" Version="3.2.0" />
+    <PackageVersion Include="Markdown" Version="2.2.1" />
+    <PackageVersion Include="MessagePack" Version="2.5.187" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="6.0.24" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="6.0.24" />
+    <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
+    <PackageVersion Include="MiniProfiler.Shared" Version="4.2.22" />
+    <PackageVersion Include="ncrontab" Version="3.3.3" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NPoco.SqlServer" Version="5.3.2" />
+    <PackageVersion Include="Serilog" Version="2.12.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageVersion Include="Serilog.Enrichers.Process" Version="2.0.2" />
+    <PackageVersion Include="Serilog.Enrichers.Thread" Version="3.1.0" />
+    <PackageVersion Include="Serilog.Expressions" Version="3.4.1" />
+    <PackageVersion Include="Serilog.Extensions.Hosting" Version="4.2.0" />
+    <PackageVersion Include="Serilog.Formatting.Compact" Version="1.1.0" />
+    <PackageVersion Include="Serilog.Formatting.Compact.Reader" Version="1.0.5" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Map" Version="1.0.2" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.10" />
+    <PackageVersion Include="SixLabors.ImageSharp.Web" Version="2.0.2" />
+    <PackageVersion Include="Smidge.InMemory" Version="4.3.0" />
+    <PackageVersion Include="Smidge.Nuglify" Version="4.2.1" />
+    <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
+    <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageVersion Include="System.Runtime.Caching" Version="6.0.0" />
+    <PackageVersion Include="Umbraco.CSharpTest.Net.Collections" Version="14.906.1403.1085" />
+    <!--   Add dependencies that we force an update to, even that we do not use them explicitly and they seems to be taken from the framework instead of from Nuget -->
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="6.0.1" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+  </ItemGroup>
+</Project>

src/JsonSchema/AppSettings.cs

@@ -16,7 +16,7 @@ namespace JsonSchema
         /// <summary>
         ///     Gets or sets the Umbraco
         /// </summary>
-        public UmbracoDefinition Umbraco { get; set; }
+        public UmbracoDefinition? Umbraco { get; set; }
 
         /// <summary>
         ///     Configuration of Umbraco CMS and packages
@@ -24,76 +24,90 @@ namespace JsonSchema
         internal class UmbracoDefinition
         {
             // ReSharper disable once InconsistentNaming
-            public CmsDefinition CMS { get; set; }
+            public CmsDefinition? CMS { get; set; }
 
-            public FormsDefinition Forms { get; set; }
+            public FormsDefinition? Forms { get; set; }
 
-            public DeployDefinition Deploy { get; set; }
+            public DeployDefinition? Deploy { get; set; }
 
             /// <summary>
             ///     Configurations for the Umbraco CMS
             /// </summary>
             public class CmsDefinition
             {
-                public ActiveDirectorySettings ActiveDirectory { get; set; }
+                public ContentSettings? Content { get; set; }
+                public CoreDebugSettings? Debug { get; set; }
 
-                public ContentSettings Content { get; set; }
+                public ExceptionFilterSettings? ExceptionFilter { get; set; }
 
-                public ExceptionFilterSettings ExceptionFilter { get; set; }
+                public ModelsBuilderSettings? ModelsBuilder { get; set; }
 
-                public ModelsBuilderSettings ModelsBuilder { get; set; }
+                public GlobalSettings? Global { get; set; }
 
-                public GlobalSettings Global { get; set; }
+                public HealthChecksSettings? HealthChecks { get; set; }
 
-                public HealthChecksSettings HealthChecks { get; set; }
+                public HostingSettings? Hosting { get; set; }
 
-                public HostingSettings Hosting { get; set; }
+                public ImagingSettings? Imaging { get; set; }
 
-                public ImagingSettings Imaging { get; set; }
+                public IndexCreatorSettings? Examine { get; set; }
+                public IndexingSettings? Indexing { get; set; }
 
-                public IndexCreatorSettings Examine { get; set; }
+                public KeepAliveSettings? KeepAlive { get; set; }
 
-                public KeepAliveSettings KeepAlive { get; set; }
+                public LoggingSettings? Logging { get; set; }
 
-                public LoggingSettings Logging { get; set; }
+                public NuCacheSettings? NuCache { get; set; }
 
-                public MemberPasswordConfigurationSettings MemberPassword { get; set; }
+                public RequestHandlerSettings? RequestHandler { get; set; }
 
-                public NuCacheSettings NuCache { get; set; }
+                public RuntimeSettings? Runtime { get; set; }
 
-                public RequestHandlerSettings RequestHandler { get; set; }
+                public SecuritySettings? Security { get; set; }
 
-                public RuntimeSettings Runtime { get; set; }
+                public TourSettings? Tours { get; set; }
 
-                public SecuritySettings Security { get; set; }
+                public TypeFinderSettings? TypeFinder { get; set; }
 
-                public TourSettings Tours { get; set; }
+                public WebRoutingSettings? WebRouting { get; set; }
 
-                public TypeFinderSettings TypeFinder { get; set; }
+                public UmbracoPluginSettings? Plugins { get; set; }
 
-                public UserPasswordConfigurationSettings UserPassword { get; set; }
+                public UnattendedSettings? Unattended { get; set; }
 
-                public WebRoutingSettings WebRouting { get; set; }
+                public RichTextEditorSettings? RichTextEditor { get; set; }
 
-                public UmbracoPluginSettings Plugins { get; set; }
+                public RuntimeMinificationSettings? RuntimeMinification { get; set; }
 
-                public UnattendedSettings Unattended { get; set; }
+                public BasicAuthSettings? BasicAuth { get; set; }
 
-                public RichTextEditorSettings RichTextEditor { get; set; }
+                public PackageMigrationSettings? PackageMigration { get; set; }
 
-                public RuntimeMinificationSettings RuntimeMinification { get; set; }
+                public LegacyPasswordMigrationSettings? LegacyPasswordMigration { get; set; }
 
-                public BasicAuthSettings BasicAuth { get; set; }
+                public ContentDashboardSettings? ContentDashboard { get; set; }
 
-                public PackageMigrationSettings PackageMigration { get; set; }
+                public HelpPageSettings? HelpPage { get; set; }
 
-                public LegacyPasswordMigrationSettings LegacyPasswordMigration { get; set; }
+                public InstallDefaultData? InstallDefaultData { get; set; }
 
-                public ContentDashboardSettings ContentDashboard { get; set; }
+                public DataTypesSettings? DataTypes { get; set; }
 
-                public HelpPageSettings HelpPage { get; set; }
+                public MarketplaceSettings? Marketplace { get; set; }
+            }
 
-                public InstallDefaultDataSettings DefaultDataCreation { get; set; }
+            /// <summary>
+            ///     Configurations for the Umbraco CMS InstallDefaultData configuration.
+            /// </summary>
+            public class InstallDefaultData
+            {
+                public InstallDefaultDataSettings? Languages { get; set; }
+
+                public InstallDefaultDataSettings? DataTypes { get; set; }
+
+                public InstallDefaultDataSettings? MediaTypes { get; set; }
+
+                public InstallDefaultDataSettings? MemberTypes { get; set; }
             }
 
             /// <summary>
@@ -101,24 +115,24 @@ namespace JsonSchema
             /// </summary>
             public class FormsDefinition
             {
-                public FormDesignSettings FormDesign { get; set; }
+                public FormDesignSettings? FormDesign { get; set; }
 
-                public PackageOptionSettings Options { get; set; }
+                public PackageOptionSettings? Options { get; set; }
 
-                public Umbraco.Forms.Core.Configuration.SecuritySettings Security { get; set; }
+                public Umbraco.Forms.Core.Configuration.SecuritySettings? Security { get; set; }
 
-                public FieldTypesDefinition FieldTypes { get; set; }
+                public FieldTypesDefinition? FieldTypes { get; set; }
 
                 /// <summary>
                 ///     Configurations for the Umbraco Forms Field Types
                 /// </summary>
                 public class FieldTypesDefinition
                 {
-                    public DatePickerSettings DatePicker { get; set; }
+                    public DatePickerSettings? DatePicker { get; set; }
 
-                    public Recaptcha2Settings Recaptcha2 { get; set; }
+                    public Recaptcha2Settings? Recaptcha2 { get; set; }
 
-                    public Recaptcha3Settings Recaptcha3 { get; set; }
+                    public Recaptcha3Settings? Recaptcha3 { get; set; }
                 }
             }
 
@@ -127,11 +141,11 @@ namespace JsonSchema
             /// </summary>
             public class DeployDefinition
             {
-                public DeploySettings Settings { get; set; }
+                public DeploySettings? Settings { get; set; }
 
-                public DeployProjectConfig Project { get; set; }
+                public DeployProjectConfig? Project { get; set; }
 
-                public DebugSettings Debug { get; set; }
+                public DebugSettings? Debug { get; set; }
             }
         }
     }

src/JsonSchema/JsonSchema.csproj

@@ -1,41 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
+    <EnablePackageValidation>false</EnablePackageValidation>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
-    <PackageReference Include="NJsonSchema" Version="10.5.2" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="Umbraco.Deploy.Core" Version="9.2.0" />
-    <PackageReference Include="Umbraco.Forms.Core" Version="9.2.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="NJsonSchema" Version="10.9.0" />
   </ItemGroup>
-    <ItemGroup>
-      <PackageReference Include="CommandLineParser" Version="2.8.0" />
-      <PackageReference Include="NJsonSchema" Version="10.5.2" />
-      <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-      <PackageReference Include="Umbraco.Deploy.Core" Version="9.4.0" />
-      <PackageReference Include="Umbraco.Forms.Core" Version="9.4.0" />
-    </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+    <PackageReference Include="Umbraco.Deploy.Core" Version="10.4.0" />
+    <PackageReference Include="Umbraco.Forms.Core" Version="10.5.4" />
   </ItemGroup>
-
-  <!--  Copy Forms XML docs-->
-  <PropertyGroup>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-  </PropertyGroup>
-
-  <Target Name="CopyPackagesXml" BeforeTargets="Build">
-    <ItemGroup>
-      <PackageReferenceFiles Include="$(NugetPackageRoot)%(PackageReference.Identity)\%(PackageReference.Version)%(PackageReference.CopyToOutputDirectory)\lib\**\*.xml" />
-    </ItemGroup>
-    <Copy SourceFiles="@(PackageReferenceFiles)" DestinationFolder="$(OutDir)" />
-  </Target>
-
 </Project>

src/JsonSchema/NamespacePrefixedSchemaNameGenerator.cs

@@ -8,6 +8,6 @@ namespace JsonSchema
 {
     internal class NamespacePrefixedSchemaNameGenerator : DefaultSchemaNameGenerator
     {
-        public override string Generate(Type type) => type.Namespace.Replace(".", string.Empty) + base.Generate(type);
+        public override string Generate(Type type) => type.Namespace?.Replace(".", string.Empty) + base.Generate(type);
     }
 }

src/JsonSchema/Options.cs

@@ -7,7 +7,7 @@ namespace JsonSchema
 {
     internal class Options
     {
-        [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI/umbraco/config/appsettings-schema.json")]
-        public string OutputFile { get; set; }
+        [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "appsettings-schema.json")]
+        public string OutputFile { get; set; } = null!;
     }
 }

src/JsonSchema/Program.cs

@@ -31,7 +31,7 @@ namespace JsonSchema
 
             var path = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, options.OutputFile));
             Console.WriteLine("Path to use {0}", path);
-            Directory.CreateDirectory(Path.GetDirectoryName(path));
+            Directory.CreateDirectory(Path.GetDirectoryName(path)!);
             Console.WriteLine("Ensured directory exists");
             await File.WriteAllTextAsync(path, schema);
 

src/JsonSchema/UmbracoJsonSchemaGenerator.cs

@@ -1,11 +1,10 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Net.Http;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NJsonSchema.Generation;
+using Umbraco.Cms.Core.Configuration.Models;
 
 namespace JsonSchema
 {
@@ -43,14 +42,17 @@ namespace JsonSchema
 
             var result = await response.Content.ReadAsStringAsync();
 
-            return JsonConvert.DeserializeObject<JObject>(result);
+            return JsonConvert.DeserializeObject<JObject>(result)!;
         }
 
         private JObject GenerateUmbracoSchema()
         {
             NJsonSchema.JsonSchema schema = _innerGenerator.Generate(typeof(AppSettings));
 
-            return JsonConvert.DeserializeObject<JObject>(schema.ToJson());
+            // TODO: when the "UmbracoPath" setter is removed from "GlobalSettings" (scheduled for V12), remove this line as well
+            schema.Definitions["UmbracoCmsCoreConfigurationModelsGlobalSettings"]?.Properties?.Remove(nameof(GlobalSettings.UmbracoPath));
+
+            return JsonConvert.DeserializeObject<JObject>(schema.ToJson())!;
         }
     }
 }

src/Umbraco.Cms.ManagementApi/Builders/ProblemDetailsBuilder.cs

@@ -0,0 +1,45 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Umbraco.Cms.ManagementApi.Builders;
+
+public class ProblemDetailsBuilder
+{
+    private string? _title;
+    private string? _detail;
+    private int _status = StatusCodes.Status400BadRequest;
+    private string? _type;
+
+    public ProblemDetailsBuilder WithTitle(string title)
+    {
+        _title = title;
+        return this;
+    }
+
+    public ProblemDetailsBuilder WithDetail(string detail)
+    {
+        _detail = detail;
+        return this;
+    }
+
+    public ProblemDetailsBuilder WithStatus(int status)
+    {
+        _status = status;
+        return this;
+    }
+
+    public ProblemDetailsBuilder WithType(string type)
+    {
+        _type = type;
+        return this;
+    }
+
+    public ProblemDetails Build() =>
+        new()
+        {
+            Title = _title,
+            Detail = _detail,
+            Status = _status,
+            Type = _type ?? "Error",
+        };
+}

src/Umbraco.Cms.ManagementApi/Configuration/ConfigureMvcOptions.cs

@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Configuration;
+
+public class ConfigureMvcOptions : IConfigureOptions<MvcOptions>
+{
+    private readonly IOptions<GlobalSettings> _globalSettings;
+
+    public ConfigureMvcOptions(IOptions<GlobalSettings> globalSettings)
+    {
+        _globalSettings = globalSettings;
+    }
+
+    public void Configure(MvcOptions options)
+    {
+        // Replace the BackOfficeToken in routes.
+
+        var backofficePath = _globalSettings.Value.UmbracoPath.TrimStart(Constants.CharArrays.TildeForwardSlash);
+        options.Conventions.Add(new UmbracoBackofficeToken(Constants.Web.AttributeRouting.BackOfficeToken, backofficePath));
+
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Analytics/AllAnalyticsController.cs

@@ -0,0 +1,22 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Analytics;
+
+public class AllAnalyticsController : AnalyticsControllerBase
+{
+    [HttpGet("all")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<TelemetryLevel>), StatusCodes.Status200OK)]
+    public async Task<PagedViewModel<TelemetryLevel>> GetAll(int skip, int take)
+    {
+        TelemetryLevel[] levels = Enum.GetValues<TelemetryLevel>();
+        return await Task.FromResult(new PagedViewModel<TelemetryLevel>
+        {
+            Total = levels.Length,
+            Items = levels.Skip(skip).Take(take),
+        });
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Analytics/AnalyticsControllerBase.cs

@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Analytics;
+
+[ApiController]
+[BackOfficeRoute("api/v{version:apiVersion}/analytics")]
+[OpenApiTag("Analytics")]
+[ApiVersion("1.0")]
+public abstract class AnalyticsControllerBase : ManagementApiControllerBase
+{
+}

src/Umbraco.Cms.ManagementApi/Controllers/Analytics/GetAnalyticsController.cs

@@ -0,0 +1,18 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Analytics;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Analytics;
+
+public class GetAnalyticsController : AnalyticsControllerBase
+{
+    private readonly IMetricsConsentService _metricsConsentService;
+
+    public GetAnalyticsController(IMetricsConsentService metricsConsentService) => _metricsConsentService = metricsConsentService;
+
+    [HttpGet]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(AnalyticsLevelViewModel), StatusCodes.Status200OK)]
+    public async Task<AnalyticsLevelViewModel> Get() => await Task.FromResult(new AnalyticsLevelViewModel { AnalyticsLevel = _metricsConsentService.GetConsentLevel() });
+}

src/Umbraco.Cms.ManagementApi/Controllers/Analytics/SetAnalyticsController.cs

@@ -0,0 +1,36 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Analytics;
+using Umbraco.Cms.ManagementApi.ViewModels.Server;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Analytics;
+
+public class SetAnalyticsController : AnalyticsControllerBase
+{
+    private readonly IMetricsConsentService _metricsConsentService;
+
+    public SetAnalyticsController(IMetricsConsentService metricsConsentService) => _metricsConsentService = metricsConsentService;
+
+    [HttpPost]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<IActionResult> SetConsentLevel(AnalyticsLevelViewModel analyticsLevelViewModel)
+    {
+        if (!Enum.IsDefined(analyticsLevelViewModel.AnalyticsLevel))
+        {
+            var invalidModelProblem = new ProblemDetails
+            {
+                Title = "Invalid AnalyticsLevel value",
+                Detail = "The provided value for AnalyticsLevel is not valid",
+                Status = StatusCodes.Status400BadRequest,
+                Type = "Error",
+            };
+            return BadRequest(invalidModelProblem);
+        }
+
+        _metricsConsentService.SetConsentLevel(analyticsLevelViewModel.AnalyticsLevel);
+        return await Task.FromResult(Ok());
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Culture/AllCultureController.cs

@@ -0,0 +1,33 @@
+using System.Globalization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.ManagementApi.ViewModels.Culture;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Culture;
+
+public class AllCultureController : CultureControllerBase
+{
+    private readonly IUmbracoMapper _umbracoMapper;
+
+    public AllCultureController(IUmbracoMapper umbracoMapper) => _umbracoMapper = umbracoMapper;
+
+    /// <summary>
+    ///     Returns all cultures available for creating languages.
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<CultureViewModel>), StatusCodes.Status200OK)]
+    public async Task<PagedViewModel<CultureViewModel>> GetAll(int skip, int take)
+    {
+        IEnumerable<CultureInfo> list = CultureInfo.GetCultures(CultureTypes.AllCultures)
+            .DistinctBy(x => x.Name)
+            .OrderBy(x => x.EnglishName)
+            .Skip(skip)
+            .Take(take);
+
+        return await Task.FromResult(_umbracoMapper.Map<PagedViewModel<CultureViewModel>>(list)!);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Culture/CultureControllerBase.cs

@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Culture;
+
+[ApiController]
+[BackOfficeRoute("api/v{version:apiVersion}/culture")]
+[OpenApiTag("Culture")]
+[ApiVersion("1.0")]
+public abstract class CultureControllerBase : ManagementApiControllerBase
+{
+}

src/Umbraco.Cms.ManagementApi/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs

@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DataType.Tree;
+
+public class ChildrenDataTypeTreeController : DataTypeTreeControllerBase
+{
+    public ChildrenDataTypeTreeController(IEntityService entityService, IDataTypeService dataTypeService)
+        : base(entityService, dataTypeService)
+    {
+    }
+
+    [HttpGet("children")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<FolderTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<FolderTreeItemViewModel>>> Children(Guid parentKey, int skip = 0, int take = 100, bool foldersOnly = false)
+    {
+        RenderFoldersOnly(foldersOnly);
+        return await GetChildren(parentKey, skip, take);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs

@@ -0,0 +1,46 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Controllers.Tree;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DataType.Tree;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DataType}/tree")]
+[OpenApiTag(nameof(Constants.UdiEntityType.DataType))]
+public class DataTypeTreeControllerBase : FolderTreeControllerBase<FolderTreeItemViewModel>
+{
+    private readonly IDataTypeService _dataTypeService;
+
+    public DataTypeTreeControllerBase(IEntityService entityService, IDataTypeService dataTypeService)
+        : base(entityService) =>
+        _dataTypeService = dataTypeService;
+
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.DataType;
+
+    protected override UmbracoObjectTypes FolderObjectType => UmbracoObjectTypes.DataTypeContainer;
+
+    protected override FolderTreeItemViewModel[] MapTreeItemViewModels(Guid? parentKey, IEntitySlim[] entities)
+    {
+        var dataTypes = _dataTypeService
+            .GetAll(entities.Select(entity => entity.Id).ToArray())
+            .ToDictionary(contentType => contentType.Id);
+
+        return entities.Select(entity =>
+        {
+            FolderTreeItemViewModel viewModel = MapTreeItemViewModel(parentKey, entity);
+            if (dataTypes.TryGetValue(entity.Id, out IDataType? dataType))
+            {
+                viewModel.Icon = dataType.Editor?.Icon ?? viewModel.Icon;
+            }
+
+            return viewModel;
+        }).ToArray();
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DataType/Tree/ItemsDataTypeTreeController.cs

@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DataType.Tree;
+
+public class ItemsDataTypeTreeController : DataTypeTreeControllerBase
+{
+    public ItemsDataTypeTreeController(IEntityService entityService, IDataTypeService dataTypeService)
+        : base(entityService, dataTypeService)
+    {
+    }
+
+    [HttpGet("items")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(IEnumerable<FolderTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<FolderTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)
+        => await GetItems(keys);
+}

src/Umbraco.Cms.ManagementApi/Controllers/DataType/Tree/RootDataTypeTreeController.cs

@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DataType.Tree;
+
+public class RootDataTypeTreeController : DataTypeTreeControllerBase
+{
+    public RootDataTypeTreeController(IEntityService entityService, IDataTypeService dataTypeService)
+        : base(entityService, dataTypeService)
+    {
+    }
+
+    [HttpGet("root")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<FolderTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<FolderTreeItemViewModel>>> Root(int skip = 0, int take = 100, bool foldersOnly = false)
+    {
+        RenderFoldersOnly(foldersOnly);
+        return await GetRoot(skip, take);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/AllDictionaryController.cs

@@ -0,0 +1,69 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Dictionary;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+public class AllDictionaryController : DictionaryControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+    private readonly IUmbracoMapper _umbracoMapper;
+
+    public AllDictionaryController(ILocalizationService localizationService, IUmbracoMapper umbracoMapper)
+    {
+        _localizationService = localizationService;
+        _umbracoMapper = umbracoMapper;
+    }
+
+
+    /// <summary>
+    ///     Retrieves a list with all dictionary items
+    /// </summary>
+    /// <returns>
+    ///     The <see cref="IEnumerable{T}" />.
+    /// </returns>
+    [HttpGet]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<DictionaryOverviewViewModel>), StatusCodes.Status200OK)]
+    public async Task<PagedViewModel<DictionaryOverviewViewModel>> All(int skip, int take)
+    {
+        IDictionaryItem[] items = _localizationService.GetDictionaryItemDescendants(null).ToArray();
+        var list = new List<DictionaryOverviewViewModel>(items.Length);
+
+        // Build the proper tree structure, as we can have nested dictionary items
+        BuildTree(list, items);
+
+        var model = new PagedViewModel<DictionaryOverviewViewModel>
+        {
+            Total = list.Count,
+            Items = list.Skip(skip).Take(take),
+        };
+        return await Task.FromResult(model);
+    }
+
+    // recursive method to build a tree structure from the flat structure returned above
+    private void BuildTree(List<DictionaryOverviewViewModel> list, IDictionaryItem[] items, int level = 0, Guid? parentId = null)
+    {
+        IDictionaryItem[] children = items.Where(t => t.ParentId == parentId).ToArray();
+        if (children.Any() == false)
+        {
+            return;
+        }
+
+        foreach (IDictionaryItem child in children.OrderBy(item => item.ItemKey))
+        {
+            DictionaryOverviewViewModel? display = _umbracoMapper.Map<IDictionaryItem, DictionaryOverviewViewModel>(child);
+            if (display is not null)
+            {
+                display.Level = level;
+                list.Add(display);
+            }
+
+            BuildTree(list, items, level + 1, child.Key);
+        }
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/ByKeyDictionaryController.cs

@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Dictionary;
+using Umbraco.New.Cms.Core.Factories;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+public class ByIdDictionaryController : DictionaryControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+    private readonly IDictionaryFactory _dictionaryFactory;
+
+    public ByIdDictionaryController(
+        ILocalizationService localizationService,
+        IDictionaryFactory dictionaryFactory)
+    {
+        _localizationService = localizationService;
+        _dictionaryFactory = dictionaryFactory;
+    }
+
+    /// <summary>
+    ///     Gets a dictionary item by guid
+    /// </summary>
+    /// <param name="key">
+    ///     The id.
+    /// </param>
+    /// <returns>
+    ///     The <see cref="DictionaryDisplay" />. Returns a not found response when dictionary item does not exist
+    /// </returns>
+    [HttpGet("{key:guid}")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(DictionaryViewModel), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(NotFoundResult), StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<DictionaryViewModel>> ByKey(Guid key)
+    {
+        IDictionaryItem? dictionary = _localizationService.GetDictionaryItemById(key);
+        if (dictionary == null)
+        {
+            return NotFound();
+        }
+
+        return await Task.FromResult(_dictionaryFactory.CreateDictionaryViewModel(dictionary));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/CreateDictionaryController.cs

@@ -0,0 +1,90 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Dictionary;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+public class CreateDictionaryController : DictionaryControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+    private readonly ILocalizedTextService _localizedTextService;
+    private readonly GlobalSettings _globalSettings;
+    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
+    private readonly ILogger<CreateDictionaryController> _logger;
+
+    public CreateDictionaryController(
+        ILocalizationService localizationService,
+        ILocalizedTextService localizedTextService,
+        IOptionsSnapshot<GlobalSettings> globalSettings,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor,
+        ILogger<CreateDictionaryController> logger)
+    {
+        _localizationService = localizationService;
+        _localizedTextService = localizedTextService;
+        _globalSettings = globalSettings.Value;
+        _backofficeSecurityAccessor = backofficeSecurityAccessor;
+        _logger = logger;
+    }
+
+    /// <summary>
+    ///     Creates a new dictionary item
+    /// </summary>
+    /// <param name="dictionaryViewModel">The viewmodel to pass to the action</param>
+    /// <returns>
+    ///     The <see cref="HttpResponseMessage" />.
+    /// </returns>
+    [HttpPost("create")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(CreatedResult), StatusCodes.Status201Created)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    public async Task<ActionResult<int>> Create(DictionaryItemViewModel dictionaryViewModel)
+    {
+        if (string.IsNullOrEmpty(dictionaryViewModel.Key.ToString()))
+        {
+            return ValidationProblem("Key can not be empty."); // TODO: translate
+        }
+
+        if (_localizationService.DictionaryItemExists(dictionaryViewModel.Key.ToString()))
+        {
+            var message = _localizedTextService.Localize(
+                "dictionaryItem",
+                "changeKeyError",
+                _backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.GetUserCulture(_localizedTextService, _globalSettings),
+                new Dictionary<string, string?>
+                {
+                    { "0", dictionaryViewModel.Key.ToString() },
+                });
+            return await Task.FromResult(ValidationProblem(message));
+        }
+
+        try
+        {
+            Guid? parentGuid = null;
+
+            if (dictionaryViewModel.ParentId.HasValue)
+            {
+                parentGuid = dictionaryViewModel.ParentId;
+            }
+
+            IDictionaryItem item = _localizationService.CreateDictionaryItemWithIdentity(
+                dictionaryViewModel.Key.ToString(),
+                parentGuid,
+                string.Empty);
+
+
+            return await Task.FromResult(Created($"api/v1.0/dictionary/{item.Key}", item.Key));
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error creating dictionary with {Name} under {ParentId}", dictionaryViewModel.Key, dictionaryViewModel.ParentId);
+            return await Task.FromResult(ValidationProblem("Error creating dictionary item"));
+        }
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/DeleteDictionaryController.cs

@@ -0,0 +1,51 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+public class DeleteDictionaryController : DictionaryControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
+
+    public DeleteDictionaryController(ILocalizationService localizationService, IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
+    {
+        _localizationService = localizationService;
+        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
+    }
+    /// <summary>
+    ///     Deletes a data type with a given ID
+    /// </summary>
+    /// <param name="key">The key of the dictionary item to delete</param>
+    /// <returns>
+    ///     <see cref="HttpResponseMessage" />
+    /// </returns>
+    [HttpDelete("{key}")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(NotFoundResult), StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> Delete(Guid key)
+    {
+        IDictionaryItem? foundDictionary = _localizationService.GetDictionaryItemByKey(key.ToString());
+
+        if (foundDictionary == null)
+        {
+            return await Task.FromResult(NotFound());
+        }
+
+        IEnumerable<IDictionaryItem> foundDictionaryDescendants =
+            _localizationService.GetDictionaryItemDescendants(foundDictionary.Key);
+
+        foreach (IDictionaryItem dictionaryItem in foundDictionaryDescendants)
+        {
+            _localizationService.Delete(dictionaryItem, _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
+        }
+
+        _localizationService.Delete(foundDictionary, _backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.Id ?? -1);
+
+        return await Task.FromResult(Ok());
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/DictionaryControllerBase.cs

@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+[ApiController]
+[BackOfficeRoute("api/v{version:apiVersion}/dictionary")]
+[OpenApiTag("Dictionary")]
+[ApiVersion("1.0")]
+// TODO: Add authentication
+public abstract class DictionaryControllerBase : ManagementApiControllerBase
+{
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/ExportDictionaryController.cs

@@ -0,0 +1,44 @@
+using System.Net.Mime;
+using System.Text;
+using System.Xml.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+public class ExportDictionaryController : DictionaryControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+    private readonly IEntityXmlSerializer _entityXmlSerializer;
+
+    public ExportDictionaryController(ILocalizationService localizationService, IEntityXmlSerializer entityXmlSerializer)
+    {
+        _localizationService = localizationService;
+        _entityXmlSerializer = entityXmlSerializer;
+    }
+
+    [HttpGet("export/{key:guid}")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(NotFoundObjectResult), StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> ExportDictionary(Guid key, bool includeChildren = false)
+    {
+        IDictionaryItem? dictionaryItem = _localizationService.GetDictionaryItemById(key);
+        if (dictionaryItem is null)
+        {
+            return await Task.FromResult(NotFound("No dictionary item found with id "));
+        }
+
+        XElement xml = _entityXmlSerializer.Serialize(dictionaryItem, includeChildren);
+
+        var fileName = $"{dictionaryItem.ItemKey}.udt";
+
+        // Set custom header so umbRequestHelper.downloadFile can save the correct filename
+        HttpContext.Response.Headers.Add("x-filename", fileName);
+
+        return await Task.FromResult(File(Encoding.UTF8.GetBytes(xml.ToDataString()), MediaTypeNames.Application.Octet, fileName));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/ImportDictionaryController.cs

@@ -0,0 +1,54 @@
+using System.Net.Mime;
+using System.Text;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Services;
+using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+public class ImportDictionaryController : DictionaryControllerBase
+{
+    private readonly IHostingEnvironment _hostingEnvironment;
+    private readonly IDictionaryService _dictionaryService;
+    private readonly IWebHostEnvironment _webHostEnvironment;
+    private readonly ILoadDictionaryItemService _loadDictionaryItemService;
+
+    public ImportDictionaryController(
+        IHostingEnvironment hostingEnvironment,
+        IDictionaryService dictionaryService,
+        IWebHostEnvironment webHostEnvironment,
+        ILoadDictionaryItemService loadDictionaryItemService)
+    {
+        _hostingEnvironment = hostingEnvironment;
+        _dictionaryService = dictionaryService;
+        _webHostEnvironment = webHostEnvironment;
+        _loadDictionaryItemService = loadDictionaryItemService;
+    }
+
+    [HttpPost("import")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ContentResult), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(NotFoundResult), StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> ImportDictionary(string file, int? parentId)
+    {
+        if (string.IsNullOrWhiteSpace(file))
+        {
+            return NotFound();
+        }
+
+        var filePath = Path.Combine(_hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.Data), file);
+        if (_webHostEnvironment.ContentRootFileProvider.GetFileInfo(filePath) is null)
+        {
+            return await Task.FromResult(NotFound());
+        }
+
+        IDictionaryItem dictionaryItem = _loadDictionaryItemService.Load(filePath, parentId);
+
+        return await Task.FromResult(Content(_dictionaryService.CalculatePath(dictionaryItem.ParentId, dictionaryItem.Id), MediaTypeNames.Text.Plain, Encoding.UTF8));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/UpdateDictionaryController.cs

@@ -0,0 +1,75 @@
+using System.Net.Mime;
+using System.Text;
+using System.Text.Json;
+using Json.Patch;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Serialization;
+using Umbraco.Cms.ManagementApi.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Dictionary;
+using Umbraco.Cms.ManagementApi.ViewModels.JsonPatch;
+using Umbraco.New.Cms.Core.Factories;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+public class UpdateDictionaryController : DictionaryControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+    private readonly IUmbracoMapper _umbracoMapper;
+    private readonly IDictionaryService _dictionaryService;
+    private readonly IDictionaryFactory _dictionaryFactory;
+    private readonly IJsonPatchService _jsonPatchService;
+    private readonly ISystemTextJsonSerializer _systemTextJsonSerializer;
+
+    public UpdateDictionaryController(
+        ILocalizationService localizationService,
+        IUmbracoMapper umbracoMapper,
+        IDictionaryService dictionaryService,
+        IDictionaryFactory dictionaryFactory,
+        IJsonPatchService jsonPatchService,
+        ISystemTextJsonSerializer systemTextJsonSerializer)
+    {
+        _localizationService = localizationService;
+        _umbracoMapper = umbracoMapper;
+        _dictionaryService = dictionaryService;
+        _dictionaryFactory = dictionaryFactory;
+        _jsonPatchService = jsonPatchService;
+        _systemTextJsonSerializer = systemTextJsonSerializer;
+    }
+
+    [HttpPatch("{id:Guid}")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ContentResult), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(NotFoundResult), StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> Update(Guid id, JsonPatchViewModel[] updateViewModel)
+    {
+        IDictionaryItem? dictionaryItem = _localizationService.GetDictionaryItemById(id);
+
+        if (dictionaryItem is null)
+        {
+            return NotFound();
+        }
+
+        DictionaryViewModel dictionaryToPatch = _umbracoMapper.Map<DictionaryViewModel>(dictionaryItem)!;
+
+        PatchResult? result = _jsonPatchService.Patch(updateViewModel, dictionaryToPatch);
+
+        if (result?.Result is null)
+        {
+            throw new JsonException("Could not patch the JsonPatchViewModel");
+        }
+
+        DictionaryViewModel? updatedDictionaryItem = _systemTextJsonSerializer.Deserialize<DictionaryViewModel>(result.Result.ToJsonString());
+        if (updatedDictionaryItem is null)
+        {
+            throw new JsonException("Could not serialize from PatchResult to DictionaryViewModel");
+        }
+
+        IDictionaryItem dictionaryToSave = _dictionaryFactory.CreateDictionaryItem(updatedDictionaryItem!);
+        _localizationService.Save(dictionaryToSave);
+        return await Task.FromResult(Content(_dictionaryService.CalculatePath(dictionaryToSave.ParentId, dictionaryToSave.Id), MediaTypeNames.Text.Plain, Encoding.UTF8));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/UploadDictionaryController.cs

@@ -0,0 +1,51 @@
+using System.Xml;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Models;
+using Umbraco.Cms.ManagementApi.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Dictionary;
+using Umbraco.Extensions;
+using Umbraco.New.Cms.Core.Factories;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
+
+public class UploadDictionaryController : DictionaryControllerBase
+{
+    private readonly ILocalizedTextService _localizedTextService;
+    private readonly IUploadFileService _uploadFileService;
+    private readonly IDictionaryFactory _dictionaryFactory;
+
+    public UploadDictionaryController(ILocalizedTextService localizedTextService, IUploadFileService uploadFileService, IDictionaryFactory dictionaryFactory)
+    {
+        _localizedTextService = localizedTextService;
+        _uploadFileService = uploadFileService;
+        _dictionaryFactory = dictionaryFactory;
+    }
+
+    [HttpPost("upload")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(DictionaryImportViewModel), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    public async Task<ActionResult<DictionaryImportViewModel>> Upload(IFormFile file)
+    {
+        FormFileUploadResult formFileUploadResult = _uploadFileService.TryLoad(file);
+        if (formFileUploadResult.CouldLoad is false || formFileUploadResult.XmlDocument is null)
+        {
+            return await Task.FromResult(ValidationProblem(
+                _localizedTextService.Localize("media", "failedFileUpload"),
+                formFileUploadResult.ErrorMessage));
+        }
+
+        DictionaryImportViewModel model = _dictionaryFactory.CreateDictionaryImportViewModel(formFileUploadResult);
+
+        if (!model.DictionaryItems.Any())
+        {
+            return ValidationProblem(
+                _localizedTextService.Localize("media", "failedFileUpload"),
+                _localizedTextService.Localize("dictionary", "noItemsInFile"));
+        }
+
+        return await Task.FromResult(model);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DictionaryItem/Tree/ChildrenDictionaryItemTreeController.cs

@@ -0,0 +1,39 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Services.Paging;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DictionaryItem.Tree;
+
+public class ChildrenDictionaryItemTreeController : DictionaryItemTreeControllerBase
+{
+    public ChildrenDictionaryItemTreeController(IEntityService entityService, ILocalizationService localizationService)
+        : base(entityService, localizationService)
+    {
+    }
+
+    [HttpGet("children")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<EntityTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<EntityTreeItemViewModel>>> Children(Guid parentKey, int skip = 0, int take = 100)
+    {
+        if (PaginationService.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize, out ProblemDetails? error) == false)
+        {
+            return BadRequest(error);
+        }
+
+        IDictionaryItem[] dictionaryItems = PaginatedDictionaryItems(
+            pageNumber,
+            pageSize,
+            LocalizationService.GetDictionaryItemChildren(parentKey),
+            out var totalItems);
+
+        EntityTreeItemViewModel[] viewModels = MapTreeItemViewModels(null, dictionaryItems);
+
+        PagedViewModel<EntityTreeItemViewModel> result = PagedViewModel(viewModels, totalItems);
+        return await Task.FromResult(Ok(result));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DictionaryItem/Tree/DictionaryItemTreeControllerBase.cs

@@ -0,0 +1,53 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Controllers.Tree;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DictionaryItem.Tree;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DictionaryItem}/tree")]
+[OpenApiTag(nameof(Constants.UdiEntityType.DictionaryItem))]
+// NOTE: at the moment dictionary items aren't supported by EntityService, so we have little use of the
+// tree controller base. We'll keep it though, in the hope that we can mend EntityService.
+public class DictionaryItemTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>
+{
+    public DictionaryItemTreeControllerBase(IEntityService entityService, ILocalizationService localizationService)
+        : base(entityService) =>
+        LocalizationService = localizationService;
+
+    // dictionary items do not currently have a known UmbracoObjectType, so we'll settle with Unknown for now
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Unknown;
+
+    protected ILocalizationService LocalizationService { get; }
+
+    protected EntityTreeItemViewModel[] MapTreeItemViewModels(Guid? parentKey, IDictionaryItem[] dictionaryItems)
+        => dictionaryItems.Select(dictionaryItem => new EntityTreeItemViewModel
+        {
+            Icon = Constants.Icons.RelationType,
+            Name = dictionaryItem.ItemKey,
+            Key = dictionaryItem.Key,
+            Type = Constants.UdiEntityType.DictionaryItem,
+            HasChildren = false,
+            IsContainer = LocalizationService.GetDictionaryItemChildren(dictionaryItem.Key).Any(),
+            ParentKey = parentKey
+        }).ToArray();
+
+    // localization service does not (yet) allow pagination of dictionary items, we have to do it in memory for now
+    protected IDictionaryItem[] PaginatedDictionaryItems(long pageNumber, int pageSize, IEnumerable<IDictionaryItem> allDictionaryItems, out long totalItems)
+    {
+        IDictionaryItem[] allDictionaryItemsAsArray = allDictionaryItems.ToArray();
+
+        totalItems = allDictionaryItemsAsArray.Length;
+        return allDictionaryItemsAsArray
+            .OrderBy(item => item.ItemKey)
+            .Skip((int)pageNumber * pageSize)
+            .Take(pageSize)
+            .ToArray();
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DictionaryItem/Tree/ItemsDictionaryItemTreeController.cs

@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DictionaryItem.Tree;
+
+public class ItemsDictionaryItemTreeController : DictionaryItemTreeControllerBase
+{
+    public ItemsDictionaryItemTreeController(IEntityService entityService, ILocalizationService localizationService)
+        : base(entityService, localizationService)
+    {
+    }
+
+    [HttpGet("items")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(IEnumerable<FolderTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<FolderTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)
+    {
+        IDictionaryItem[] dictionaryItems = LocalizationService.GetDictionaryItemsByIds(keys).ToArray();
+
+        EntityTreeItemViewModel[] viewModels = MapTreeItemViewModels(null, dictionaryItems);
+
+        return await Task.FromResult(Ok(viewModels));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DictionaryItem/Tree/RootDictionaryItemTreeController.cs

@@ -0,0 +1,39 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Services.Paging;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DictionaryItem.Tree;
+
+public class RootDictionaryItemTreeController : DictionaryItemTreeControllerBase
+{
+    public RootDictionaryItemTreeController(IEntityService entityService, ILocalizationService localizationService)
+        : base(entityService, localizationService)
+    {
+    }
+
+    [HttpGet("root")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<EntityTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<EntityTreeItemViewModel>>> Root(int skip = 0, int take = 100)
+    {
+        if (PaginationService.ConvertSkipTakeToPaging(skip, take, out var pageNumber, out var pageSize, out ProblemDetails? error) == false)
+        {
+            return BadRequest(error);
+        }
+
+        IDictionaryItem[] dictionaryItems = PaginatedDictionaryItems(
+            pageNumber,
+            pageSize,
+            LocalizationService.GetRootDictionaryItems(),
+            out var totalItems);
+
+        EntityTreeItemViewModel[] viewModels = MapTreeItemViewModels(null, dictionaryItems);
+
+        PagedViewModel<EntityTreeItemViewModel> result = PagedViewModel(viewModels, totalItems);
+        return await Task.FromResult(Ok(result));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs

@@ -0,0 +1,21 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.RecycleBin;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Document.RecycleBin;
+
+public class ChildrenDocumentRecycleBinController : DocumentRecycleBinControllerBase
+{
+    public ChildrenDocumentRecycleBinController(IEntityService entityService)
+        : base(entityService)
+    {
+    }
+
+    [HttpGet("children")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<RecycleBinItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<RecycleBinItemViewModel>>> Children(Guid parentKey, int skip = 0, int take = 100)
+        => await GetChildren(parentKey, skip, take);
+}

src/Umbraco.Cms.ManagementApi/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs

@@ -0,0 +1,43 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Controllers.RecycleBin;
+using Umbraco.Cms.ManagementApi.Filters;
+using Umbraco.Cms.ManagementApi.ViewModels.RecycleBin;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Document.RecycleBin;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Document}/recycle-bin")]
+[RequireDocumentTreeRootAccess]
+[ProducesResponseType(StatusCodes.Status401Unauthorized)]
+[OpenApiTag(nameof(Constants.UdiEntityType.Document))]
+public class DocumentRecycleBinControllerBase : RecycleBinControllerBase<RecycleBinItemViewModel>
+{
+    public DocumentRecycleBinControllerBase(IEntityService entityService)
+        : base(entityService)
+    {
+    }
+
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Document;
+
+    protected override int RecycleBinRootId => Constants.System.RecycleBinContent;
+
+    protected override RecycleBinItemViewModel MapRecycleBinViewModel(Guid? parentKey, IEntitySlim entity)
+    {
+        RecycleBinItemViewModel viewModel = base.MapRecycleBinViewModel(parentKey, entity);
+
+        if (entity is IDocumentEntitySlim documentEntitySlim)
+        {
+            viewModel.Icon = documentEntitySlim.ContentTypeIcon ?? viewModel.Icon;
+        }
+
+        return viewModel;
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Document/RecycleBin/RootDocumentRecycleBinController.cs

@@ -0,0 +1,21 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.RecycleBin;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Document.RecycleBin;
+
+public class RootDocumentRecycleBinController : DocumentRecycleBinControllerBase
+{
+    public RootDocumentRecycleBinController(IEntityService entityService)
+        : base(entityService)
+    {
+    }
+
+    [HttpGet("root")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<RecycleBinItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<RecycleBinItemViewModel>>> Root(int skip = 0, int take = 100)
+        => await GetRoot(skip, take);
+}

src/Umbraco.Cms.ManagementApi/Controllers/Document/Tree/ChildrenDocumentTreeController.cs

@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Services.Entities;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Document.Tree;
+
+public class ChildrenDocumentTreeController : DocumentTreeControllerBase
+{
+    public ChildrenDocumentTreeController(
+        IEntityService entityService,
+        IUserStartNodeEntitiesService userStartNodeEntitiesService,
+        IDataTypeService dataTypeService,
+        IPublicAccessService publicAccessService,
+        AppCaches appCaches,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
+        : base(entityService, userStartNodeEntitiesService, dataTypeService, publicAccessService, appCaches, backofficeSecurityAccessor)
+    {
+    }
+
+    [HttpGet("children")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<DocumentTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<DocumentTreeItemViewModel>>> Children(Guid parentKey, int skip = 0, int take = 100, Guid? dataTypeKey = null, string? culture = null)
+    {
+        IgnoreUserStartNodesForDataType(dataTypeKey);
+        RenderForClientCulture(culture);
+        return await GetChildren(parentKey, skip, take);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Document/Tree/DocumentTreeControllerBase.cs

@@ -0,0 +1,94 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Controllers.Tree;
+using Umbraco.Cms.ManagementApi.Services.Entities;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+using Umbraco.Extensions;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Document.Tree;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Document}/tree")]
+[OpenApiTag(nameof(Constants.UdiEntityType.Document))]
+public abstract class DocumentTreeControllerBase : UserStartNodeTreeControllerBase<DocumentTreeItemViewModel>
+{
+    private readonly IPublicAccessService _publicAccessService;
+    private readonly AppCaches _appCaches;
+    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
+    private string? _culture;
+
+    protected DocumentTreeControllerBase(
+        IEntityService entityService,
+        IUserStartNodeEntitiesService userStartNodeEntitiesService,
+        IDataTypeService dataTypeService,
+        IPublicAccessService publicAccessService,
+        AppCaches appCaches,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
+        : base(entityService, userStartNodeEntitiesService, dataTypeService)
+    {
+        _publicAccessService = publicAccessService;
+        _appCaches = appCaches;
+        _backofficeSecurityAccessor = backofficeSecurityAccessor;
+    }
+
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Document;
+
+    protected override Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.SortOrder));
+
+    protected void RenderForClientCulture(string? culture) => _culture = culture;
+
+    protected override DocumentTreeItemViewModel MapTreeItemViewModel(Guid? parentKey, IEntitySlim entity)
+    {
+        DocumentTreeItemViewModel viewModel = base.MapTreeItemViewModel(parentKey, entity);
+
+        if (entity is IDocumentEntitySlim documentEntitySlim)
+        {
+            viewModel.IsPublished = documentEntitySlim.Published;
+            viewModel.IsEdited = documentEntitySlim.Edited;
+            viewModel.Icon = documentEntitySlim.ContentTypeIcon ?? viewModel.Icon;
+            viewModel.IsProtected = _publicAccessService.IsProtected(entity.Path);
+
+            if (_culture != null && documentEntitySlim.Variations.VariesByCulture())
+            {
+                viewModel.Name = documentEntitySlim.CultureNames.TryGetValue(_culture, out var cultureName)
+                    ? cultureName
+                    : $"({viewModel.Name})";
+
+                viewModel.IsPublished = documentEntitySlim.PublishedCultures.Contains(_culture);
+                viewModel.IsEdited = documentEntitySlim.EditedCultures.Contains(_culture);
+            }
+
+            viewModel.IsEdited &= viewModel.IsPublished;
+        }
+
+        return viewModel;
+    }
+
+    // TODO: delete these (faking start node setup for unlimited editor)
+    protected override int[] GetUserStartNodeIds() => new[] { -1 };
+
+    protected override string[] GetUserStartNodePaths() => Array.Empty<string>();
+
+    // TODO: use these implementations instead of the dummy ones above once we have backoffice auth in place
+    // protected override int[] GetUserStartNodeIds()
+    //     => _backofficeSecurityAccessor
+    //            .BackOfficeSecurity?
+    //            .CurrentUser?
+    //            .CalculateContentStartNodeIds(EntityService, _appCaches)
+    //        ?? Array.Empty<int>();
+    //
+    // protected override string[] GetUserStartNodePaths()
+    //     => _backofficeSecurityAccessor
+    //            .BackOfficeSecurity?
+    //            .CurrentUser?
+    //            .GetContentStartNodePaths(EntityService, _appCaches)
+    //        ?? Array.Empty<string>();
+}

src/Umbraco.Cms.ManagementApi/Controllers/Document/Tree/ItemsDocumentTreeController.cs

@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Services.Entities;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Document.Tree;
+
+public class ItemsDocumentTreeController : DocumentTreeControllerBase
+{
+    public ItemsDocumentTreeController(
+        IEntityService entityService,
+        IUserStartNodeEntitiesService userStartNodeEntitiesService,
+        IDataTypeService dataTypeService,
+        IPublicAccessService publicAccessService,
+        AppCaches appCaches,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
+        : base(entityService, userStartNodeEntitiesService, dataTypeService, publicAccessService, appCaches, backofficeSecurityAccessor)
+    {
+    }
+
+    [HttpGet("items")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(IEnumerable<DocumentTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<DocumentTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys, Guid? dataTypeKey = null, string? culture = null)
+    {
+        IgnoreUserStartNodesForDataType(dataTypeKey);
+        RenderForClientCulture(culture);
+        return await GetItems(keys);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Document/Tree/RootDocumentTreeController.cs

@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Services.Entities;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Document.Tree;
+
+public class RootDocumentTreeController : DocumentTreeControllerBase
+{
+    public RootDocumentTreeController(
+        IEntityService entityService,
+        IUserStartNodeEntitiesService userStartNodeEntitiesService,
+        IDataTypeService dataTypeService,
+        IPublicAccessService publicAccessService,
+        AppCaches appCaches,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
+        : base(entityService, userStartNodeEntitiesService, dataTypeService, publicAccessService, appCaches, backofficeSecurityAccessor)
+    {
+    }
+
+    [HttpGet("root")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<DocumentTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<DocumentTreeItemViewModel>>> Root(int skip = 0, int take = 100, Guid? dataTypeKey = null, string? culture = null)
+    {
+        IgnoreUserStartNodesForDataType(dataTypeKey);
+        RenderForClientCulture(culture);
+        return await GetRoot(skip, take);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs

@@ -0,0 +1,56 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Controllers.Tree;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DocumentBlueprint.Tree;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DocumentBlueprint}/tree")]
+[OpenApiTag(nameof(Constants.UdiEntityType.DocumentBlueprint))]
+public class DocumentBlueprintTreeControllerBase : EntityTreeControllerBase<DocumentBlueprintTreeItemViewModel>
+{
+    private readonly IContentTypeService _contentTypeService;
+
+    public DocumentBlueprintTreeControllerBase(IEntityService entityService, IContentTypeService contentTypeService)
+        : base(entityService) =>
+        _contentTypeService = contentTypeService;
+
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.DocumentBlueprint;
+
+    protected override DocumentBlueprintTreeItemViewModel[] MapTreeItemViewModels(Guid? parentKey, IEntitySlim[] entities)
+    {
+        var contentTypeAliases = entities
+            .OfType<IDocumentEntitySlim>()
+            .Select(entity => entity.ContentTypeAlias)
+            .ToArray();
+
+        var contentTypeIds = _contentTypeService.GetAllContentTypeIds(contentTypeAliases).ToArray();
+        var contentTypeByAlias = _contentTypeService
+            .GetAll(contentTypeIds)
+            .ToDictionary(contentType => contentType.Alias);
+
+        return entities.Select(entity =>
+        {
+            DocumentBlueprintTreeItemViewModel viewModel = base.MapTreeItemViewModel(parentKey, entity);
+            viewModel.Icon = Constants.Icons.Blueprint;
+            viewModel.HasChildren = false;
+
+            if (entity is IDocumentEntitySlim documentEntitySlim
+                && contentTypeByAlias.TryGetValue(documentEntitySlim.ContentTypeAlias, out IContentType? contentType))
+            {
+                viewModel.DocumentTypeKey = contentType.Key;
+                viewModel.DocumentTypeAlias = contentType.Alias;
+                viewModel.DocumentTypeName = contentType.Name;
+            }
+
+            return viewModel;
+        }).ToArray();
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DocumentBlueprint/Tree/ItemsDocumentBlueprintTreeController.cs

@@ -0,0 +1,21 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DocumentBlueprint.Tree;
+
+public class ItemsDocumentBlueprintTreeController : DocumentBlueprintTreeControllerBase
+{
+    public ItemsDocumentBlueprintTreeController(IEntityService entityService, IContentTypeService contentTypeService)
+        : base(entityService, contentTypeService)
+    {
+    }
+
+    [HttpGet("items")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(IEnumerable<DocumentBlueprintTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<DocumentBlueprintTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)
+        => await GetItems(keys);
+}

src/Umbraco.Cms.ManagementApi/Controllers/DocumentBlueprint/Tree/RootDocumentBlueprintTreeController.cs

@@ -0,0 +1,21 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DocumentBlueprint.Tree;
+
+public class RootDocumentBlueprintTreeController : DocumentBlueprintTreeControllerBase
+{
+    public RootDocumentBlueprintTreeController(IEntityService entityService, IContentTypeService contentTypeService)
+        : base(entityService, contentTypeService)
+    {
+    }
+
+    [HttpGet("root")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<DocumentBlueprintTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<DocumentBlueprintTreeItemViewModel>>> Root(int skip = 0, int take = 100)
+        => await GetRoot(skip, take);
+}

src/Umbraco.Cms.ManagementApi/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs

@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DocumentType.Tree;
+
+public class ChildrenDocumentTypeTreeController : DocumentTypeTreeControllerBase
+{
+    public ChildrenDocumentTypeTreeController(IEntityService entityService, IContentTypeService contentTypeService)
+        : base(entityService, contentTypeService)
+    {
+    }
+
+    [HttpGet("children")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<DocumentTypeTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<DocumentTypeTreeItemViewModel>>> Children(Guid parentKey, int skip = 0, int take = 100, bool foldersOnly = false)
+    {
+        RenderFoldersOnly(foldersOnly);
+        return await GetChildren(parentKey, skip, take);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DocumentType/Tree/DocumentTypeTreeControllerBase.cs

@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Controllers.Tree;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DocumentType.Tree;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DocumentType}/tree")]
+[OpenApiTag(nameof(Constants.UdiEntityType.DocumentType))]
+public class DocumentTypeTreeControllerBase : FolderTreeControllerBase<DocumentTypeTreeItemViewModel>
+{
+    private readonly IContentTypeService _contentTypeService;
+
+    public DocumentTypeTreeControllerBase(IEntityService entityService, IContentTypeService contentTypeService)
+        : base(entityService) =>
+        _contentTypeService = contentTypeService;
+
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.DocumentType;
+
+    protected override UmbracoObjectTypes FolderObjectType => UmbracoObjectTypes.DocumentTypeContainer;
+
+    protected override DocumentTypeTreeItemViewModel[] MapTreeItemViewModels(Guid? parentKey, IEntitySlim[] entities)
+    {
+        var contentTypes = _contentTypeService
+            .GetAll(entities.Select(entity => entity.Id).ToArray())
+            .ToDictionary(contentType => contentType.Id);
+
+        return entities.Select(entity =>
+        {
+            DocumentTypeTreeItemViewModel viewModel = MapTreeItemViewModel(parentKey, entity);
+            if (contentTypes.TryGetValue(entity.Id, out IContentType? contentType))
+            {
+                viewModel.Icon = contentType.Icon ?? viewModel.Icon;
+                viewModel.IsElement = contentType.IsElement;
+            }
+
+            return viewModel;
+        }).ToArray();
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/DocumentType/Tree/ItemsDocumentTypeTreeController.cs

@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DocumentType.Tree;
+
+public class ItemsDocumentTypeTreeController : DocumentTypeTreeControllerBase
+{
+    public ItemsDocumentTypeTreeController(IEntityService entityService, IContentTypeService contentTypeService)
+        : base(entityService, contentTypeService)
+    {
+    }
+
+    [HttpGet("items")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(IEnumerable<DocumentTypeTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<DocumentTypeTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)
+        => await GetItems(keys);
+}

src/Umbraco.Cms.ManagementApi/Controllers/DocumentType/Tree/RootDocumentTypeTreeController.cs

@@ -0,0 +1,24 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Cms.ManagementApi.ViewModels.Tree;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.DocumentType.Tree;
+
+public class RootDocumentTypeTreeController : DocumentTypeTreeControllerBase
+{
+    public RootDocumentTypeTreeController(IEntityService entityService, IContentTypeService contentTypeService)
+        : base(entityService, contentTypeService)
+    {
+    }
+
+    [HttpGet("root")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<DocumentTypeTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<DocumentTypeTreeItemViewModel>>> Root(int skip = 0, int take = 100, bool foldersOnly = false)
+    {
+        RenderFoldersOnly(foldersOnly);
+        return await GetRoot(skip, take);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/ExamineManagement/ExamineManagementControllerBase.cs

@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.ExamineManagement;
+
+[ApiController]
+[BackOfficeRoute("api/v{version:apiVersion}/examineManagement")]
+[OpenApiTag("ExamineManagement")]
+public class ExamineManagementControllerBase : ManagementApiControllerBase
+{
+}

src/Umbraco.Cms.ManagementApi/Controllers/ExamineManagement/IndexExamineManagementController.cs

@@ -0,0 +1,54 @@
+using Examine;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.ManagementApi.Factories;
+using Umbraco.Cms.ManagementApi.ViewModels.ExamineManagement;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.ExamineManagement;
+
+[ApiVersion("1.0")]
+public class IndexExamineManagementController : ExamineManagementControllerBase
+{
+    private readonly IExamineIndexViewModelFactory _examineIndexViewModelFactory;
+    private readonly IExamineManager _examineManager;
+
+    public IndexExamineManagementController(
+        IExamineIndexViewModelFactory examineIndexViewModelFactory,
+        IExamineManager examineManager)
+    {
+        _examineIndexViewModelFactory = examineIndexViewModelFactory;
+        _examineManager = examineManager;
+    }
+
+    /// <summary>
+    ///     Check if the index has been rebuilt
+    /// </summary>
+    /// <param name="indexName"></param>
+    /// <returns></returns>
+    /// <remarks>
+    ///     This is kind of rudimentary since there's no way we can know that the index has rebuilt, we
+    ///     have a listener for the index op complete so we'll just check if that key is no longer there in the runtime cache
+    /// </remarks>
+    [HttpGet("index")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(ExamineIndexViewModel), StatusCodes.Status200OK)]
+    public async Task<ActionResult<ExamineIndexViewModel?>> Index(string indexName)
+    {
+        if (_examineManager.TryGetIndex(indexName, out IIndex? index))
+        {
+            return await Task.FromResult(_examineIndexViewModelFactory.Create(index!));
+        }
+
+        var invalidModelProblem = new ProblemDetails
+        {
+            Title = "Index Not Found",
+            Detail = $"No index found with name = {indexName}",
+            Status = StatusCodes.Status400BadRequest,
+            Type = "Error",
+        };
+
+        return await Task.FromResult(BadRequest(invalidModelProblem));
+
+    }
+}