Merge branch 'release/10.8.11' into v10/dev

# Conflicts:
#	version.json

.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,26 +1,13 @@
 // 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"
-			}
-		],
+	"settings": {		
 		"omnisharp.defaultLaunchSolution": "umbraco.sln",
 		"omnisharp.enableDecompilationSupport": true,
 		"omnisharp.enableRoslynAnalyzers": true
@@ -28,14 +15,11 @@
 
 	// 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

.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/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/workflows/add-issues-to-review-project.yml

@@ -5,6 +5,9 @@ on:
     types:
       - opened
 
+permissions:
+  contents: read
+
 jobs:
   get-user-type:
     runs-on: ubuntu-latest
@@ -43,6 +46,8 @@ jobs:
             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]

.github/workflows/codeql-analysis.yml

@@ -2,35 +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
+    - 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: Setup dotnet
-      uses: actions/setup-dotnet@v1
+    - name: Use .NET ${{ env.dotnetVersion }}
+      uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: ${{ env.dotnetVersion }}
+        include-prerelease: ${{ env.dotnetIncludePreviewVersions }}
 
-    - name: dotnet build
-      run: dotnet build umbraco.sln -c SkipTests
+    - 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

@@ -11,15 +11,10 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - name: Install dependencies
-        run: |
-          npm install node-fetch@2
       - name: Fetch random comment 🗣️ and add it to the PR
         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({
@@ -46,13 +41,13 @@ jobs:
                     });
                 } 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).")
                     }

.gitignore

@@ -90,10 +90,7 @@ preserve.belle
 /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.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
@@ -104,5 +101,6 @@ cypress.env.json
 /tests/Umbraco.Tests.UnitTests/[Uu]mbraco/[Dd]ata/TEMP/
 
 # Ignore auto-generated schema
-/src/Umbraco.Web.UI/appsettings-schema.json
 /src/Umbraco.Cms/appsettings-schema.json
+/src/Umbraco.Web.UI/appsettings-schema.json
+/tests/Umbraco.Tests.Integration/appsettings-schema.json

.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

@@ -54,7 +54,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/src/umbraco.sln",
+                "${workspaceFolder}/umbraco.sln",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -69,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,18 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <!-- Package references and additional files which are consumed by all projects -->
+  <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="StyleCop.Analyzers" Version="1.2.0-beta.406" PrivateAssets="all" IsImplicitlyDefined="true"/>
+    <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>
-    <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
-      <PrivateAssets>all</PrivateAssets>
-      <Version>3.5.107</Version>
-    </PackageReference>
-
-    <PackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.1.1">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <Content Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="" Visible="false" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
+  </PropertyGroup>
+
 </Project>

build/azure-pipelines.yml

@@ -21,14 +21,42 @@ parameters:
     displayName: Upload API docs
     type: boolean
     default: false
+  - name: forceReleaseTestFilter
+    displayName: Force to use the release test filters
+    type: boolean
+    default: false
+  - name: integrationNonReleaseTestFilter
+    displayName: TestFilter used for non-release type builds
+    type: string
+    default: '--filter TestCategory!=LongRunning&TestCategory!=NonCritical'
+  - name: integrationReleaseTestFilter
+    displayName: TestFilter used for release type builds
+    type: string
+    default: ' '
+  - name: nonWindowsIntegrationNonReleaseTestFilter
+    displayName: TestFilter used for non-release type builds on non windows agents
+    type: string
+    default: '--filter TestCategory!=LongRunning&TestCategory!=NonCritical'
+  - name: nonWindowsIntegrationReleaseTestFilter
+    displayName: TestFilter used for release type builds on non windows agents
+    type: string
+    default: ' '
+  - name: isNightly
+    displayName: 'Is nightly build (used for MyGet feed)'
+    type: boolean
+    default: false
 
 variables:
+  nodeVersion: 20
+  dotnetVersion: 6.x
+  dotnetIncludePreviewVersions: false
+  solution: umbraco.sln
   buildConfiguration: Release
-  SA_PASSWORD: UmbracoIntegration123!
-  UMBRACO__CMS_GLOBAL__ID: 00000000-0000-0000-0000-000000000042
-  nodeVersion: 14.18.1
-  DOTNET_NOLOGO: 1
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  UMBRACO__CMS__GLOBAL__ID: 00000000-0000-0000-0000-000000000042
+  DOTNET_NOLOGO: true
+  DOTNET_GENERATE_ASPNET_CERTIFICATE: false
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
 
 stages:
   ###############################################
@@ -44,7 +72,8 @@ stages:
           vmImage: 'ubuntu-latest'
         steps:
           - task: NodeTool@0
-            displayName: Use node $(nodeVersion)
+            displayName: Use Node.js $(nodeVersion)
+            retryCountOnTaskFailure: 3
             inputs:
               versionSpec: $(nodeVersion)
           - task: Cache@2
@@ -57,52 +86,31 @@ stages:
               path: $(npm_config_cache)
           - script: npm ci --no-fund --no-audit --prefer-offline
             workingDirectory:  src/Umbraco.Web.UI.Client
-            displayName: Run npm ci
+            displayName: Run npm ci (Backoffice)
           - task: gulp@0
-            displayName: Run gulp build
+            displayName: Run gulp build (Backoffice)
             inputs:
               gulpFile: src/Umbraco.Web.UI.Client/gulpfile.js
               targets: coreBuild
               workingDirectory: src/Umbraco.Web.UI.Client
+          - task: UseDotNet@2
+            displayName: Use .NET $(dotnetVersion)
+            inputs:
+              version: $(dotnetVersion)
+              performMultiLevelLookup: true
+              includePreviewVersions: $(dotnetIncludePreviewVersions)
           - task: DotNetCoreCLI@2
-            displayName: Run dotnet build
+            displayName: Run dotnet restore
+            inputs:
+              command: restore
+              projects: $(solution)
+          - task: DotNetCoreCLI@2
+            name: build
+            displayName: Run dotnet build and generate NuGet packages
             inputs:
               command: build
-              projects: umbraco.sln
-              arguments: '--configuration $(buildConfiguration)'
-          - script: |
-              version="$(Build.BuildNumber)"
-              echo "varsion: $version"
-
-              major="$(echo $version | cut -d '.' -f 1)"
-              echo "major version: $major"
-
-              echo "##vso[task.setvariable variable=majorVersion;isOutput=true]$major"
-            displayName: Set major version
-            name: determineMajorVersion
-          - task: PowerShell@2
-            displayName: Prepare nupkg
-            inputs:
-              targetType: inline
-              script: |
-                $umbracoVersion = "$(Build.BuildNumber)" -replace "\+",".g"
-                $templatePaths = Get-ChildItem 'templates/**/.template.config/template.json'
-
-                foreach ($templatePath in $templatePaths) {
-                  $a = Get-Content $templatePath -Raw | ConvertFrom-Json
-                  if ($a.symbols -and $a.symbols.UmbracoVersion) {
-                    $a.symbols.UmbracoVersion.defaultValue = $umbracoVersion
-                    $a | ConvertTo-Json -Depth 32 | Set-Content $templatePath
-                  }
-                }
-
-                dotnet pack --configuration $(buildConfiguration) umbraco.sln -o $(Build.ArtifactStagingDirectory)/nupkg
-          - script: |
-              sha="$(Build.SourceVersion)"
-              sha=${sha:0:7}
-              buildnumber="$(Build.BuildNumber)_$(Build.BuildId)_$sha"
-              echo "##vso[build.updatebuildnumber]$buildnumber"
-            displayName: Update build number
+              projects: $(solution)
+              arguments: '--configuration $(buildConfiguration) --no-restore --property:ContinuousIntegrationBuild=true --property:GeneratePackageOnBuild=true --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg'
           - task: PublishPipelineArtifact@1
             displayName: Publish nupkg
             inputs:
@@ -115,11 +123,11 @@ stages:
               artifactName: build_output
 
   - stage: Build_Docs
-    condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.buildApiDocs}}))
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.buildApiDocs}}))
     displayName: Prepare API Documentation
     dependsOn: Build
     variables:
-      umbracoMajorVersion:  $[ stageDependencies.Build.A.outputs['determineMajorVersion.majorVersion'] ]
+      umbracoMajorVersion: $[ stageDependencies.Build.A.outputs['build.NBGV_VersionMajor'] ]
     jobs:
       # C# API Reference
       - job:
@@ -130,41 +138,41 @@ stages:
           - task: PowerShell@2
             displayName: Install DocFX
             inputs:
-                targetType: inline
-                script: |
-                  choco install docfx --version=2.59.2 -y
-                  if ($lastexitcode -ne 0){
-                      throw ("Error installing DocFX")
-                  }
+              targetType: inline
+              script: |
+                choco install docfx --version=2.59.4 -y
+                if ($lastexitcode -ne 0){
+                    throw ("Error installing DocFX")
+                }
           - task: PowerShell@2
             displayName: Generate metadata
             inputs:
-                targetType: inline
-                script: |
-                  docfx metadata "$(Build.SourcesDirectory)/build/csharp-docs/docfx.json"
-                  if ($lastexitcode -ne 0){
-                      throw ("Error generating metadata.")
-                  }
+              targetType: inline
+              script: |
+                docfx metadata "$(Build.SourcesDirectory)/build/csharp-docs/docfx.json"
+                if ($lastexitcode -ne 0){
+                    throw ("Error generating metadata.")
+                }
           - task: PowerShell@2
             displayName: Generate documentation
             inputs:
-                targetType: inline
-                script: |
-                  docfx build "$(Build.SourcesDirectory)/build/csharp-docs/docfx.json"
-                  if ($lastexitcode -ne 0){
-                        throw ("Error generating documentation.")
-                  }
+              targetType: inline
+              script: |
+                docfx build "$(Build.SourcesDirectory)/build/csharp-docs/docfx.json"
+                if ($lastexitcode -ne 0){
+                      throw ("Error generating documentation.")
+                }
           - task: ArchiveFiles@2
             displayName: Archive C# Docs
             inputs:
-                rootFolderOrFile: $(Build.SourcesDirectory)/build/csharp-docs/_site
-                includeRootFolder: false
-                archiveFile: $(Build.ArtifactStagingDirectory)/csharp-docs.zip
+              rootFolderOrFile: $(Build.SourcesDirectory)/build/csharp-docs/_site
+              includeRootFolder: false
+              archiveFile: $(Build.ArtifactStagingDirectory)/csharp-docs.zip
           - task: PublishPipelineArtifact@1
             displayName: Publish C# Docs
             inputs:
-                targetPath: $(Build.ArtifactStagingDirectory)/csharp-docs.zip
-                artifact: csharp-docs
+              targetPath: $(Build.ArtifactStagingDirectory)/csharp-docs.zip
+              artifact: csharp-docs
 
       # js API Reference
       - job:
@@ -173,9 +181,10 @@ stages:
           vmImage: 'ubuntu-latest'
         steps:
           - task: NodeTool@0
-            displayName: Use Node 10.15.0
+            displayName: Use Node.js 10.15.x
+            retryCountOnTaskFailure: 3
             inputs:
-              versionSpec: 10.15.0 # Won't work with 14.18.1
+              versionSpec: 10.15.x # Won't work with higher versions
           - script: |
               npm ci --no-fund --no-audit --prefer-offline
               npx gulp docs
@@ -192,14 +201,14 @@ stages:
           - task: ArchiveFiles@2
             displayName: Archive js Docs
             inputs:
-                rootFolderOrFile: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Docs/api
-                includeRootFolder: false
-                archiveFile: $(Build.ArtifactStagingDirectory)/ui-docs.zip
+              rootFolderOrFile: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Docs/api
+              includeRootFolder: false
+              archiveFile: $(Build.ArtifactStagingDirectory)/ui-docs.zip
           - task: PublishPipelineArtifact@1
             displayName: Publish js Docs
             inputs:
-                targetPath: $(Build.ArtifactStagingDirectory)/ui-docs.zip
-                artifact: ui-docs
+              targetPath: $(Build.ArtifactStagingDirectory)/ui-docs.zip
+              artifact: ui-docs
 
   ###############################################
   ## Test
@@ -228,21 +237,24 @@ stages:
               artifact: build_output
               path: $(Build.SourcesDirectory)
           - task: UseDotNet@2
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin')) # net6 already on the other images
-            displayName: Use net6
+            displayName: Use .NET $(dotnetVersion)
             inputs:
-              version: 6.x
+              version: $(dotnetVersion)
+              performMultiLevelLookup: true
+              includePreviewVersions: $(dotnetIncludePreviewVersions)
           - task: DotNetCoreCLI@2
             displayName: Run dotnet test
             inputs:
               command: test
               projects: '**/*.Tests.UnitTests.csproj'
-              arguments: '--no-build --configuration $(buildConfiguration)'
+              arguments: '--configuration $(buildConfiguration) --no-build'
               testRunTitle: Unit Tests - $(Agent.OS)
 
   - stage: Integration
     displayName: Integration Tests
     dependsOn: Build
+    variables:
+      releaseTestFilter: eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True')
     jobs:
       # Integration Tests (SQLite)
       - job:
@@ -264,25 +276,44 @@ stages:
               artifact: build_output
               path: $(Build.SourcesDirectory)
           - task: UseDotNet@2
-            displayName: Use net6
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin')) # net6 already on the other images
+            displayName: Use .NET $(dotnetVersion)
             inputs:
-              version: 6.x
+              version: $(dotnetVersion)
+              performMultiLevelLookup: true
+              includePreviewVersions: $(dotnetIncludePreviewVersions)
           - task: DotNetCoreCLI@2
-            displayName: Run dotnet test
+            displayName: Run dotnet test Windows
+            condition: eq(variables['Agent.OS'],'Windows_NT')
             inputs:
               command: test
               projects: '**/*.Tests.Integration.csproj'
-              arguments: '--no-build --configuration $(buildConfiguration)'
               testRunTitle: Integration Tests SQLite - $(Agent.OS)
+              ${{ if or(variables.releaseTestFilter, parameters.forceReleaseTestFilter) }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.integrationReleaseTestFilter}}'
+              ${{ else }}:
+                arguments: '--configuration $(buildConfiguration) ${{parameters.integrationNonReleaseTestFilter}}'
             env:
               Tests__Database__DatabaseType: 'Sqlite'
-              Umbraco__Cms__global__MainDomLock: 'FileSystemMainDomLock'
+              Umbraco__CMS__Global__MainDomLock: 'FileSystemMainDomLock'
+          - task: DotNetCoreCLI@2
+            displayName: Run dotnet test Non Windows
+            condition: ne(variables['Agent.OS'],'Windows_NT')
+            inputs:
+              command: test
+              projects: '**/*.Tests.Integration.csproj'
+              testRunTitle: Integration Tests SQLite - $(Agent.OS)
+              ${{ if or(variables.releaseTestFilter, parameters.forceReleaseTestFilter) }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.nonWindowsIntegrationReleaseTestFilter}}'
+              ${{ else }}:
+                arguments: '--configuration $(buildConfiguration) ${{parameters.nonWindowsIntegrationNonReleaseTestFilter}}'
+            env:
+              Tests__Database__DatabaseType: 'Sqlite'
+              Umbraco__CMS__Global__MainDomLock: 'FileSystemMainDomLock'
 
       # Integration Tests (SQL Server)
       - job:
         timeoutInMinutes: 120
-        condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.sqlServerIntegrationTests}})
+        condition: or(eq(stageDependencies.Build.A.outputs['build.NBGV_PublicRelease'], 'True'), ${{parameters.sqlServerIntegrationTests}})
         displayName: Integration Tests (SQL Server)
         strategy:
           matrix:
@@ -293,62 +324,73 @@ stages:
             Linux:
               vmImage: 'ubuntu-latest'
               testDb: SqlServer
-              connectionString: 'Server=localhost,1433;User Id=sa;Password=$(SA_PASSWORD);'
+              connectionString: 'Server=localhost,1433;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=true'
         pool:
           vmImage: $(vmImage)
+        variables:
+          SA_PASSWORD: UmbracoIntegration123!
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: Download build artifacts
             inputs:
               artifact: build_output
               path: $(Build.SourcesDirectory)
+          - task: UseDotNet@2
+            displayName: Use .NET $(dotnetVersion)
+            inputs:
+              version: $(dotnetVersion)
+              includePreviewVersions: $(dotnetIncludePreviewVersions)
           - powershell: sqllocaldb start mssqllocaldb
             displayName: Start localdb (Windows only)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-          - powershell: docker run --name mssql -d -p 1433:1433 -e ACCEPT_EULA=Y -e SA_PASSWORD=$(SA_PASSWORD) -e MSSQL_PID=Developer mcr.microsoft.com/mssql/server:2019-latest 
+          - powershell: docker run --name mssql -d -p 1433:1433 -e ACCEPT_EULA=Y -e SA_PASSWORD=$(SA_PASSWORD) -e MSSQL_PID=Developer mcr.microsoft.com/mssql/server:2019-latest
             displayName: Start SQL Server (Linux only)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
           - task: DotNetCoreCLI@2
-            displayName: Run dotnet test
+            displayName: Run dotnet test Windows
+            condition: eq(variables['Agent.OS'],'Windows_NT')
             inputs:
               command: test
               projects: '**/*.Tests.Integration.csproj'
-              arguments: '--no-build --configuration $(buildConfiguration)'
               testRunTitle: Integration Tests SQL Server - $(Agent.OS)
+              ${{ if or(variables.releaseTestFilter, parameters.forceReleaseTestFilter) }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.integrationReleaseTestFilter}}'
+              ${{ else }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.integrationNonReleaseTestFilter}}'
             env:
               Tests__Database__DatabaseType: $(testDb)
               Tests__Database__SQLServerMasterConnectionString: $(connectionString)
-              Umbraco__Cms__global__MainDomLock: 'SqlMainDomLock'
+              Umbraco__CMS__Global__MainDomLock: 'SqlMainDomLock'
+          - task: DotNetCoreCLI@2
+            displayName: Run dotnet test NonWindows
+            condition: ne(variables['Agent.OS'],'Windows_NT')
+            inputs:
+              command: test
+              projects: '**/*.Tests.Integration.csproj'
+              testRunTitle: Integration Tests SQL Server - $(Agent.OS)
+              ${{ if or(variables.releaseTestFilter, parameters.forceReleaseTestFilter) }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.nonWindowsIntegrationReleaseTestFilter}}'
+              ${{ else }}:
+                arguments: '--configuration $(buildConfiguration) --no-build ${{parameters.nonWindowsIntegrationNonReleaseTestFilter}}'
+            env:
+              Tests__Database__DatabaseType: $(testDb)
+              Tests__Database__SQLServerMasterConnectionString: $(connectionString)
+              Umbraco__CMS__Global__MainDomLock: 'SqlMainDomLock'
 
   - stage: E2E
     variables:
       npm_config_cache: $(Pipeline.Workspace)/.npm_e2e
-      CYPRESS_CACHE_FOLDER: $(Pipeline.Workspace)/cypress_binaries
     displayName: E2E Tests
     dependsOn: Build
     jobs:
-    # E2E Tests
+      # E2E Tests
       - job:
         displayName: E2E Tests
         variables:
-          - name: Umbraco__CMS__Unattended__InstallUnattended  # Windows only
-            value: true
-          - name: Umbraco__CMS__Unattended__UnattendedUserName  # Windows only
-            value: Cypress Test
-          - name: Umbraco__CMS__Unattended__UnattendedUserEmail  # Windows only
-            value: cypress@umbraco.com
-          - name: Umbraco__CMS__Unattended__UnattendedUserPassword  # Windows only
-            value: UmbracoAcceptance123!
-          - name: Umbraco__CMS__Global__InstallMissingDatabase  # Windows only
-            value: true
-          - name: UmbracoDatabaseServer # Windows only
-            value: (LocalDB)\MSSQLLocalDB
-          - name: UmbracoDatabaseName  # Windows only
-            value: Cypress
-          - name: ConnectionStrings__umbracoDbDSN  # Windows only
-            value: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true;
-          - name: CYPRESS_BASE_URL
-            value: http://localhost:8080
+          Umbraco__CMS__Unattended__UnattendedUserName: Playwright Test
+          Umbraco__CMS__Unattended__UnattendedUserPassword: UmbracoAcceptance123!
+          Umbraco__CMS__Unattended__UnattendedUserEmail: playwright@umbraco.com
+          ASPNETCORE_URLS: https://localhost:8443
         strategy:
           matrix:
             Linux:
@@ -357,8 +399,23 @@ stages:
               dockerImageName: umbraco-linux
             Windows:
               vmImage: 'windows-latest'
+              DOTNET_GENERATE_ASPNET_CERTIFICATE: true # Automatically generate HTTPS development certificate on Windows
+              # Enable console logging in Release mode
+              Serilog__WriteTo__0__Name: Async
+              Serilog__WriteTo__0__Args__configure__0__Name: Console
+              # Set unattended install settings
+              Umbraco__CMS__Unattended__InstallUnattended: true
+              Umbraco__CMS__Global__InstallMissingDatabase: true
+              UmbracoDatabaseServer: (LocalDB)\MSSQLLocalDB
+              UmbracoDatabaseName: AcceptanceTestDB
+              ConnectionStrings__umbracoDbDSN: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true;
+              # Custom Umbraco settings
+              Umbraco__CMS__Global__VersionCheckPeriod: 0
+              Umbraco__CMS__Global__UseHttps: true
+              Umbraco__CMS__HealthChecks__Notification__Enabled: false
+              Umbraco__CMS__KeepAlive__DisableKeepAliveTask: true
         pool:
-            vmImage: $(vmImage)
+          vmImage: $(vmImage)
         steps:
           - task: DownloadPipelineArtifact@2
             displayName: Download nupkg
@@ -366,7 +423,8 @@ stages:
               artifact: nupkg
               path: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/misc/nupkg
           - task: NodeTool@0
-            displayName: Use Node $(nodeVersion)
+            displayName: Use Node.js $(nodeVersion)
+            retryCountOnTaskFailure: 3
             inputs:
               versionSpec: $(nodeVersion)
           - task: Cache@2
@@ -377,91 +435,92 @@ stages:
                 "npm_e2e" | "$(Agent.OS)"
                 "npm_e2e"
               path: $(npm_config_cache)
-          - task: Cache@2
-            displayName: Cache cypress binaries
-            inputs:
-              key: '"cypress_binaries" | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
-              path: $(CYPRESS_CACHE_FOLDER)
-          - task: PowerShell@2
-            displayName: Generate Cypress.env.json
-            inputs:
-              targetType: inline
-              script: >
-                @{ username = "$(Umbraco__CMS__Unattended__UnattendedUserEmail)"; password = "$(Umbraco__CMS__Unattended__UnattendedUserPassword)" } | ConvertTo-Json | Set-Content -Path "tests/Umbraco.Tests.AcceptanceTest/cypress.env.json"#
+          - pwsh: |
+              New-Item -Path "." -Name ".env" -ItemType "file" -Value "UMBRACO_USER_LOGIN=$(Umbraco__CMS__Unattended__UnattendedUserEmail)
+              UMBRACO_USER_PASSWORD=$(Umbraco__CMS__Unattended__UnattendedUserPassword)
+              URL=$(ASPNETCORE_URLS)"
+            displayName: Generate .env
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/
           - script: npm ci --no-fund --no-audit --prefer-offline
-            workingDirectory:  $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/
             displayName: Run npm ci
-          - powershell: sqllocaldb start mssqllocaldb
+          - pwsh: sqllocaldb start mssqllocaldb
             displayName: Start localdb (Windows only)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-          - powershell:  Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer
+          - pwsh: Invoke-Sqlcmd -Query "CREATE DATABASE $env:UmbracoDatabaseName" -ServerInstance $env:UmbracoDatabaseServer
             displayName: Create database (Windows only)
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-           # Linux containers smooth
-          - task: PowerShell@2
+          - task: UseDotNet@2
+            displayName: Use .NET $(dotnetVersion)
+            inputs:
+              version: $(dotnetVersion)
+              performMultiLevelLookup: true
+              includePreviewVersions: $(dotnetIncludePreviewVersions)
+          - pwsh: |
+              $sha = 'g$(Build.SourceVersion)'.substring(0, 8)
+              docker build -t $(dockerImageName):$sha -f $(dockerfile) .
+              mkdir -p $(Build.ArtifactStagingDirectory)/docker-images
+              docker save -o $(Build.ArtifactStagingDirectory)/docker-images/$(dockerImageName).$sha.tar $(dockerImageName):$sha
+              dotnet dev-certs https -ep ${HOME}/.aspnet/https/aspnetapp.pfx -p $(Umbraco__CMS__Unattended__UnattendedUserPassword)
+              docker run --name $(dockerImageName) -dp 8080:5000 -dp 8443:5001 -e UMBRACO__CMS__GLOBAL__ID=$(UMBRACO__CMS__GLOBAL__ID) -e ASPNETCORE_Kestrel__Certificates__Default__Password="$(Umbraco__CMS__Unattended__UnattendedUserPassword)" -e ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetapp.pfx -v ${HOME}/.aspnet/https:/https/ $(dockerImageName):$sha
+              docker ps
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-            displayName: Build & run container (Linux only)
-            inputs:
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
-              targetType: inline
-              script: |
-                $sha = 'g$(Build.SourceVersion)'.substring(0, 8)
-                docker build -t $(dockerImageName):$sha -f $(dockerfile) .
-                mkdir -p $(Build.ArtifactStagingDirectory)/docker-images
-                docker save -o $(Build.ArtifactStagingDirectory)/docker-images/$(dockerImageName).$sha.tar $(dockerImageName):$sha
-                docker run --name $(dockerImageName) -dp 8080:5000 -e UMBRACO__CMS_GLOBAL__ID=$(UMBRACO__CMS_GLOBAL__ID) $(dockerImageName):$sha
-                docker ps
-          # Windows containers take forever.
-          # --no-launch-profile stops ASPNETCORE_ENVIRONMENT=Development which breaks the users.ts tests (smtp config = invite user button)
-          # Urls matching docker setup.
-          - task: PowerShell@2
+            displayName: Build and run container (Linux only)
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
+          - pwsh: |
+              dotnet new --install ./nupkg/Umbraco.Templates.*.nupkg
+              dotnet new umbraco --name AcceptanceTestProject --no-restore --output .
+              dotnet restore --configfile ./nuget.config
+              dotnet build --configuration $(buildConfiguration) --no-restore
+              dotnet dev-certs https
+              $process = Start-Process -FilePath "dotnet" -ArgumentList "run --configuration $(buildConfiguration) --no-build --no-launch-profile 2>&1" -PassThru -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log
+              Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)"
             condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-            displayName: Build & run app (Windows only)
-            inputs:
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
-              targetType: inline
-              script: |
-                dotnet new --install ./nupkg/Umbraco.Templates.*.nupkg
-                dotnet new umbraco --name Cypress -o . --no-restore
-                dotnet restore --configfile ./nuget.config
-                dotnet build --no-restore -c Release
-                Start-Process -FilePath "dotnet" -ArgumentList "run --no-build -c Release --no-launch-profile --urls $(CYPRESS_BASE_URL)"
-          - task: PowerShell@2
+            displayName: Build and run app (Windows only)
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
+          - pwsh: npx wait-on -v --interval 1000 --timeout 120000 $(ASPNETCORE_URLS)
             displayName: Wait for app
-            inputs:
-              targetType: inline
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest
-              script: |
-                npm i -g wait-on
-                wait-on -v --interval 1000 --timeout 120000 $(CYPRESS_BASE_URL)
-          - task: PowerShell@2
-            displayName: Run Cypress (Desktop)
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+          - pwsh: npx playwright install --with-deps
+            displayName: Install Playwright
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+          - pwsh: npm run test --ignore-certificate-errors
+            displayName: Run Playwright (Desktop)
             continueOnError: true
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+            env:
+              CI: true
+              CommitId: $(Build.SourceVersion)
+              AgentOs: $(Agent.OS)
+          - pwsh: |
+              docker logs $(dockerImageName) > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1
+              docker stop $(dockerImageName)
+            condition: eq(variables['Agent.OS'], 'Linux')
+            displayName: Stop app (Linux only)
+          - pwsh: Stop-Process $env:AcceptanceTestProcessId
+            condition: eq(variables['Agent.OS'], 'Windows_NT')
+            displayName: Stop app (Windows only)
+          - task: PowerShell@2
+            displayName: Check if artifacts folder exists
             inputs:
               targetType: inline
-              workingDirectory: tests/Umbraco.Tests.AcceptanceTest
-              script: 'npm run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"'
-          - task: PublishTestResults@2
-            displayName: Publish test results
-            condition: always()
-            inputs:
-              testResultsFormat: 'JUnit'
-              testResultsFiles: 'tests/Umbraco.Tests.AcceptanceTest/results/test-output-D-*.xml'
-              mergeTestResults: true
-              testRunTitle: "e2e - $(Agent.OS)"
+              script: |
+                $MyVariable = Test-Path -Path $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/results
+                Write-Host "##vso[task.setvariable variable=resultFolderExists;]$MyVariable"
           - task: CopyFiles@2
             displayName: Prepare artifacts
-            condition: always()
+            condition: eq(variables.resultFolderExists, 'True')
             inputs:
-              sourceFolder: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/cypress/artifacts
-              targetFolder: $(Build.ArtifactStagingDirectory)/cypresss
+              sourceFolder: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/results/
+              targetFolder: $(Build.ArtifactStagingDirectory)/playwright
           - task: PublishPipelineArtifact@1
-            displayName: "Publish test artifacts"
             condition: always()
+            displayName: Publish test artifacts
             inputs:
               targetPath: $(Build.ArtifactStagingDirectory)
               artifact: 'E2E artifacts - $(Agent.OS) - Attempt #$(System.JobAttempt)'
 
+
   ###############################################
   ## Release
   ###############################################
@@ -471,9 +530,11 @@ stages:
       - Unit
       - Integration
       # - E2E # TODO: Enable when stable.
-    condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.myGetDeploy}}))
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.myGetDeploy}}))
     jobs:
       - job:
+        pool:
+          vmImage: "windows-latest" # NuGetCommand@2 is no longer supported on Ubuntu 24.04 so we'll use windows until an alternative is available.
         displayName: Push to pre-release feed
         steps:
           - checkout: none
@@ -483,21 +544,25 @@ stages:
               artifact: nupkg
               path: $(Build.ArtifactStagingDirectory)/nupkg
           - task: NuGetCommand@2
-            displayName: Nuget push
+            displayName: NuGet push
             inputs:
               command: 'push'
               packagesToPush: $(Build.ArtifactStagingDirectory)/**/*.nupkg
               nuGetFeedType: 'external'
-              publishFeedCredentials: 'MyGet - Pre-releases'
-
+              ${{ if eq(parameters.isNightly, true) }}:
+                publishFeedCredentials: 'MyGet - Umbraco Nightly'
+              ${{ else }}:
+                publishFeedCredentials: 'MyGet - Pre-releases'
   - stage: Deploy_NuGet
     displayName: NuGet release
     dependsOn:
       - Deploy_MyGet
       - Build_Docs
-    condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.nuGetDeploy}}))
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.nuGetDeploy}}))
     jobs:
       - job:
+        pool:
+          vmImage: "windows-latest" # NuGetCommand@2 is no longer supported on Ubuntu 24.04 so we'll use windows until an alternative is available.
         displayName: Push to NuGet
         steps:
           - checkout: none
@@ -507,7 +572,7 @@ stages:
               artifact: nupkg
               path: $(Build.ArtifactStagingDirectory)/nupkg
           - task: NuGetCommand@2
-            displayName: Nuget push
+            displayName: NuGet push
             inputs:
               command: 'push'
               packagesToPush: $(Build.ArtifactStagingDirectory)/**/*.nupkg
@@ -518,12 +583,12 @@ stages:
     pool:
       vmImage: 'windows-latest' # Apparently AzureFileCopy is windows only :(
     variables:
-      umbracoMajorVersion:  $[ stageDependencies.Build.A.outputs['determineMajorVersion.majorVersion'] ]
+      umbracoMajorVersion:  $[ stageDependencies.Build.A.outputs['build.NBGV_VersionMajor'] ]
     displayName: Upload API Documention
     dependsOn:
       - Build
       - Deploy_NuGet
-    condition: and(succeeded(), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ${{parameters.uploadApiDocs}}))
+    condition: and(succeeded(), or(eq(dependencies.Build.outputs['A.build.NBGV_PublicRelease'], 'True'), ${{parameters.uploadApiDocs}}))
     jobs:
       - job:
         displayName: Upload C# Docs

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,45 +0,0 @@
-<Project>
-  <!-- Enable multi-level merging -->
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
-
-  <PropertyGroup>
-    <Version>10.0.0</Version>
-    <AssemblyVersion>10.0.0</AssemblyVersion>
-    <InformationalVersion>10.0.0-rc1</InformationalVersion>
-    <FileVersion>10.0.0</FileVersion>
-    <LangVersion Condition="'$(LangVersion)' == ''">10.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>
-    <Nullable>enable</Nullable>
-    <WarningsAsErrors>Nullable</WarningsAsErrors>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </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

@@ -51,13 +51,12 @@ namespace JsonSchema
                 public ImagingSettings? Imaging { get; set; }
 
                 public IndexCreatorSettings? Examine { get; set; }
+                public IndexingSettings? Indexing { get; set; }
 
                 public KeepAliveSettings? KeepAlive { get; set; }
 
                 public LoggingSettings? Logging { get; set; }
 
-                public MemberPasswordConfigurationSettings? MemberPassword { get; set; }
-
                 public NuCacheSettings? NuCache { get; set; }
 
                 public RequestHandlerSettings? RequestHandler { get; set; }
@@ -70,8 +69,6 @@ namespace JsonSchema
 
                 public TypeFinderSettings? TypeFinder { get; set; }
 
-                public UserPasswordConfigurationSettings? UserPassword { get; set; }
-
                 public WebRoutingSettings? WebRouting { get; set; }
 
                 public UmbracoPluginSettings? Plugins { get; set; }
@@ -92,9 +89,25 @@ namespace JsonSchema
 
                 public HelpPageSettings? HelpPage { get; set; }
 
-                public InstallDefaultDataSettings? DefaultDataCreation { get; set; }
+                public InstallDefaultData? InstallDefaultData { get; set; }
 
                 public DataTypesSettings? DataTypes { get; set; }
+
+                public MarketplaceSettings? Marketplace { 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>

src/JsonSchema/JsonSchema.csproj

@@ -1,38 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
+    <EnablePackageValidation>false</EnablePackageValidation>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="CommandLineParser" Version="2.9.1" />
-      <PackageReference Include="NJsonSchema" Version="10.7.2" />
-      <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-      <PackageReference Include="Umbraco.Deploy.Core" Version="9.3.1" />
-      <PackageReference Include="Umbraco.Forms.Core" Version="10.0.0-rc1" />
-      <PackageReference Include="Umbraco.Deploy.Core" Version="9.4.0" />
-      <PackageReference Include="Umbraco.Forms.Core" Version="9.4.0" />
-      <PackageReference Update="Nerdbank.GitVersioning">
-        <Version>3.5.107</Version>
-      </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="NJsonSchema" Version="10.9.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/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/appsettings-schema.json")]
+        [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "appsettings-schema.json")]
         public string OutputFile { get; set; } = null!;
     }
 }

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
 {
@@ -50,6 +49,9 @@ namespace JsonSchema
         {
             NJsonSchema.JsonSchema schema = _innerGenerator.Generate(typeof(AppSettings));
 
+            // 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));
+
+    }
+}

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

@@ -0,0 +1,42 @@
+using Examine;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Infrastructure.Examine;
+using Umbraco.Cms.ManagementApi.Factories;
+using Umbraco.Cms.ManagementApi.ViewModels.ExamineManagement;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.ExamineManagement;
+
+[ApiVersion("1.0")]
+public class IndexesExamineManagementController : ExamineManagementControllerBase
+{
+    private readonly IExamineManager _examineManager;
+    private readonly IExamineIndexViewModelFactory _examineIndexViewModelFactory;
+
+    public IndexesExamineManagementController(
+        IExamineManager examineManager,
+        IExamineIndexViewModelFactory examineIndexViewModelFactory)
+    {
+        _examineManager = examineManager;
+        _examineIndexViewModelFactory = examineIndexViewModelFactory;
+    }
+
+    /// <summary>
+    ///     Get the details for indexers
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("indexes")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<ExamineIndexViewModel>), StatusCodes.Status200OK)]
+    public async Task<PagedViewModel<ExamineIndexViewModel>> Indexes(int skip, int take)
+    {
+        ExamineIndexViewModel[] indexes = _examineManager.Indexes
+            .Select(_examineIndexViewModelFactory.Create)
+            .OrderBy(examineIndexModel => examineIndexModel.Name?.TrimEnd("Indexer")).ToArray();
+
+        var viewModel = new PagedViewModel<ExamineIndexViewModel> { Items = indexes.Skip(skip).Take(take), Total = indexes.Length };
+        return viewModel;
+    }
+}

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

@@ -0,0 +1,82 @@
+using Examine;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Infrastructure.Examine;
+using Umbraco.New.Cms.Infrastructure.Services;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.ExamineManagement;
+
+[ApiVersion("1.0")]
+public class RebuildExamineManagementController : ExamineManagementControllerBase
+{
+    private readonly ILogger<RebuildExamineManagementController> _logger;
+    private readonly IIndexingRebuilderService _indexingRebuilderService;
+    private readonly IExamineManager _examineManager;
+
+    public RebuildExamineManagementController(
+        ILogger<RebuildExamineManagementController> logger,
+        IIndexingRebuilderService indexingRebuilderService,
+        IExamineManager examineManager)
+    {
+        _logger = logger;
+        _indexingRebuilderService = indexingRebuilderService;
+        _examineManager = examineManager;
+    }
+
+    /// <summary>
+    ///     Rebuilds the index
+    /// </summary>
+    /// <param name="indexName"></param>
+    /// <returns></returns>
+    [HttpPost("rebuild")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(OkResult), StatusCodes.Status200OK)]
+    public async Task<IActionResult> Rebuild(string indexName)
+    {
+        if (!_examineManager.TryGetIndex(indexName, out var 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));
+        }
+
+        if (!_indexingRebuilderService.CanRebuild(index.Name))
+        {
+            var invalidModelProblem = new ProblemDetails
+            {
+                Title = "Could not validate the populator",
+                Detail =
+                    $"The index {index?.Name} could not be rebuilt because we could not validate its associated {typeof(IIndexPopulator)}",
+                Status = StatusCodes.Status400BadRequest,
+                Type = "Error",
+            };
+
+            return await Task.FromResult(BadRequest(invalidModelProblem));
+        }
+
+        _logger.LogInformation("Rebuilding index '{IndexName}'", indexName);
+
+        if (_indexingRebuilderService.TryRebuild(index, indexName))
+        {
+            return await Task.FromResult(Ok());
+        }
+
+        var problemDetails = new ProblemDetails
+        {
+            Title = "Index could not be rebuilt",
+            Detail = $"The index {index.Name} could not be rebuild. Check the log for details on this error.",
+            Status = StatusCodes.Status400BadRequest,
+            Type = "Error",
+        };
+
+        return await Task.FromResult(Conflict(problemDetails));
+    }
+}

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

@@ -0,0 +1,80 @@
+using Examine;
+using Examine.Search;
+using Lucene.Net.QueryParsers.Classic;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.ManagementApi.Services;
+using Umbraco.Cms.ManagementApi.ViewModels.ExamineManagement;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.ExamineManagement;
+
+[ApiVersion("1.0")]
+public class SearchExamineManagementController : ExamineManagementControllerBase
+{
+    private readonly IExamineManagerService _examineManagerService;
+
+    public SearchExamineManagementController(IExamineManagerService examineManagerService) => _examineManagerService = examineManagerService;
+
+    [HttpGet("search")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<PagedViewModel<SearchResultViewModel>>), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<PagedViewModel<SearchResultViewModel>>> GetSearchResults(string searcherName, string? query, int skip, int take)
+    {
+        query = query?.Trim();
+
+        if (query.IsNullOrWhiteSpace())
+        {
+            return new PagedViewModel<SearchResultViewModel>();
+        }
+
+        if (!_examineManagerService.TryFindSearcher(searcherName, out ISearcher searcher))
+        {
+            var invalidModelProblem = new ProblemDetails
+            {
+                Title = "Could not find a valid searcher",
+                Detail = "The provided searcher name did not match any of our registered searchers",
+                Status = StatusCodes.Status404NotFound,
+                Type = "Error",
+            };
+
+            return NotFound(invalidModelProblem);
+        }
+
+        ISearchResults results;
+
+        // NativeQuery will work for a single word/phrase too (but depends on the implementation) the lucene one will work.
+        try
+        {
+            results = searcher
+                .CreateQuery()
+                .NativeQuery(query)
+                .Execute(QueryOptions.SkipTake(skip, take));
+        }
+        catch (ParseException)
+        {
+            var invalidModelProblem = new ProblemDetails
+            {
+                Title = "Could not parse the query",
+                Detail = "Parser could not parse the query. Please double check if the query is valid. Sometimes this can also happen if your query starts with a wildcard (*)",
+                Status = StatusCodes.Status404NotFound,
+                Type = "Error",
+            };
+
+            return BadRequest(invalidModelProblem);
+        }
+
+        return await Task.FromResult(new PagedViewModel<SearchResultViewModel>
+        {
+            Total = results.TotalItemCount,
+            Items = results.Select(x => new SearchResultViewModel
+            {
+                Id = x.Id,
+                Score = x.Score,
+                Fields = x.AllValues.OrderBy(y => y.Key).Select(y => new FieldViewModel { Name = y.Key, Values = y.Value }),
+            }),
+        });
+    }
+}

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

@@ -0,0 +1,39 @@
+using Examine;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Infrastructure.Examine;
+using Umbraco.Cms.ManagementApi.ViewModels.ExamineManagement;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.ExamineManagement;
+
+[ApiVersion("1.0")]
+public class SearchersExamineManagementController : ExamineManagementControllerBase
+{
+    private readonly IExamineManager _examineManager;
+
+    public SearchersExamineManagementController(IExamineManager examineManager) => _examineManager = examineManager;
+
+    /// <summary>
+    ///     Get the details for searchers
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("searchers")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<SearcherViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<SearcherViewModel>>> Searchers(int skip, int take)
+    {
+        var searchers = new List<SearcherViewModel>(
+            _examineManager.RegisteredSearchers.Select(searcher => new SearcherViewModel { Name = searcher.Name })
+                .OrderBy(x =>
+                    x.Name.TrimEnd("Searcher"))); // order by name , but strip the "Searcher" from the end if it exists
+        var viewModel = new PagedViewModel<SearcherViewModel>
+        {
+            Items = searchers.Skip(skip).Take(take),
+            Total = searchers.Count,
+        };
+
+        return await Task.FromResult(Ok(viewModel));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Help/GetHelpController.cs

@@ -0,0 +1,80 @@
+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.Serialization;
+using Umbraco.Cms.ManagementApi.Builders;
+using Umbraco.Cms.ManagementApi.Factories;
+using Umbraco.Cms.ManagementApi.ViewModels.Help;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Help;
+
+public class GetHelpController : HelpControllerBase
+{
+    private readonly ILogger<GetHelpController> _logger;
+    private readonly IJsonSerializer _jsonSerializer;
+    private HelpPageSettings _helpPageSettings;
+
+    public GetHelpController(
+        IOptionsMonitor<HelpPageSettings> helpPageSettings,
+        ILogger<GetHelpController> logger,
+        IJsonSerializer jsonSerializer)
+    {
+        _logger = logger;
+        _jsonSerializer = jsonSerializer;
+        _helpPageSettings = helpPageSettings.CurrentValue;
+        helpPageSettings.OnChange(UpdateHelpPageSettings);
+    }
+
+    private void UpdateHelpPageSettings(HelpPageSettings settings) => _helpPageSettings = settings;
+
+    [HttpGet]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(PagedViewModel<HelpPageViewModel>), StatusCodes.Status200OK)]
+    public async Task<IActionResult> Get(string section, string? tree, int skip, int take, string? baseUrl = "https://our.umbraco.com")
+    {
+        if (IsAllowedUrl(baseUrl) is false)
+        {
+            _logger.LogError($"The following URL is not listed in the allowlist for HelpPage in HelpPageSettings: {baseUrl}");
+
+            ProblemDetails invalidModelProblem =
+                new ProblemDetailsBuilder()
+                    .WithTitle("Invalid database configuration")
+                    .WithDetail("The provided database configuration is invalid")
+                    .Build();
+
+            return BadRequest(invalidModelProblem);
+        }
+
+        var url = string.Format(baseUrl + "/Umbraco/Documentation/Lessons/GetContextHelpDocs?sectionAlias={0}&treeAlias={1}", section, tree);
+
+        try
+        {
+            var httpClient = new HttpClient();
+
+            // fetch dashboard json and parse to JObject
+            var json = await httpClient.GetStringAsync(url);
+            List<HelpPageViewModel>? result = _jsonSerializer.Deserialize<List<HelpPageViewModel>>(json);
+            if (result != null)
+            {
+                return Ok(new PagedViewModel<HelpPageViewModel>
+                {
+                    Total = result.Count,
+                    Items = result.Skip(skip).Take(take),
+                });
+            }
+        }
+        catch (HttpRequestException rex)
+        {
+            _logger.LogInformation($"Check your network connection, exception: {rex.Message}");
+        }
+
+        return Ok(PagedViewModel<HelpPageViewModel>.Empty());
+    }
+
+    private bool IsAllowedUrl(string? url) =>
+        _helpPageSettings.HelpPageUrlAllowList is null || _helpPageSettings.HelpPageUrlAllowList.Contains(url);
+}

src/Umbraco.Cms.ManagementApi/Controllers/Help/HelpControllerBase.cs

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

src/Umbraco.Cms.ManagementApi/Controllers/Install/InstallControllerBase.cs

@@ -0,0 +1,15 @@
+using Microsoft.AspNetCore.Mvc;
+using NSwag.Annotations;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.ManagementApi.Filters;
+using Umbraco.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Install;
+
+[ApiController]
+[VersionedApiBackOfficeRoute("install")]
+[OpenApiTag("Install")]
+[RequireRuntimeLevel(RuntimeLevel.Install)]
+public abstract class InstallControllerBase : ManagementApiControllerBase
+{
+}

src/Umbraco.Cms.ManagementApi/Controllers/Install/SettingsInstallController.cs

@@ -0,0 +1,43 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Infrastructure.Install;
+using Umbraco.Cms.ManagementApi.ViewModels.Installer;
+using Umbraco.New.Cms.Core.Factories;
+using Umbraco.New.Cms.Core.Models.Installer;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Install;
+
+[ApiVersion("1.0")]
+public class SettingsInstallController : InstallControllerBase
+{
+    private readonly InstallHelper _installHelper;
+    private readonly IInstallSettingsFactory _installSettingsFactory;
+    private readonly IUmbracoMapper _mapper;
+
+    public SettingsInstallController(
+        InstallHelper installHelper,
+        IInstallSettingsFactory installSettingsFactory,
+        IUmbracoMapper mapper)
+    {
+        _installHelper = installHelper;
+        _installSettingsFactory = installSettingsFactory;
+        _mapper = mapper;
+    }
+
+    [HttpGet("settings")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status428PreconditionRequired)]
+    [ProducesResponseType(typeof(InstallSettingsViewModel), StatusCodes.Status200OK)]
+    public async Task<ActionResult<InstallSettingsViewModel>> Settings()
+    {
+        // Register that the install has started
+        await _installHelper.SetInstallStatusAsync(false, string.Empty);
+
+        InstallSettingsModel installSettings = _installSettingsFactory.GetInstallSettings();
+        InstallSettingsViewModel viewModel = _mapper.Map<InstallSettingsViewModel>(installSettings)!;
+
+        return viewModel;
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Install/SetupInstallController.cs

@@ -0,0 +1,47 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.ManagementApi.ViewModels.Installer;
+using Umbraco.Extensions;
+using Umbraco.New.Cms.Core.Models.Installer;
+using Umbraco.New.Cms.Core.Services.Installer;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Install;
+
+[ApiVersion("1.0")]
+public class SetupInstallController : InstallControllerBase
+{
+    private readonly IUmbracoMapper _mapper;
+    private readonly IInstallService _installService;
+    private readonly IHostingEnvironment _hostingEnvironment;
+    private readonly GlobalSettings _globalSettings;
+
+    public SetupInstallController(
+        IUmbracoMapper mapper,
+        IInstallService installService,
+        IOptions<GlobalSettings> globalSettings,
+        IHostingEnvironment hostingEnvironment)
+    {
+        _mapper = mapper;
+        _installService = installService;
+        _hostingEnvironment = hostingEnvironment;
+        _globalSettings = globalSettings.Value;
+    }
+
+    [HttpPost("setup")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status428PreconditionRequired)]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<IActionResult> Setup(InstallViewModel installData)
+    {
+        InstallData data = _mapper.Map<InstallData>(installData)!;
+        await _installService.Install(data);
+
+        var backOfficePath = _globalSettings.GetBackOfficePath(_hostingEnvironment);
+        return Created(backOfficePath, null);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Install/ValidateDatabaseInstallController.cs

@@ -0,0 +1,49 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Install.Models;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Infrastructure.Migrations.Install;
+using Umbraco.Cms.ManagementApi.ViewModels.Installer;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Install;
+
+[ApiVersion("1.0")]
+public class ValidateDatabaseInstallController : InstallControllerBase
+{
+    private readonly DatabaseBuilder _databaseBuilder;
+    private readonly IUmbracoMapper _mapper;
+
+    public ValidateDatabaseInstallController(
+        DatabaseBuilder databaseBuilder,
+        IUmbracoMapper mapper)
+    {
+        _databaseBuilder = databaseBuilder;
+        _mapper = mapper;
+    }
+
+    [HttpPost("validateDatabase")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<IActionResult> ValidateDatabase(DatabaseInstallViewModel viewModel)
+    {
+        DatabaseModel databaseModel = _mapper.Map<DatabaseModel>(viewModel)!;
+
+        var success = _databaseBuilder.ConfigureDatabaseConnection(databaseModel, true);
+
+        if (success)
+        {
+            return await Task.FromResult(Ok());
+        }
+
+        var invalidModelProblem = new ProblemDetails
+        {
+            Title = "Invalid database configuration",
+            Detail = "The provided database configuration is invalid",
+            Status = StatusCodes.Status400BadRequest,
+            Type = "Error",
+        };
+
+        return await Task.FromResult(BadRequest(invalidModelProblem));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Language/AllLanguageController.cs

@@ -0,0 +1,36 @@
+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.Language;
+using Umbraco.Cms.ManagementApi.ViewModels.Pagination;
+using Umbraco.New.Cms.Core.Models;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Language;
+
+public class AllLanguageController : LanguageControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+    private readonly IUmbracoMapper _umbracoMapper;
+
+    public AllLanguageController(ILocalizationService localizationService, IUmbracoMapper umbracoMapper)
+    {
+        _localizationService = localizationService;
+        _umbracoMapper = umbracoMapper;
+    }
+
+    /// <summary>1
+    ///     Returns all currently configured languages.
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<LanguageViewModel>), StatusCodes.Status200OK)]
+    public async Task<PagedViewModel<LanguageViewModel>?> GetAll(int skip, int take)
+    {
+        PagedModel<ILanguage> allLanguages = _localizationService.GetAllLanguagesPaged(skip, take);
+
+        return await Task.FromResult(_umbracoMapper.Map<PagedModel<ILanguage>, PagedViewModel<LanguageViewModel>>(allLanguages)!);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Language/ByIdLanguageController.cs

@@ -0,0 +1,35 @@
+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.Language;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Language;
+
+public class ByIdLanguageController : LanguageControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+    private readonly IUmbracoMapper _umbracoMapper;
+
+    public ByIdLanguageController(ILocalizationService localizationService, IUmbracoMapper umbracoMapper)
+    {
+        _localizationService = localizationService;
+        _umbracoMapper = umbracoMapper;
+    }
+
+    [HttpGet("{id:int}")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(NotFoundResult), StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<LanguageViewModel?>> ById(int id)
+    {
+        ILanguage? lang = _localizationService.GetLanguageById(id);
+        if (lang is null)
+        {
+            return NotFound();
+        }
+
+        return await Task.FromResult(_umbracoMapper.Map<LanguageViewModel>(lang));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Language/CreateLanguageController.cs

@@ -0,0 +1,61 @@
+using System.Globalization;
+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.Language;
+using Umbraco.New.Cms.Core.Services.Installer;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Language;
+
+public class CreateLanguageController : LanguageControllerBase
+{
+    private readonly ILanguageService _languageService;
+    private readonly IUmbracoMapper _umbracoMapper;
+    private readonly ILocalizationService _localizationService;
+
+    public CreateLanguageController(ILanguageService languageService, IUmbracoMapper umbracoMapper, ILocalizationService localizationService)
+    {
+        _languageService = languageService;
+        _umbracoMapper = umbracoMapper;
+        _localizationService = localizationService;
+    }
+
+    /// <summary>
+    ///     Creates or saves a language
+    /// </summary>
+    [HttpPost("create")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status201Created)]
+    // TODO: This needs to be an authorized endpoint.
+    public async Task<ActionResult> Create(LanguageViewModel language)
+    {
+        if (_languageService.LanguageAlreadyExists(language.Id, language.IsoCode))
+        {
+            // Someone is trying to create a language that already exist
+            ModelState.AddModelError("IsoCode", "The language " + language.IsoCode + " already exists");
+            return ValidationProblem(ModelState);
+        }
+
+        // Creating a new lang...
+        CultureInfo culture;
+        try
+        {
+            culture = CultureInfo.GetCultureInfo(language.IsoCode);
+        }
+        catch (CultureNotFoundException)
+        {
+            ModelState.AddModelError("IsoCode", "No Culture found with name " + language.IsoCode);
+            return ValidationProblem(ModelState);
+        }
+
+        language.Name ??= culture.EnglishName;
+
+        ILanguage newLang = _umbracoMapper.Map<ILanguage>(language)!;
+
+        _localizationService.Save(newLang);
+        return await Task.FromResult(Created($"api/v1.0/language/{newLang.Id}", null));
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Language/DeleteLanguageController.cs

@@ -0,0 +1,50 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.ManagementApi.Builders;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Language;
+
+public class DeleteLanguageController : LanguageControllerBase
+{
+    private readonly ILocalizationService _localizationService;
+
+    public DeleteLanguageController(ILocalizationService localizationService) => _localizationService = localizationService;
+
+    /// <summary>
+    ///     Deletes a language with a given ID
+    /// </summary>
+    [HttpDelete("{id:int}")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    // TODO: This needs to be an authorized endpoint.
+    public async Task<IActionResult> Delete(int id)
+    {
+        ILanguage? language = _localizationService.GetLanguageById(id);
+        if (language == null)
+        {
+            return await Task.FromResult(NotFound());
+        }
+
+        // the service would not let us do it, but test here nevertheless
+        if (language.IsDefault)
+        {
+            ProblemDetails invalidModelProblem =
+                new ProblemDetailsBuilder()
+                    .WithTitle("Cannot delete default language")
+                    .WithDetail($"Language '{language.IsoCode}' is currently set to 'default' and can not be deleted.")
+                    .Build();
+
+            return BadRequest(invalidModelProblem);
+        }
+
+        // service is happy deleting a language that's fallback for another language,
+        // will just remove it - so no need to check here
+        _localizationService.Delete(language);
+
+        return await Task.FromResult(Ok());
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Language/LanguageControllerBase.cs

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

src/Umbraco.Cms.ManagementApi/Controllers/Language/UpdateLanguageController.cs

@@ -0,0 +1,66 @@
+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.Language;
+using Umbraco.New.Cms.Core.Services.Installer;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Language;
+
+public class UpdateLanguageController : LanguageControllerBase
+{
+    private readonly ILanguageService _languageService;
+    private readonly IUmbracoMapper _umbracoMapper;
+    private readonly ILocalizationService _localizationService;
+
+    public UpdateLanguageController(ILanguageService languageService, IUmbracoMapper umbracoMapper, ILocalizationService localizationService)
+    {
+        _languageService = languageService;
+        _umbracoMapper = umbracoMapper;
+        _localizationService = localizationService;
+    }
+
+    /// <summary>
+    ///     Updates a language
+    /// </summary>
+    [HttpPut("update")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(NotFoundResult), StatusCodes.Status404NotFound)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    // TODO: This needs to be an authorized endpoint.
+    public async Task<ActionResult> Update(LanguageViewModel language)
+    {
+        ILanguage? existingById = language.Id != default ? _localizationService.GetLanguageById(language.Id) : null;
+        if (existingById is null)
+        {
+            return await Task.FromResult(NotFound());
+        }
+
+        // note that the service will prevent the default language from being "un-defaulted"
+        // but does not hurt to test here - though the UI should prevent it too
+        if (existingById.IsDefault && !language.IsDefault)
+        {
+            ModelState.AddModelError("IsDefault", "Cannot un-default the default language.");
+            return await Task.FromResult(ValidationProblem(ModelState));
+        }
+
+        existingById = _umbracoMapper.Map(language, existingById);
+
+        if (!_languageService.CanUseLanguagesFallbackLanguage(existingById))
+        {
+            ModelState.AddModelError("FallbackLanguage", "The selected fall back language does not exist.");
+            return await Task.FromResult(ValidationProblem(ModelState));
+        }
+
+        if (!_languageService.CanGetProperFallbackLanguage(existingById))
+        {
+            ModelState.AddModelError("FallbackLanguage", $"The selected fall back language {_localizationService.GetLanguageById(existingById.FallbackLanguageId!.Value)} would create a circular path.");
+            return await Task.FromResult(ValidationProblem(ModelState));
+        }
+
+        _localizationService.Save(existingById);
+        return await Task.FromResult(Ok());
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/ManagementApiControllerBase.cs

@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Mvc;
+using Umbraco.Cms.ManagementApi.Filters;
+
+namespace Umbraco.Cms.ManagementApi.Controllers;
+
+[ManagementApiJsonConfiguration]
+public class ManagementApiControllerBase : Controller
+{
+
+}

src/Umbraco.Cms.ManagementApi/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.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.Media.RecycleBin;
+
+public class ChildrenMediaRecycleBinController : MediaRecycleBinControllerBase
+{
+    public ChildrenMediaRecycleBinController(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/Media/RecycleBin/MediaRecycleBinControllerBase.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.Media.RecycleBin;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Media}/recycle-bin")]
+[RequireMediaTreeRootAccess]
+[ProducesResponseType(StatusCodes.Status401Unauthorized)]
+[OpenApiTag(nameof(Constants.UdiEntityType.Media))]
+public class MediaRecycleBinControllerBase : RecycleBinControllerBase<RecycleBinItemViewModel>
+{
+    public MediaRecycleBinControllerBase(IEntityService entityService)
+        : base(entityService)
+    {
+    }
+
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Media;
+
+    protected override int RecycleBinRootId => Constants.System.RecycleBinMedia;
+
+    protected override RecycleBinItemViewModel MapRecycleBinViewModel(Guid? parentKey, IEntitySlim entity)
+    {
+        RecycleBinItemViewModel viewModel = base.MapRecycleBinViewModel(parentKey, entity);
+
+        if (entity is IMediaEntitySlim mediaEntitySlim)
+        {
+            viewModel.Icon = mediaEntitySlim.ContentTypeIcon ?? viewModel.Icon;
+        }
+
+        return viewModel;
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Media/RecycleBin/RootMediaRecycleBinController.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.Media.RecycleBin;
+
+public class RootMediaRecycleBinController : MediaRecycleBinControllerBase
+{
+    public RootMediaRecycleBinController(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/Media/Tree/ChildrenMediaTreeController.cs

@@ -0,0 +1,32 @@
+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.Media.Tree;
+
+public class ChildrenMediaTreeController : MediaTreeControllerBase
+{
+    public ChildrenMediaTreeController(
+        IEntityService entityService,
+        IUserStartNodeEntitiesService userStartNodeEntitiesService,
+        IDataTypeService dataTypeService,
+        AppCaches appCaches,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
+        : base(entityService, userStartNodeEntitiesService, dataTypeService, appCaches, backofficeSecurityAccessor)
+    {
+    }
+
+    [HttpGet("children")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<ContentTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<ContentTreeItemViewModel>>> Children(Guid parentKey, int skip = 0, int take = 100, Guid? dataTypeKey = null)
+    {
+        IgnoreUserStartNodesForDataType(dataTypeKey);
+        return await GetChildren(parentKey, skip, take);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Media/Tree/ItemsMediaTreeController.cs

@@ -0,0 +1,31 @@
+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.Media.Tree;
+
+public class ItemsMediaTreeController : MediaTreeControllerBase
+{
+    public ItemsMediaTreeController(
+        IEntityService entityService,
+        IUserStartNodeEntitiesService userStartNodeEntitiesService,
+        IDataTypeService dataTypeService,
+        AppCaches appCaches,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
+        : base(entityService, userStartNodeEntitiesService, dataTypeService, appCaches, backofficeSecurityAccessor)
+    {
+    }
+
+    [HttpGet("items")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(IEnumerable<ContentTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<ContentTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys, Guid? dataTypeKey = null)
+    {
+        IgnoreUserStartNodesForDataType(dataTypeKey);
+        return await GetItems(keys);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/Media/Tree/MediaTreeControllerBase.cs

@@ -0,0 +1,72 @@
+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.New.Cms.Web.Common.Routing;
+
+namespace Umbraco.Cms.ManagementApi.Controllers.Media.Tree;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Media}/tree")]
+[OpenApiTag(nameof(Constants.UdiEntityType.Media))]
+public class MediaTreeControllerBase : UserStartNodeTreeControllerBase<ContentTreeItemViewModel>
+{
+    private readonly AppCaches _appCaches;
+    private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor;
+
+    public MediaTreeControllerBase(
+        IEntityService entityService,
+        IUserStartNodeEntitiesService userStartNodeEntitiesService,
+        IDataTypeService dataTypeService,
+        AppCaches appCaches,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
+        : base(entityService, userStartNodeEntitiesService, dataTypeService)
+    {
+        _appCaches = appCaches;
+        _backofficeSecurityAccessor = backofficeSecurityAccessor;
+    }
+
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Media;
+
+    protected override Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.SortOrder));
+
+    protected override ContentTreeItemViewModel MapTreeItemViewModel(Guid? parentKey, IEntitySlim entity)
+    {
+        ContentTreeItemViewModel viewModel = base.MapTreeItemViewModel(parentKey, entity);
+
+        if (entity is IMediaEntitySlim mediaEntitySlim)
+        {
+            viewModel.Icon = mediaEntitySlim.ContentTypeIcon ?? viewModel.Icon;
+        }
+
+        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?
+    //            .CalculateMediaStartNodeIds(EntityService, _appCaches)
+    //        ?? Array.Empty<int>();
+    //
+    // protected override string[] GetUserStartNodePaths()
+    //     => _backofficeSecurityAccessor
+    //            .BackOfficeSecurity?
+    //            .CurrentUser?
+    //            .GetMediaStartNodePaths(EntityService, _appCaches)
+    //        ?? Array.Empty<string>();
+}

src/Umbraco.Cms.ManagementApi/Controllers/Media/Tree/RootMediaTreeController.cs

@@ -0,0 +1,32 @@
+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.Media.Tree;
+
+public class RootMediaTreeController : MediaTreeControllerBase
+{
+    public RootMediaTreeController(
+        IEntityService entityService,
+        IUserStartNodeEntitiesService userStartNodeEntitiesService,
+        IDataTypeService dataTypeService,
+        AppCaches appCaches,
+        IBackOfficeSecurityAccessor backofficeSecurityAccessor)
+        : base(entityService, userStartNodeEntitiesService, dataTypeService, appCaches, backofficeSecurityAccessor)
+    {
+    }
+
+    [HttpGet("root")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(PagedViewModel<ContentTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedViewModel<ContentTreeItemViewModel>>> Root(int skip = 0, int take = 100, Guid? dataTypeKey = null)
+    {
+        IgnoreUserStartNodesForDataType(dataTypeKey);
+        return await GetRoot(skip, take);
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.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.MediaType.Tree;
+
+public class ChildrenMediaTypeTreeController : MediaTypeTreeControllerBase
+{
+    public ChildrenMediaTypeTreeController(IEntityService entityService, IMediaTypeService mediaTypeService)
+        : base(entityService, mediaTypeService)
+    {
+    }
+
+    [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/MediaType/Tree/ItemsMediaTypeTreeController.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.MediaType.Tree;
+
+public class ItemsMediaTypeTreeController : MediaTypeTreeControllerBase
+{
+    public ItemsMediaTypeTreeController(IEntityService entityService, IMediaTypeService mediaTypeService)
+        : base(entityService, mediaTypeService)
+    {
+    }
+
+    [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/MediaType/Tree/MediaTypeTreeControllerBase.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.MediaType.Tree;
+
+[ApiVersion("1.0")]
+[ApiController]
+[VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.MediaType}/tree")]
+[OpenApiTag(nameof(Constants.UdiEntityType.MediaType))]
+public class MediaTypeTreeControllerBase : FolderTreeControllerBase<FolderTreeItemViewModel>
+{
+    private readonly IMediaTypeService _mediaTypeService;
+
+    public MediaTypeTreeControllerBase(IEntityService entityService, IMediaTypeService mediaTypeService)
+        : base(entityService) =>
+        _mediaTypeService = mediaTypeService;
+
+    protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.MediaType;
+
+    protected override UmbracoObjectTypes FolderObjectType => UmbracoObjectTypes.MediaTypeContainer;
+
+    protected override FolderTreeItemViewModel[] MapTreeItemViewModels(Guid? parentKey, IEntitySlim[] entities)
+    {
+        var mediaTypes = _mediaTypeService
+            .GetAll(entities.Select(entity => entity.Id).ToArray())
+            .ToDictionary(contentType => contentType.Id);
+
+        return entities.Select(entity =>
+        {
+            FolderTreeItemViewModel viewModel = MapTreeItemViewModel(parentKey, entity);
+            if (mediaTypes.TryGetValue(entity.Id, out IMediaType? mediaType))
+            {
+                viewModel.Icon = mediaType.Icon ?? viewModel.Icon;
+            }
+
+            return viewModel;
+        }).ToArray();
+    }
+}

src/Umbraco.Cms.ManagementApi/Controllers/MediaType/Tree/RootMediaTypeTreeController.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.MediaType.Tree;
+
+public class RootMediaTypeTreeController : MediaTypeTreeControllerBase
+{
+    public RootMediaTypeTreeController(IEntityService entityService, IMediaTypeService mediaTypeService)
+        : base(entityService, mediaTypeService)
+    {
+    }
+
+    [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/MemberGroup/Tree/ItemsMemberGroupTreeController.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.MemberGroup.Tree;
+
+public class ItemsMemberGroupTreeController : MemberGroupTreeControllerBase
+{
+    public ItemsMemberGroupTreeController(IEntityService entityService)
+        : base(entityService)
+    {
+    }
+
+    [HttpGet("items")]
+    [MapToApiVersion("1.0")]
+    [ProducesResponseType(typeof(IEnumerable<EntityTreeItemViewModel>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<EntityTreeItemViewModel>>> Items([FromQuery(Name = "key")] Guid[] keys)
+        => await GetItems(keys);
+}