Make sure not to early return when verifying ancestor path is published without completing scope (#19029 )

* Make sure not to early return when verifying ancestor path is published without completing scope. * Added comment.
Use maximum available value for JSON serialization depth (#19001 )
2025-04-14 20:31:46 +02:00 · 2025-04-14 20:31:46 +02:00 · 2025-04-14 20:31:46 +02:00 · 2025-04-14 20:31:45 +02:00 · 2025-04-14 20:31:45 +02:00 · 2025-04-14 20:31:22 +02:00
2060 changed files with 37915 additions and 53291 deletions
@@ -61,7 +61,7 @@ This guide describes each step to make your first contribution:
 ## Further contribution guides

 - [Before you start](contributing-before-you-start.md)
- [Finding your first issue: Up for grabs](contributing-first-issue.md)
+- [Finding your first issue: Up for grabs](contributing-before-you-start.md)
 - [Contributing to the new backoffice](https://docs.umbraco.com/umbraco-backoffice/)
 - [Unwanted changes](contributing-unwanted-changes.md)
 - [Other ways to contribute](contributing-other-ways-to-contribute.md)
@@ -4,11 +4,11 @@ contact_links:
      url: https://github.com/umbraco/Umbraco-CMS/discussions/new?category=features-and-ideas
      about: Start a new discussion when you have ideas or feature requests, eventually discussions can turn into plans
    - name: ⁉️ Support Question
-      url: https://forum.umbraco.com
+      url: https://our.umbraco.com
      about: This issue tracker is NOT meant for support questions. If you have a question, please join us on the forum.
    - name: 📖 Documentation Issue
      url: https://github.com/umbraco/UmbracoDocs/issues
      about: Documentation issues should be reported on the Umbraco documentation repository.
    - name: 🔐 Security Issue
-      url: https://umbraco.com/trust-center/security-and-umbraco/how-to-report-a-vulnerability-in-umbraco/
+      url: https://umbraco.com/about-us/trust-center/security-and-umbraco/how-to-report-a-vulnerability-in-umbraco/
      about: Discovered a Security Issue in Umbraco?
@@ -4,8 +4,8 @@
 [![NuGet Version](https://img.shields.io/nuget/v/Umbraco.Cms)](https://www.nuget.org/packages/Umbraco.Cms)
 [![Build status](https://img.shields.io/azure-devops/build/umbraco/Umbraco%2520Cms/301?logo=azurepipelines&label=Azure%20Pipelines)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=301) 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) 
-[![Forum](https://img.shields.io/badge/help-forum-blue)](https://forum.umbraco.com) 
 [![Chat about Umbraco on Discord](https://img.shields.io/discord/869656431308189746?logo=discord&logoColor=fff)](https://discord.gg/umbraco) 
+[![Read what's going on in the Umbraco Discord chat now](https://img.shields.io/badge/read-discord-blue)](https://discord-chats.umbraco.com)
 ![Mastodon Follow](https://img.shields.io/mastodon/follow/110661369750014952?domain=https%3A%2F%2Fumbracocommunity.social)


@@ -0,0 +1,55 @@
+name: Backoffice Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - contrib
+      - v*/dev
+    paths:
+      - src/Umbraco.Web.UI.Client/package.json
+      - src/Umbraco.Web.UI.Client/package-lock.json
+      - src/Umbraco.Web.UI.Client/src/**
+      - .github/workflows/azure-backoffice.yml
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - contrib
+      - v*/dev
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed' && (contains(github.event.pull_request.labels.*.name, 'preview/backoffice')))
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          production_branch: contrib
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_VICTORIOUS_GROUND_017B08103 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "src/Umbraco.Web.UI.Client" # App source code path
+          app_build_command: "npm run build:for:static"
+          output_location: "dist" # Built app content directory - optional
+          skip_api_build: true # Set to true if you do not have an Azure Functions API in your repo
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          app_location: "src/Umbraco.Web.UI.Client"
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_VICTORIOUS_GROUND_017B08103 }}
+          action: "close"
@@ -0,0 +1,56 @@
+name: Storybook CI/CD
+
+on:
+  push:
+    branches:
+      - contrib
+      - v*/dev
+    paths:
+      - src/Umbraco.Web.UI.Client/package.json
+      - src/Umbraco.Web.UI.Client/package-lock.json
+      - src/Umbraco.Web.UI.Client/src/**
+      - .github/workflows/azure-storybook.yml
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - contrib
+      - v*/dev
+
+env:
+  NODE_OPTIONS: --max_old_space_size=16384
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed' && (contains(github.event.pull_request.labels.*.name, 'preview/storybook')))
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          production_branch: contrib
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ORANGE_SEA_0C7411A03 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "src/Umbraco.Web.UI.Client" # App source code path
+          app_build_command: "npm run storybook:build"
+          output_location: "/storybook-static" # Built app content directory - optional
+          skip_api_build: true # Set to true if you do not have an Azure Functions API in your repo
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          app_location: "src/Umbraco.Web.UI.Client"
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ORANGE_SEA_0C7411A03 }}
+          action: "close"
@@ -1,5 +1,8 @@
 {
-    "cSpell.words": [
-        "unprovide"
-    ]
+  "cSpell.words": ["unprovide"],
+  "eslint.useFlatConfig": true,
+  "eslint.workingDirectories": [
+    "./src/Umbraco.Web.UI.Client/",
+    "./src/Umbraco.Web.UI.Login/"
+  ]
 }
@@ -20,6 +20,7 @@
    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
  </PropertyGroup>

+
  <PropertyGroup>
    <!--
      TODO: Fix and remove overrides:
@@ -39,7 +40,7 @@
  <!-- Package Validation -->
  <PropertyGroup>
    <GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
-    <EnablePackageValidation>true</EnablePackageValidation>
+    <EnablePackageValidation>false</EnablePackageValidation>
    <PackageValidationBaselineVersion>15.0.0</PackageValidationBaselineVersion>
    <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
    <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
@@ -45,8 +45,8 @@
    <PackageVersion Include="Asp.Versioning.Mvc" Version="8.1.0" />
    <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
    <PackageVersion Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
-    <PackageVersion Include="Examine" Version="3.7.1" />
-    <PackageVersion Include="Examine.Core" Version="3.7.1" />
+    <PackageVersion Include="Examine" Version="3.7.0" />
+    <PackageVersion Include="Examine.Core" Version="3.7.0" />
    <PackageVersion Include="HtmlAgilityPack" Version="1.11.74" />
    <PackageVersion Include="JsonPatch.Net" Version="3.1.1" />
    <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
@@ -100,4 +100,4 @@
    <!-- Examine.Lucene brings in a vulnerable version of Lucene.Net.Replicator -->
    <PackageVersion Include="Lucene.Net.Replicator" Version="4.8.0-beta00017" />
  </ItemGroup>
-</Project>
+</Project>
@@ -1,579 +0,0 @@
-Third-Party Notices
-===================
-
-This file contains notices and attributions for third-party software used in the Umbraco CMS project.
-
-It is not a license and does not grant any rights to use the third-party software.
-
-Umbraco CMS is licensed under the MIT License, which can be found in the LICENSE file.
-
---
-
-@openid/AppAuth-JS: An OpenID Connect and OAuth 2.0 client library for JavaScript
-
-URL: https://github.com/openid/AppAuth-JS
-License: Apache License, Version 2.0
-Copyright: 2017 Google Inc.
-
---
-
-AutoFixture: Write maintainable unit tests, faster
-
-URL: https://github.com/AutoFixture/AutoFixture
-License: MIT License
-Copyright: 2013 Mark Seemann
-
---
-
-Asp.Versioning.Mvc: A library for ASP.NET Core versioning
-
-URL: https://github.com/dotnet/aspnet-api-versioning
-License: MIT License
-Copyright: .NET Foundation and contributors
-
---
-
-Babel: A JavaScript compiler
-
-URL: https://babeljs.io/
-License: MIT License
-Copyright: 2014-present Sebastian McKenzie and other contributors
-
---
-
-BenchmarkDotNet: Powerful .NET library for benchmarking
-
-URL: https://github.com/dotnet/BenchmarkDotNet
-License: MIT License
-Copyright: .NET Foundation and Contributors
-
---
-
-Bogus: A simple and sane data generator for populating objects that supports different locales.
-
-URL: https://github.com/bchavez/Bogus
-License: MIT License
-Copyright: 2015 Brian Chavez
-
---
-
-CommandLineParser: Terse syntax C# command line parser for .NET
-
-URL: https://github.com/commandlineparser/commandline
-License: MIT License
-Copyright: 2005-2015 Giacomo Stelluti Scala & Contributors
-
---
-
-cross-env: A CLI tool to set environment variables across platforms
-
-URL: https://github.com/kentcdodds/cross-env
-License: MIT License
-Copyright: 2017 Kent C. Dodds
-
---
-
-Dazinator.Extensions.FileProviders: A library for file provider extensions
-
-URL: https://github.com/dazinator/Dazinator.Extensions.FileProviders
-License: MIT License
-Copyright: 2016 Darrell
-
---
-
-DOMPurify: A DOM-only XSS sanitizer for HTML, MathML and SVG
-
-URL: https://github.com/cure53/DOMPurify
-License: Apache License, Version 2.0
-Copyright: 2025 Dr.-Ing. Mario Heiderich, Cure53
-
---
-
-Element Internals Polyfill: A polyfill for the Element Internals API
-
-URL: https://github.com/calebdwilliams/element-internals-polyfill
-License: MIT License
-Copyright: 2021 Caleb Williams
-
---
-
-Eslint: A tool for identifying and reporting on patterns in JavaScript
-
-URL: https://eslint.org/
-License: MIT License
-Copyright: OpenJS Foundation and other contributors
-
---
-
-Examine: A search and indexing library for .NET
-
-URL: https://github.com/Shazwazza/Examine
-License: Microsoft Public License (Ms-PL)
-Copyright: 2023 Shannon Deminick
-
---
-
-Glob: A library for matching file paths using glob patterns
-
-URL: https://github.com/isaacs/node-glob
-License: ISC License
-Copyright: 2009-2023 Isaac Z. Schlueter and Contributors
-
---
-
-Globals: A library for managing global variables in JavaScript
-
-URL: https://github.com/sindresorhus/globals
-License: MIT License
-Copyright: Sindre Sorhus
-
---
-
-Html Agility Pack: An HTML parser for .NET
-
-URL: https://html-agility-pack.net/
-License: MIT License
-Copyright: ZZZ Projects Inc.
-
---
-
-ImageSharp: A cross-platform library for processing images in .NET
-
-URL: https://github.com/SixLabors/ImageSharp
-License: Apache License, Version 2.0 under the Six Labors Split License
-Copyright: Six Labors
-
---
-
-jsdiff: A JavaScript text differencing implementation
-
-URL: https://github.com/kpdecker/jsdiff
-License: BSD 3-Clause License
-Copyright: 2009-2015 Kevin Decker <kpdecker@gmail.com>
-
---
-
-JsonPatch.Net: A library for JSON Patch (RFC 6902) in .NET
-
-URL: https://github.com/json-everything/json-everything
-License: MIT License
-Copyright: .NET Foundation and Contributors
-
---
-
-K4os.Compression.LZ4: A fast LZ4 compression library for .NET
-
-URL: https://github.com/MiloszKrajewski/K4os.Compression.LZ4
-License: MIT License
-Copyright: 2017 Milosz Krajewski
-
---
-
-Lit: A simple library for building fast, lightweight web components
-
-URL: https://lit.dev
-License: BSD 3-Clause License
-Copyright: 2020 Google LLC. All rights reserved.
-
---
-
-Lucide: Beautiful & consistent icons for the web
-
-URL: https://lucide.dev/
-License: ISC License
-Copyright: 2013-2022 Cole Bemis
-Copyright: 2022 Lucide Contributors
-
---
-
-Madge: A dependency graph generator for JavaScript
-
-URL: https://github.com/pahen/madge
-License: MIT License
-Copyright: 2017 Patrik Henningsson
-
---
-
-MailKit: A library for sending email in .NET
-
-URL: https://github.com/jstedfast/MailKit
-License: MIT License
-Copyright: 2013-2024 .NET Foundation and Contributors
-
---
-
-Markdown: A library for parsing and compiling Markdown
-
-URL: https://github.com/hey-red/Markdown
-License: MIT License
-Copyright: 2018 red
-
---
-
-marked: A markdown parser and compiler
-
-URL: https://marked.js.org/
-License: MIT License
-Copyright: 2011-2018, Christopher Jeffrey (https://github.com/chjj/)
-Copyright: 2018+, MarkedJS (https://github.com/markedjs/)
-
---
-
-Message Pack: The extremely fast MessagePack serializer for C#
-
-URL: https://github.com/MessagePack-CSharp/MessagePack-CSharp
-License: MIT License
-Copyright: 2017 Yoshifumi Kawai and contributors
-
---
-
-Miniprofiler: A mini profiler for .NET
-
-URL: https://github.com/MiniProfiler/dotnet
-License: MIT License
-Copyright: .NET MiniProfiler Contributors
-
---
-
-Monaco Editor: A browser-based code editor
-
-URL: https://microsoft.github.io/monaco-editor/
-License: MIT License
-Copyright: 2016-present Microsoft Corporation
-
---
-
-Moq: A mocking library for .NET
-
-URL: https://github.com/moq/moq
-License: BSD 3-Clause License
-Copyright: 2007 Clarius Consulting, Manas Technology Solutions, InSTEDD, and Contributors.
-
---
-
-Mock Service Worker (MSW): A library for mocking API requests in JavaScript
-
-URL: https://mswjs.io/
-License: MIT License
-Copyright: 2018–present Artem Zakharchenko
-
---
-
-NCrontab: A cron schedule parser for .NET
-
-URL: https://github.com/atifaziz/NCrontab
-License: Apache License, Version 2.0
-Copyright: 2001 The OpenSymphony Group
-Copyright: 2008 Atif Aziz
-
---
-
-Nerdbank.GitVersioning: A library for versioning .NET projects
-
-URL: https://github.com/dotnet/Nerdbank.GitVersioning
-License: MIT License
-Copyright: .NET Foundation and Contributors
-
---
-
-NJsonSchema: A JSON schema validator for .NET
-
-URL: https://github.com/RicoSuter/NJsonSchema
-License: MIT License
-Copyright: 2022 Rico Suter
-
---
-
-NPoco: A micro ORM for .NET
-
-URL: https://github.com/schotime/NPoco
-License: Apache License, Version 2.0
-Copyright: Schotime
-
---
-
-NUnit: A unit testing framework for .NET
-
-URL: https://github.com/nunit/nunit
-License: MIT License
-Copyright: Charlie Poole, Rob Prouse and Contributors
-
---
-
-Open Web Components: A set of standards and libraries for building web components
-
-URL: https://open-wc.org/
-License: MIT License
-Copyright: 2018 open-wc
-
---
-
-Openapi-ts: The OpenAPI to TypeScript codegen
-
-URL: https://github.com/hey-api/openapi-ts
-License: MIT License
-Copyright: Hey API
-
---
-
-OpenIddict: A simple and flexible OpenID Connect server for ASP.NET Core
-
-URL: https://github.com/openiddict/openiddict-core
-License: Apache License, Version 2.0
-Copyright: Kévin Chalet
-
---
-
-Playwright: A Node.js library to automate browser testing
-
-URL: https://playwright.dev/
-License: Apache License, Version 2.0
-Copyright: 2025 Microsoft Corporation
-
---
-
-Playwright-msw: A library to wrap Mock Service Worker with Playwright
-
-URL: https://github.com/valendres/playwright-msw
-License: MIT License
-Copyright: 2022 Peter Weller
-
---
-
-Prettier: An opinionated code formatter
-
-URL: https://prettier.io/
-License: MIT License
-Copyright: James Long and contributors
-
---
-
-Remark-gfm: A GitHub Flavored Markdown plugin for Remark
-
-URL: https://github.com/remarkjs/remark-gfm
-License: MIT License
-Copyright: Titus Wormer
-
---
-
-Rollup: A module bundler for JavaScript
-
-URL: https://rollupjs.org/
-License: MIT License
-Copyright: 2015-present Rollup contributors
-
---
-
-Rollup Plugins: A collection of Rollup plugins
-
-URL: https://github.com/rollup/plugins
-License: MIT License
-Copyright: 2019-present Rollup Plugins contributors
-
---
-
-Rollup-plugin-esbuild: A Rollup plugin for using esbuild
-
-URL: https://github.com/egoist/rollup-plugin-esbuild
-License: MIT License
-Copyright: 2020 EGOIST
-
---
-
-Rollup-plugin-import-css: A Rollup plugin for importing CSS files
-
-URL: https://github.com/jleeson/rollup-plugin-import-css
-License: MIT License
-Copyright: 2020 Jacob Leeson
-
---
-
-rxjs: Reactive Extensions for JavaScript
-
-URL: https://rxjs.dev/
-License: Apache License, Version 2.0
-Copyright: 2015-present Ben Lesh <ben@benlesh.com>, Google, Inc., Netflix, Inc., Microsoft Corp., and contributors
-
---
-
-Serilog: A diagnostic logging library for .NET
-
-URL: https://github.com/serilog/serilog
-License: Apache License, Version 2.0
-Copyright: Serilog Contributors
-
---
-
-Simple Icons: A set of SVG icons for popular brands
-
-URL: https://simpleicons.org/
-License: CC0 1.0 Universal License
-Copyright: Simple Icons Contributors
-
---
-
-Storybook: A UI component explorer for Web Components
-
-URL: https://storybook.js.org/
-License: MIT License
-Copyright: 2024 Storybook
-
---
-
-StyleCop.Analyzers: Analyzers for StyleCop
-
-URL: https://github.com/DotNetAnalyzers/StyleCopAnalyzers
-License: MIT License
-Copyright: Tunnel Vision Laboratories, LLC
-
---
-
-SVGO: A tool for optimizing SVG files
-
-URL: https://svgo.dev/
-License: MIT License
-Copyright: Kir Belevich
-
---
-
-Swashbuckle.AspNetCore: A library for generating Swagger documentation for ASP.NET Core APIs
-
-URL: https://github.com/domaindrivendev/Swashbuckle.AspNetCore
-License: MIT License
-Copyright: 2016 Richard Morris
-
---
-
-Tiny Glob: A tiny globbing library for Node.js
-
-URL: https://github.com/terkelg/tiny-glob
-License: MIT License
-Copyright: 2018 Terkel
-
---
-
-TinyMCE, version 6.x: A rich text editor for the web
-
-URL: https://www.tiny.cloud/
-License: MIT License
-Copyright: 2022 Ephox Corporation DBA Tiny Technologies, Inc.
-
---
-
-Tiptap: A renderless rich-text editor for the web
-
-URL: https://tiptap.dev/
-License: MIT License
-Copyright: 2025 Tiptap GmbH
-
---
-
-Tsc-alias: A TypeScript compiler plugin for aliasing module paths
-
-URL: https://github.com/justkey007/tsc-alias
-License: MIT License
-Copyright: 2018 Justkey
-
---
-
-Typedoc: A documentation generator for TypeScript projects
-
-URL: https://typedoc.org/
-License: Apache License, Version 2.0
-Copyright: Gerrit Birkeland and Contributors
-
---
-
-Typescript: A typed superset of JavaScript that compiles to plain JavaScript
-
-URL: https://www.typescriptlang.org/
-License: Apache License, Version 2.0
-Copyright: 2012-present Microsoft Corporation
-
---
-
-Typescript-eslint: A set of tools for linting TypeScript code
-
-URL: https://github.com/typescript-eslint/typescript-eslint
-License: MIT License
-Copyright: 2019 typescript-eslint and other contributors
-
---
-
-Typescript-json-schema: A library for generating JSON schema from TypeScript types
-
-URL: https://github.com/YousefED/typescript-json-schema
-License: BSD 3-Clause License
-Copyright: 2016 typescript-json-schema contributors
-
---
-
-Umbraco.Code: Provides code-level tools for Umbraco
-
-URL: https://github.com/umbraco/Umbraco-Code
-License: MIT License
-Copyright: 2005-present Umbraco A/S
-
---
-
-Umbraco.GitVersioning.Extensions: Utilities for Nerdbank.GitVersioning
-
-URL: https://github.com/umbraco/Umbraco.GitVersioning.Extensions
-License: MIT License
-Copyright: 2005-present Umbraco A/S
-
---
-
-Umbraco.JsonSchema.Extensions: Utilities for JSON schema generation
-
-URL: https://github.com/umbraco/Umbraco.JsonSchema.Extensions
-License: MIT License
-Copyright: 2005-present Umbraco A/S
-
---
-
-Umbraco UI Library: A set of UI components for building web applications
-
-URL: https://uui.umbraco.com/
-License: MIT License
-Copyright: 2005-present Umbraco A/S
-
---
-
-uuid: A library for generating unique identifiers
-
-URL: https://github.com/uuidjs/uuid
-License: MIT License
-Copyright: 2010-2020 Robert Kieffer and other contributors
-
---
-
-Vite: A fast build tool and development server for modern web projects
-
-URL: https://vite.dev/
-License: MIT License
-Copyright: 2019-present VoidZero Inc. and Vite contributors
-
---
-
-Vite-plugin-static-copy: A Vite plugin for copying static files
-
-URL: https://github.com/sapphi-red/vite-plugin-static-copy
-License: MIT License
-Copyright: 2021 sapphi-red
-
---
-
-Vite-tsconfig-paths: A Vite plugin for resolving TypeScript paths
-
-URL: https://github.com/aleclarson/vite-tsconfig-paths
-License: MIT License
-Copyright: Alec Larson
-
---
-
-Web Component Analyzer: A tool for analyzing web components
-
-URL: https://github.com/runem/web-component-analyzer
-License: MIT License
-Copyright: 2019 Rune Mehlsen
@@ -313,8 +313,8 @@ stages:
              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
            LinuxPart3Of3:
              vmImage: "ubuntu-latest"
-              # Filter tests that are not part of the Umbraco.Infrastructure and ManagementApi namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
-              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure) & (FullyQualifiedName!~ManagementApi)"
+              # Filter tests that are not part of the Umbraco.Infrastructure namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
+              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure)"
            macOSPart1Of3:
              vmImage: "macOS-latest"
              # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
@@ -325,8 +325,8 @@ stages:
              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
            macOSPart3Of3:
              vmImage: "macOS-latest"
-              # Filter tests that are not part of the Umbraco.Infrastructure and ManagementApi namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
-              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure) & (FullyQualifiedName!~ManagementApi)"
+              # Filter tests that are not part of the Umbraco.Infrastructure namespace.
+              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure)"
        pool:
          vmImage: $(vmImage)
        variables:
@@ -389,8 +389,8 @@ stages:
              vmImage: "windows-latest"
              Tests__Database__DatabaseType: LocalDb
              Tests__Database__SQLServerMasterConnectionString: N/A
-              # Filter tests that are not part of the Umbraco.Infrastructure and ManagementApi namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
-              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure) & (FullyQualifiedName!~ManagementApi)"
+              # Filter tests that are not part of the Umbraco.Infrastructure namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
+              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure)"
            LinuxPart1Of3:
              vmImage: "ubuntu-latest"
              SA_PASSWORD: UmbracoIntegration123!
@@ -410,8 +410,8 @@ stages:
              SA_PASSWORD: UmbracoIntegration123!
              Tests__Database__DatabaseType: SqlServer
              Tests__Database__SQLServerMasterConnectionString: "Server=(local);User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
-              # Filter tests that are not part of the Umbraco.Infrastructure and ManagementApi namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
-              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure) & (FullyQualifiedName!~ManagementApi)"
+              # Filter tests that are not part of the Umbraco.Infrastructure namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
+              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure)"
        pool:
          vmImage: $(vmImage)
        steps:
@@ -432,33 +432,6 @@ stages:
            displayName: Start SQL Server Docker image (Linux)
            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

-          - powershell: |
-              $maxAttempts = 12
-              $attempt = 0
-              $status = ""
-
-              while (($status -ne 'running') -and ($attempt -lt $maxAttempts)) {
-                Start-Sleep -Seconds 5
-                # We use the docker inspect command to check the status of the container. If the container is not running, we wait 5 seconds and try again. And if reaches 12 attempts, we fail the build.
-                $status = docker inspect -f '{{.State.Status}}' mssql
-
-                if ($status -ne 'running') {
-                  Write-Host "Waiting for SQL Server to be ready... Attempt $($attempt + 1)"
-                  $attempt++
-                }
-              }
-
-              if ($status -eq 'running') {
-                Write-Host "SQL Server container is running"
-                docker ps -a
-              } else {
-                Write-Host "SQL Server did not become ready in time. Last known status: $status"
-                docker logs mssql
-                exit 1
-              }
-            displayName: Wait for SQL Server to be ready (Linux)
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-
          - pwsh: SqlLocalDB start MSSQLLocalDB
            displayName: Start SQL Server LocalDB (Windows)
            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
@@ -522,70 +495,151 @@ stages:
          # Connection string
          CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=Umbraco;Mode=Memory;Cache=Shared;Foreign Keys=True;Pooling=True
          CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.Sqlite
-          DatabaseType: SQLite
        strategy:
          matrix:
            LinuxPart1Of3:
              vmImage: "ubuntu-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTestSqlite -- --shard=1/3"
            LinuxPart2Of3:
              vmImage: "ubuntu-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTestSqlite -- --shard=2/3"
            LinuxPart3Of3:
              vmImage: "ubuntu-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTestSqlite -- --shard=3/3"
            WindowsPart1Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTestSqlite -- --shard=1/3"
            WindowsPart2Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTestSqlite -- --shard=2/3"
            WindowsPart3Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTestSqlite -- --shard=3/3"
        pool:
          vmImage: $(vmImage)
        steps:
-          # Setup test environment Template
-          - template: nightly-E2E-setup-template.yml
-            parameters:
-              nodeVersion: ${{ variables.nodeVersion }}
-              PlaywrightUserEmail: ${{ variables.UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL }}
-              PlaywrightPassword: ${{ variables.UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD }}
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              npm_config_cache: ${{ variables.npm_config_cache }}
+          # Setup test environment
+          - task: DownloadPipelineArtifact@2
+            displayName: Download NuGet artifacts
+            inputs:
+              artifact: nupkg
+              path: $(Agent.BuildDirectory)/app/nupkg
+
+          - task: NodeTool@0
+            displayName: Use Node.js $(nodeVersion)
+            retryCountOnTaskFailure: 3
+            inputs:
+              versionSpec: $(nodeVersion)
+
+          - task: UseDotNet@2
+            displayName: Use .NET SDK from global.json
+            inputs:
+              useGlobalJson: true

          - pwsh: |
+              "UMBRACO_USER_LOGIN=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL)
+              UMBRACO_USER_PASSWORD=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
+              URL=$(ASPNETCORE_URLS)
+              STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json" | Out-File .env
+            displayName: Generate .env
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+
+          # Cache and restore NPM packages
+          - task: Cache@2
+            displayName: Cache NPM packages
+            inputs:
+              key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
+              restoreKeys: |
+                npm_e2e | "$(Agent.OS)"
+                npm_e2e
+              path: $(npm_config_cache)
+
+          - script: npm ci --no-fund --no-audit --prefer-offline
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+            displayName: Restore NPM packages
+
+          # Build application
+          - pwsh: |
+              $cmsVersion = "$(Build.BuildNumber)" -replace "\+",".g"
+              dotnet new nugetconfig
+              dotnet nuget add source ./nupkg --name Local
+              dotnet new install Umbraco.Templates::$cmsVersion
+              dotnet new umbraco --name UmbracoProject --version $cmsVersion --exclude-gitignore --no-restore --no-update-check
              dotnet restore UmbracoProject
              cp $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest.UmbracoProject/*.cs UmbracoProject
-            displayName: Restore project
-            workingDirectory: $(Agent.BuildDirectory)/app
-
-          - pwsh: |
-              dotnet build UmbracoProject --configuration ${{ variables.buildConfiguration }} --no-restore
+              dotnet build UmbracoProject --configuration $(buildConfiguration) --no-restore
              dotnet dev-certs https
            displayName: Build application
            workingDirectory: $(Agent.BuildDirectory)/app
-            condition: succeeded()

-          # Run application Template
-          - template: nightly-E2E-run-application-template.yml
-            parameters:
-              DatabaseType: ${{ variables.DatabaseType }}
-              buildConfiguration: ${{ variables.buildConfiguration }}
+          # Run application
+          - bash: |
+              nohup dotnet run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 &
+              echo "##vso[task.setvariable variable=AcceptanceTestProcessId]$!"
+            displayName: Run application (Linux)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+            workingDirectory: $(Agent.BuildDirectory)/app

-          # Run tests Template
-          - template: nightly-E2E-run-tests-template.yml
-            parameters:
-              testCommand: $(testCommand)
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              DatabaseType: ${{ variables.DatabaseType }}
+          - pwsh: |
+              $process = Start-Process dotnet "run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile 2>&1" -PassThru -NoNewWindow -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log
+              Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)"
+            displayName: Run application (Windows)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+            workingDirectory: $(Agent.BuildDirectory)/app
+
+          # Wait for application to start responding to requests
+          - pwsh: npx wait-on -v --interval 1000 --timeout 120000 $(ASPNETCORE_URLS)
+            displayName: Wait for application
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+
+          # Install Playwright and dependencies
+          - pwsh: npx playwright install chromium
+            displayName: Install Playwright only with Chromium browser
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+
+          # Test
+          - pwsh: $(testCommand)
+            displayName: Run Playwright tests
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+            env:
+              CI: true
+              CommitId: $(Build.SourceVersion)
+              AgentOs: $(Agent.OS)
+
+          # Stop application
+          - bash: kill -15 $(AcceptanceTestProcessId)
+            displayName: Stop application (Linux)
+            condition: and(ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Linux'))
+
+          - pwsh: Stop-Process -Id $(AcceptanceTestProcessId)
+            displayName: Stop application (Windows)
+            condition: and(ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Windows_NT'))
+
+          # Copy artifacts
+          - pwsh: |
+              if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
+                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
+              }
+            displayName: Copy Playwright results
+            condition: succeededOrFailed()
+
+          # Publish test artifacts
+          - task: PublishPipelineArtifact@1
+            displayName: Publish test artifacts
+            condition: succeededOrFailed()
+            inputs:
+              targetPath: $(Build.ArtifactStagingDirectory)
+              artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
+
+          # Publish test results
+          - task: PublishTestResults@2
+            displayName: "Publish test results"
+            condition: succeededOrFailed()
+            inputs:
+              testResultsFormat: 'JUnit'
+              testResultsFiles: '*.xml'
+              searchFolder: "tests/Umbraco.Tests.AcceptanceTest/results"
+              testRunTitle: "$(Agent.JobName)"

      - job:
        displayName: E2E Tests (SQL Server)
@@ -593,76 +647,175 @@ stages:
          # Connection string
          CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=(localdb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Umbraco.mdf;Integrated Security=True
          CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
-          SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
-          DatabaseType: SQLServer
        strategy:
          matrix:
            ${{ if eq(parameters.sqlServerLinuxAcceptanceTests, True) }}:
              LinuxPart1Of3:
                testCommand: "npm run smokeTest -- --shard=1/3"
                vmImage: "ubuntu-latest"
-                testFolder: "DefaultConfig"
+                SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
              LinuxPart2Of3:
                testCommand: "npm run smokeTest -- --shard=2/3"
                vmImage: "ubuntu-latest"
-                testFolder: "DefaultConfig"
+                SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
              LinuxPart3Of3:
                testCommand: "npm run smokeTest -- --shard=3/3"
                vmImage: "ubuntu-latest"
-                testFolder: "DefaultConfig"
+                SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
            WindowsPart1Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTest -- --shard=1/3"
            WindowsPart2Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTest -- --shard=2/3"
            WindowsPart3Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
              testCommand: "npm run smokeTest -- --shard=3/3"
        pool:
          vmImage: $(vmImage)
        steps:
-          # Setup test environment Template
-          - template: nightly-E2E-setup-template.yml
-            parameters:
-              nodeVersion: ${{ variables.nodeVersion }}
-              PlaywrightUserEmail: ${{ variables.UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL }}
-              PlaywrightPassword: ${{ variables.UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD }}
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              npm_config_cache: ${{ variables.npm_config_cache }}
+          # Setup test environment
+          - task: DownloadPipelineArtifact@2
+            displayName: Download NuGet artifacts
+            inputs:
+              artifact: nupkg
+              path: $(Agent.BuildDirectory)/app/nupkg
+
+          - task: NodeTool@0
+            displayName: Use Node.js $(nodeVersion)
+            inputs:
+              versionSpec: $(nodeVersion)
+
+          - task: UseDotNet@2
+            displayName: Use .NET SDK from global.json
+            inputs:
+              useGlobalJson: true

          - pwsh: |
+              "UMBRACO_USER_LOGIN=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL)
+              UMBRACO_USER_PASSWORD=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
+              URL=$(ASPNETCORE_URLS)
+              STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json" | Out-File .env
+            displayName: Generate .env
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+
+          # Cache and restore NPM packages
+          - task: Cache@2
+            displayName: Cache NPM packages
+            inputs:
+              key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
+              restoreKeys: |
+                npm_e2e | "$(Agent.OS)"
+                npm_e2e
+              path: $(npm_config_cache)
+
+          - script: npm ci --no-fund --no-audit --prefer-offline
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+            displayName: Restore NPM packages
+
+          # Build application
+          - pwsh: |
+              $cmsVersion = "$(Build.BuildNumber)" -replace "\+",".g"
+              dotnet new nugetconfig
+              dotnet nuget add source ./nupkg --name Local
+              dotnet new install Umbraco.Templates::$cmsVersion
+              dotnet new umbraco --name UmbracoProject --version $cmsVersion --exclude-gitignore --no-restore --no-update-check
              dotnet restore UmbracoProject
              cp $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest.UmbracoProject/*.cs UmbracoProject
-            displayName: Restore project
-            workingDirectory: $(Agent.BuildDirectory)/app
-
-          - pwsh: |
-              dotnet build UmbracoProject --configuration ${{ variables.buildConfiguration }} --no-restore
+              dotnet build UmbracoProject --configuration $(buildConfiguration) --no-restore
              dotnet dev-certs https
            displayName: Build application
            workingDirectory: $(Agent.BuildDirectory)/app
-            condition: succeeded()

-          # Run application Template
-          - template: nightly-E2E-run-application-template.yml
-            parameters:
-              SA_PASSWORD: ${{ variables.SA_PASSWORD }}
-              buildConfiguration: ${{ variables.buildConfiguration }}
-              DatabaseType: ${{ variables.DatabaseType }}
+          # Start SQL Server
+          - powershell: docker run --name mssql -d -p 1433:1433 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$(SA_PASSWORD)" mcr.microsoft.com/mssql/server:2022-latest
+            displayName: Start SQL Server Docker image (Linux)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

-          # Run tests Template
-          - template: nightly-E2E-run-tests-template.yml
-            parameters:
-              testCommand: $(testCommand)
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              DatabaseType: ${{ variables.DatabaseType }}
+          - pwsh: SqlLocalDB start MSSQLLocalDB
+            displayName: Start SQL Server LocalDB (Windows)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+
+          # Run application
+          - bash: |
+              nohup dotnet run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 &
+              echo "##vso[task.setvariable variable=AcceptanceTestProcessId]$!"
+            displayName: Run application (Linux)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+            workingDirectory: $(Agent.BuildDirectory)/app
+
+          - pwsh: |
+              $process = Start-Process dotnet "run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile 2>&1" -PassThru -NoNewWindow -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log
+              Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)"
+            displayName: Run application (Windows)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+            workingDirectory: $(Agent.BuildDirectory)/app
+
+          # Wait for application to start responding to requests
+          - pwsh: npx wait-on -v --interval 1000 --timeout 120000 $(ASPNETCORE_URLS)
+            displayName: Wait for application
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+
+          # Install Playwright and dependencies
+          - pwsh: npx playwright install chromium
+            displayName: Install Playwright only with Chromium browser
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+
+          # Test
+          - pwsh: $(testCommand)
+            displayName: Run Playwright tests
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+            env:
+              CI: true
+              CommitId: $(Build.SourceVersion)
+              AgentOs: $(Agent.OS)
+
+          # Stop application
+          - bash: kill -15 $(AcceptanceTestProcessId)
+            displayName: Stop application (Linux)
+            condition: and(ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Linux'))
+
+          - pwsh: Stop-Process -Id $(AcceptanceTestProcessId)
+            displayName: Stop application (Windows)
+            condition: and(ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Windows_NT'))
+
+          # Stop SQL Server
+          - pwsh: docker stop mssql
+            displayName: Stop SQL Server Docker image (Linux)
+            condition: eq(variables['Agent.OS'], 'Linux')
+
+          - pwsh: SqlLocalDB stop MSSQLLocalDB
+            displayName: Stop SQL Server LocalDB (Windows)
+            condition: eq(variables['Agent.OS'], 'Windows_NT')
+
+          # Copy artifacts
+          - pwsh: |
+              if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
+                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
+              }
+            displayName: Copy Playwright results
+            condition: succeededOrFailed()
+
+          # Publish test artifacts
+          - task: PublishPipelineArtifact@1
+            displayName: Publish test artifacts
+            condition: succeededOrFailed()
+            inputs:
+              targetPath: $(Build.ArtifactStagingDirectory)
+              artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
+
+          # Publish test results
+          - task: PublishTestResults@2
+            displayName: "Publish test results"
+            condition: succeededOrFailed()
+            inputs:
+              testResultsFormat: 'JUnit'
+              testResultsFiles: '*.xml'
+              searchFolder: "tests/Umbraco.Tests.AcceptanceTest/results"
+              testRunTitle: "$(Agent.JobName)"

  ###############################################
  ## Release
@@ -676,8 +829,6 @@ stages:
    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
@@ -739,8 +890,6 @@ stages:
    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
@@ -1,75 +0,0 @@
-parameters:
-  - name: testFolder
-    type: string
-    default: ''
-
-  - name: buildConfiguration
-    type: string
-    default: ''
-
-  - name: additionalEnvironmentVariables
-    type: boolean
-    default: False
-
-steps:
-  - pwsh: |
-      dotnet restore UmbracoProject
-      cp $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest.UmbracoProject/*.cs UmbracoProject
-    displayName: Restore project
-    workingDirectory: $(Agent.BuildDirectory)/app
-
-  # Update application to use necessary app settings
-  - pwsh: |
-      $sourcePath = "$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/tests/${{ parameters.testFolder }}/AdditionalSetup"
-      $destinationPath = "UmbracoProject"
-      $jsonFiles = Get-ChildItem -Path $sourcePath -Filter "*.json"
-      if ($jsonFiles) {
-      $jsonFiles | ForEach-Object {
-        Write-Host "Copying: $($_.FullName)"
-        Copy-Item -Path $_.FullName -Destination $destinationPath -Force
-      }
-      } else {
-      Write-Host "No JSON files found."
-      }
-    displayName: Update application to use necessary app settings
-    workingDirectory: $(Agent.BuildDirectory)/app
-
-  # Update application to use necessary App_Plugins
-  - pwsh: |
-      $sourcePath = "$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/tests/${{ parameters.testFolder }}/AdditionalSetup"
-      $destinationPath = "UmbracoProject"
-      $appPluginsFolders = Get-ChildItem -Path $sourcePath -Directory -Filter "App_Plugins"
-      if ($appPluginsFolders) {
-        foreach ($folder in $appPluginsFolders) {
-          Write-Host "Copying folder: $($folder.FullName)"
-          Copy-Item -Path $folder.FullName -Destination $destinationPath -Recurse -Force
-          }
-      } else {
-        Write-Host "No App_Plugins found."
-      }
-    displayName: Update application to use necessary app plugins
-    workingDirectory: $(Agent.BuildDirectory)/app
-
-  # Update application to use necessary classes
-  - pwsh: |
-      $sourcePath = "$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/tests/${{ parameters.testFolder }}/AdditionalSetup"
-      $destinationPath = "UmbracoProject"
-      $csharpFiles = Get-ChildItem -Path $sourcePath -Filter "*.cs"
-      if ($csharpFiles) {
-        $csharpFiles | ForEach-Object {
-          Write-Host "Copying: $($_.FullName)"
-          Copy-Item -Path $_.FullName -Destination $destinationPath -Force
-        }
-      } else {
-        Write-Host "No C# files found."
-      }
-    displayName: Update application to use necessary classes
-    workingDirectory: $(Agent.BuildDirectory)/app
-
-  - ${{ if eq(parameters.additionalEnvironmentVariables, False) }}:
-      - pwsh: |
-          dotnet build UmbracoProject --configuration ${{ parameters.buildConfiguration }} --no-restore
-          dotnet dev-certs https
-        displayName: Build application
-        workingDirectory: $(Agent.BuildDirectory)/app
-        condition: succeeded()
@@ -1,47 +0,0 @@
-parameters:
-  - name: SA_PASSWORD
-    type: string
-    default: ''
-
-  - name: buildConfiguration
-    type: string
-    default: ''
-
-  - name: additionalEnvironmentVariables
-    type: boolean
-    default: False
-
-  - name: DatabaseType
-    type: string
-    default: ''
-
-steps:
-  # Skips the SQLServer setup if the databaseType does not match
-  - ${{ if eq(parameters.DatabaseType, 'SQLServer') }}:
-      # Start SQL Server Linux
-      - powershell: docker run --name mssql -d -p 1433:1433 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=${{ parameters.SA_PASSWORD }}" mcr.microsoft.com/mssql/server:2022-latest
-        displayName: Start SQL Server Docker image (Linux)
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-
-      # Start SQL Server LocalDB Windows
-      - pwsh: SqlLocalDB start MSSQLLocalDB
-        displayName: Start SQL Server LocalDB (Windows)
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-
-  # If we want to add additional environment variables to the run step, then we will skip these
-  - ${{ if eq(parameters.additionalEnvironmentVariables, False) }}:
-      # Run application for Linux
-      - bash: |
-          nohup dotnet run --project UmbracoProject --configuration ${{ parameters.buildConfiguration }} --no-build --no-launch-profile > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 &
-          echo "##vso[task.setvariable variable=AcceptanceTestProcessId]$!"
-        displayName: Run application (Linux)
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-        workingDirectory: $(Agent.BuildDirectory)/app
-
-      # Run application for Windows
-      - pwsh: |
-          $process = Start-Process dotnet "run --project UmbracoProject --configuration ${{ parameters.buildConfiguration }} --no-build --no-launch-profile 2>&1" -PassThru -NoNewWindow -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log
-          Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)"
-        displayName: Run application (Windows)
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-        workingDirectory: $(Agent.BuildDirectory)/app
@@ -1,105 +0,0 @@
-parameters:
-  - name: ASPNETCORE_URLS
-    type: string
-    default: ''
-
-  - name: testCommand
-    type: string
-    default: ''
-
-  - name: port
-    type: string
-    default: ''
-
-  - name: AZUREB2CTESTUSEREMAIL
-    type: string
-    default: ''
-
-  - name: AZUREB2CTESTUSERPASSWORD
-    type: string
-    default: ''
-
-  - name: DatabaseType
-    type: string
-    default: ''
-
-steps:
-  # Ensures we have the package wait-on installed
-  - pwsh: npm install wait-on
-    displayName: Install wait-on package
-
-  # Wait for either the port of the aspnetcore url
-  - pwsh: |
-      $Port = "${{ parameters.port }}"
-      $Url  = "${{ parameters.ASPNETCORE_URLS }}"
-
-      if ($Port -ne "") {
-          Write-Host "Waiting on TCP port $Port"
-          npx wait-on -v --interval 1000 --timeout 120000 "tcp:$Port"
-      } else {
-          Write-Host "Waiting on URL $Url"
-          npx wait-on -v --interval 1000 --timeout 120000 "$Url"
-      }
-    displayName: Wait for application
-    workingDirectory: tests/Umbraco.Tests.AcceptanceTest
-
-  # Install Playwright and dependencies
-  - pwsh: npx playwright install chromium
-    displayName: Install Playwright only with Chromium browser
-    workingDirectory: tests/Umbraco.Tests.AcceptanceTest
-
-  # Test
-  - pwsh: ${{ parameters.testCommand }}
-    displayName: Run Playwright tests
-    workingDirectory: tests/Umbraco.Tests.AcceptanceTest
-    env:
-      CI: true
-      CommitId: $(Build.SourceVersion)
-      AgentOs: $(Agent.OS)
-      AZUREADB2CTESTUSEREMAIL: ${{ parameters.AZUREB2CTESTUSEREMAIL }}
-      AZUREADB2CTESTUSERPASSWORD: ${{ parameters.AZUREB2CTESTUSERPASSWORD }}
-
-  # Stop application
-  - bash: kill -15 $(AcceptanceTestProcessId)
-    displayName: Stop application (Linux)
-    condition: and(succeededOrFailed(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Linux'))
-
-  - pwsh: Stop-Process -Id $(AcceptanceTestProcessId)
-    displayName: Stop application (Windows)
-    condition: and(succeededOrFailed(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Windows_NT'))
-
-  - ${{ if eq(parameters.DatabaseType, 'SQLServer') }}:
-      # Stop SQL Server
-      - pwsh: docker stop mssql
-        displayName: Stop SQL Server Docker image (Linux)
-        condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Linux'))
-
-      - pwsh: SqlLocalDB stop MSSQLLocalDB
-        displayName: Stop SQL Server LocalDB (Windows)
-        condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Windows_NT'))
-
-  # Copy artifacts
-  - pwsh: |
-      if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
-        Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
-      }
-    displayName: Copy Playwright results
-    condition: succeededOrFailed()
-
-  # Publish
-  - task: PublishPipelineArtifact@1
-    displayName: Publish test artifacts
-    condition: succeededOrFailed()
-    inputs:
-      targetPath: $(Build.ArtifactStagingDirectory)
-      artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
-
-  # Publish test results
-  - task: PublishTestResults@2
-    displayName: "Publish test results"
-    condition: succeededOrFailed()
-    inputs:
-      testResultsFormat: 'JUnit'
-      testResultsFiles: '*.xml'
-      searchFolder: "tests/Umbraco.Tests.AcceptanceTest/results"
-      testRunTitle: "$(Agent.JobName)"
@@ -1,69 +0,0 @@
-parameters:
-  - name: nodeVersion
-    type: string
-    default: ''
-
-  - name: PlaywrightUserEmail
-    type: string
-    default: ''
-
-  - name: PlaywrightPassword
-    type: string
-    default: ''
-
-  - name: ASPNETCORE_URLS
-    type: string
-    default: ''
-
-  - name: npm_config_cache
-    type: string
-    default: ''
-
-steps:
-  - task: DownloadPipelineArtifact@2
-    displayName: Download NuGet artifacts
-    inputs:
-      artifact: nupkg
-      path: $(Agent.BuildDirectory)/app/nupkg
-
-  - task: NodeTool@0
-    displayName: Use Node.js $(nodeVersion)
-    inputs:
-      versionSpec: $(nodeVersion)
-
-  - task: UseDotNet@2
-    displayName: Use .NET SDK from global.json
-    inputs:
-      useGlobalJson: true
-
-  - pwsh: |
-      "UMBRACO_USER_LOGIN=${{ parameters.PlaywrightUserEmail }}
-      UMBRACO_USER_PASSWORD=${{ parameters.PlaywrightPassword }}
-      URL=${{ parameters.ASPNETCORE_URLS }}
-      STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json" | Out-File .env
-    displayName: Generate .env
-    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
-
-  # Cache and restore NPM packages
-  - task: Cache@2
-    displayName: Cache NPM packages
-    inputs:
-      key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
-      restoreKeys: |
-        npm_e2e | "$(Agent.OS)"
-        npm_e2e
-      path: ${{ parameters.npm_config_cache }}
-
-  - script: npm ci --no-fund --no-audit --prefer-offline
-    workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
-    displayName: Restore NPM packages
-
-  # Install Template
-  - pwsh: |
-      $cmsVersion = "$(Build.BuildNumber)" -replace "\+",".g"
-      dotnet new nugetconfig
-      dotnet nuget add source ./nupkg --name Local
-      dotnet new install Umbraco.Templates::$cmsVersion
-      dotnet new umbraco --name UmbracoProject --version $cmsVersion --exclude-gitignore --no-restore --no-update-check
-    displayName: Install Template
-    workingDirectory: $(Agent.BuildDirectory)/app
@@ -3,29 +3,14 @@ name: Nightly_E2E_Test_$(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName
 pr: none
 trigger: none

-# schedules:
-#   - cron: '0 0 * * *'
-#     displayName: Daily midnight build
-#     branches:
-#       include:
-#         - v14/dev
-#         - v15/dev
-
-parameters:
-  - name: differentAppSettingsAcceptanceTests
-    displayName: Run acceptance tests with different app settings
-    type: boolean
-    default: false
-
-  - name: skipDefaultConfigAcceptanceTests
-    displayName: Skip tests with DefaultConfig
-    type: boolean
-    default: false
-
-  - name: skipIntegrationTests
-    displayName: Skip integration tests
-    type: boolean
-    default: false
+schedules:
+  - cron: '0 0 * * *'
+    displayName: Daily midnight build
+    branches:
+      include:
+        - v14/dev
+        - v15/dev
+        - v16/dev

 variables:
  nodeVersion: 20
@@ -48,17 +33,25 @@ stages:
      - job: A
        displayName: Build Umbraco CMS
        pool:
-          vmImage: "windows-latest"
+          vmImage: 'ubuntu-latest'
        steps:
          - checkout: self
-            submodules: false
-            lfs: false,
-            fetchDepth: 500
-          - template: templates/backoffice-install.yml
+            fetchDepth: 0
+            submodules: true
          - task: UseDotNet@2
            displayName: Use .NET SDK from global.json
            inputs:
              useGlobalJson: true
+          - template: templates/backoffice-install.yml
+          - script: npm run build:for:cms
+            displayName: Run build (Bellissima)
+            workingDirectory: src/Umbraco.Web.UI.Client
+          - script: npm ci --no-fund --no-audit --prefer-offline
+            displayName: Run npm ci (Login)
+            workingDirectory: src/Umbraco.Web.UI.Login
+          - script: npm run build
+            displayName: Run npm build (Login)
+            workingDirectory: src/Umbraco.Web.UI.Login
          - task: DotNetCoreCLI@2
            displayName: Run dotnet restore
            inputs:
@@ -70,7 +63,7 @@ stages:
            inputs:
              command: build
              projects: $(solution)
-              arguments: "--configuration $(buildConfiguration) --no-restore --property:ContinuousIntegrationBuild=true --property:GeneratePackageOnBuild=true --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg"
+              arguments: '--configuration $(buildConfiguration) --no-restore --property:ContinuousIntegrationBuild=true --property:GeneratePackageOnBuild=true --property:PackageOutputPath=$(Build.ArtifactStagingDirectory)/nupkg'
          - task: PublishPipelineArtifact@1
            displayName: Publish nupkg
            inputs:
@@ -82,237 +75,8 @@ stages:
              targetPath: $(Build.SourcesDirectory)
              artifactName: build_output

-      - job: B
-        displayName: Build Bellissima Package
-        pool:
-          vmImage: "ubuntu-latest"
-        steps:
-          - checkout: self
-            submodules: false
-            lfs: false,
-            fetchDepth: 500
-          - template: templates/backoffice-install.yml
-          - script: npm run build:for:npm
-            displayName: Run build:for:npm
-            workingDirectory: src/Umbraco.Web.UI.Client
-          - bash: |
-              echo "##[command]Running npm pack"
-              echo "##[debug]Output directory: $(Build.ArtifactStagingDirectory)"
-              mkdir $(Build.ArtifactStagingDirectory)/npm
-              npm pack --pack-destination $(Build.ArtifactStagingDirectory)/npm
-              mv .npmrc $(Build.ArtifactStagingDirectory)/npm/
-            displayName: Run npm pack
-            workingDirectory: src/Umbraco.Web.UI.Client
-          - task: PublishPipelineArtifact@1
-            displayName: Publish Bellissima npm artifact
-            inputs:
-              targetPath: $(Build.ArtifactStagingDirectory)/npm
-              artifactName: npm
-  - stage: Integration
-    displayName: Integration Tests
-    dependsOn: Build
-    condition: ${{ eq(parameters.skipIntegrationTests, false) }}
-    jobs:
-      # Integration Tests (SQLite)
-      - job:
-        timeoutInMinutes: 180
-        displayName: Integration Tests (SQLite)
-        strategy:
-          matrix:
-            #            Windows:
-            #              vmImage: 'windows-latest'
-            # We split the tests into 4 parts for each OS to reduce the time it takes to run them on the pipeline
-            LinuxPart1Of4:
-              vmImage: "ubuntu-latest"
-              # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
-              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)"
-            LinuxPart2Of4:
-              vmImage: "ubuntu-latest"
-              # Filter tests that are part of the Umbraco.Infrastructure.Service namespace
-              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
-            LinuxPart3Of4:
-              vmImage: "ubuntu-latest"
-              # Filter tests that are not part of the Umbraco.Infrastructure and ManagementApi namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
-              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure) & (FullyQualifiedName!~ManagementApi)"
-            LinuxPart4Of4:
-              vmImage: "ubuntu-latest"
-              # Filter tests that are part of the ManagementApi namespace
-              testFilter: "(FullyQualifiedName~ManagementApi)"
-            macOSPart1Of4:
-              vmImage: "macOS-latest"
-              # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
-              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)"
-            macOSPart2Of4:
-              vmImage: "macOS-latest"
-              # Filter tests that are part of the Umbraco.Infrastructure.Service namespace
-              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
-            macOSPart3Of4:
-              vmImage: "macOS-latest"
-              # Filter tests that are not part of the Umbraco.Infrastructure and ManagementApi namespace.
-              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure) & (FullyQualifiedName!~ManagementApi)"
-            macOSPart4Of4:
-              vmImage: "macOS-latest"
-              # Filter tests that are part of the ManagementApi namespace.
-              testFilter: "(FullyQualifiedName~ManagementApi)"
-        pool:
-          vmImage: $(vmImage)
-        variables:
-          Tests__Database__DatabaseType: "Sqlite"
-        steps:
-          - checkout: self
-            submodules: false
-            lfs: false,
-            fetchDepth: 1
-            fetchFilter: tree:0
-          # Setup test environment
-          - task: DownloadPipelineArtifact@2
-            displayName: Download build artifacts
-            inputs:
-              artifact: build_output
-              path: $(Build.SourcesDirectory)
-
-          - task: UseDotNet@2
-            displayName: Use .NET SDK from global.json
-            inputs:
-              useGlobalJson: true
-
-          # Test
-          - task: DotNetCoreCLI@2
-            displayName: Run dotnet test
-            inputs:
-              command: test
-              projects: "tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj"
-              testRunTitle: Integration Tests SQLite - $(Agent.OS)
-              arguments: '--filter "$(testFilter)" --configuration $(buildConfiguration) --no-build'
-
-      # Integration Tests (SQL Server)
-      - job:
-        timeoutInMinutes: 180
-        displayName: Integration Tests (SQL Server)
-        variables:
-          SA_PASSWORD: UmbracoAcceptance123!
-        strategy:
-          matrix:
-            # We split the tests into 4 parts for each OS to reduce the time it takes to run them on the pipeline
-            WindowsPart1Of4:
-              vmImage: "windows-latest"
-              Tests__Database__DatabaseType: LocalDb
-              Tests__Database__SQLServerMasterConnectionString: N/A
-              # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
-              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)"
-            WindowsPart2Of4:
-              vmImage: "windows-latest"
-              Tests__Database__DatabaseType: LocalDb
-              Tests__Database__SQLServerMasterConnectionString: N/A
-              # Filter tests that are part of the Umbraco.Infrastructure.Service namespace
-              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
-            WindowsPart3Of4:
-              vmImage: "windows-latest"
-              Tests__Database__DatabaseType: LocalDb
-              Tests__Database__SQLServerMasterConnectionString: N/A
-              # Filter tests that are not part of the Umbraco.Infrastructure and ManagementApi namespace.
-              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure) & (FullyQualifiedName!~ManagementApi)"
-            WindowsPart4Of4:
-              vmImage: "windows-latest"
-              Tests__Database__DatabaseType: LocalDb
-              Tests__Database__SQLServerMasterConnectionString: N/A
-              # Filter tests that are part of the ManagementApi namespace.
-              testFilter: "(FullyQualifiedName~ManagementApi)"
-            LinuxPart1Of4:
-              vmImage: "ubuntu-latest"
-              Tests__Database__DatabaseType: SqlServer
-              Tests__Database__SQLServerMasterConnectionString: "Server=(local);User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
-              # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
-              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)"
-            LinuxPart2Of4:
-              vmImage: "ubuntu-latest"
-              Tests__Database__DatabaseType: SqlServer
-              Tests__Database__SQLServerMasterConnectionString: "Server=(local);User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
-              # Filter tests that are part of the Umbraco.Infrastructure.Service namespace
-              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
-            LinuxPart3Of4:
-              vmImage: "ubuntu-latest"
-              Tests__Database__DatabaseType: SqlServer
-              Tests__Database__SQLServerMasterConnectionString: "Server=(local);User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
-              # Filter tests that are not part of the Umbraco.Infrastructure and ManagementApi namespace.
-              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure) & (FullyQualifiedName!~ManagementApi)"
-            LinuxPart4Of4:
-              vmImage: "ubuntu-latest"
-              Tests__Database__DatabaseType: SqlServer
-              Tests__Database__SQLServerMasterConnectionString: "Server=(local);User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
-              # Filter tests that are part of the ManagementApi namespace.
-              testFilter: "(FullyQualifiedName~ManagementApi)"
-        pool:
-          vmImage: $(vmImage)
-        steps:
-          # Setup test environment
-          - task: DownloadPipelineArtifact@2
-            displayName: Download build artifacts
-            inputs:
-              artifact: build_output
-              path: $(Build.SourcesDirectory)
-
-          - task: UseDotNet@2
-            displayName: Use .NET SDK from global.json
-            inputs:
-              useGlobalJson: true
-
-          # Start SQL Server
-          - powershell: docker run --name mssql -d -p 1433:1433 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$(SA_PASSWORD)" mcr.microsoft.com/mssql/server:2022-latest
-            displayName: Start SQL Server Docker image (Linux)
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-
-          - powershell: |
-              $maxAttempts = 12
-              $attempt = 0
-              $status = ""
-
-              while (($status -ne 'running') -and ($attempt -lt $maxAttempts)) {
-                Start-Sleep -Seconds 5
-                # We use the docker inspect command to check the status of the container. If the container is not running, we wait 5 seconds and try again. And if reaches 12 attempts, we fail the build.
-                $status = docker inspect -f '{{.State.Status}}' mssql
-
-                if ($status -ne 'running') {
-                  Write-Host "Waiting for SQL Server to be ready... Attempt $($attempt + 1)"
-                  $attempt++
-                }
-              }
-
-              if ($status -eq 'running') {
-                Write-Host "SQL Server container is running"
-                docker ps -a
-              } else {
-                Write-Host "SQL Server did not become ready in time. Last known status: $status"
-                docker logs mssql
-                exit 1
-              }
-            displayName: Wait for SQL Server to be ready (Linux)
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-
-          - pwsh: SqlLocalDB start MSSQLLocalDB
-            displayName: Start SQL Server LocalDB (Windows)
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-
-          # Test
-          - task: DotNetCoreCLI@2
-            displayName: Run dotnet test
-            inputs:
-              command: test
-              projects: "tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj"
-              testRunTitle: Integration Tests SQL Server - $(Agent.OS)
-              arguments: '--filter "$(testFilter)" --configuration $(buildConfiguration) --no-build'
-
-          # Stop SQL Server
-          - pwsh: docker stop mssql
-            displayName: Stop SQL Server Docker image (Linux)
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-
-          - pwsh: SqlLocalDB stop MSSQLLocalDB
-            displayName: Stop SQL Server LocalDB (Windows)
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
-
-  - stage: DefaultConfigE2E
-    displayName: Default Config E2E Tests
+  - stage: E2E
+    displayName: E2E Tests
    dependsOn: Build
    variables:
      npm_config_cache: $(Pipeline.Workspace)/.npm_e2e
@@ -340,290 +104,338 @@ stages:
      - job:
        displayName: E2E Tests (SQLite)
        timeoutInMinutes: 180
-        condition: ${{ eq(parameters.skipDefaultConfigAcceptanceTests, false) }}
        variables:
          # Connection string
          CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=Umbraco;Mode=Memory;Cache=Shared;Foreign Keys=True;Pooling=True
          CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.Sqlite
-          DatabaseType: SQLite
        strategy:
          matrix:
            LinuxPart1Of3:
              vmImage: "ubuntu-latest"
-              testFolder: "DefaultConfig"
-              testCommand: "npm run testSqlite -- --shard=1/3"
+              testCommand: "npm run test -- --shard=1/3"
            LinuxPart2Of3:
              vmImage: "ubuntu-latest"
-              testFolder: "DefaultConfig"
-              testCommand: "npm run testSqlite -- --shard=2/3"
+              testCommand: "npm run test -- --shard=2/3"
            LinuxPart3Of3:
              vmImage: "ubuntu-latest"
-              testFolder: "DefaultConfig"
-              testCommand: "npm run testSqlite -- --shard=3/3"
+              testCommand: "npm run test -- --shard=3/3"
            WindowsPart1Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
-              testCommand: "npm run testSqlite -- --shard=1/3"
+              testCommand: "npm run test -- --shard=1/3"
            WindowsPart2Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
-              testCommand: "npm run testSqlite -- --shard=2/3"
+              testCommand: "npm run test -- --shard=2/3"
            WindowsPart3Of3:
              vmImage: "windows-latest"
-              testFolder: "DefaultConfig"
-              testCommand: "npm run testSqlite -- --shard=3/3"
+              testCommand: "npm run test -- --shard=3/3"
        pool:
          vmImage: $(vmImage)
        steps:
-          # Setup test environment Template
-          - template: nightly-E2E-setup-template.yml
-            parameters:
-              nodeVersion: ${{ variables.nodeVersion }}
-              PlaywrightUserEmail: ${{ variables.UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL }}
-              PlaywrightPassword: ${{ variables.UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD }}
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              npm_config_cache: ${{ variables.npm_config_cache }}
+          # Setup test environment
+          - task: DownloadPipelineArtifact@2
+            displayName: Download NuGet artifacts
+            inputs:
+              artifact: nupkg
+              path: $(Agent.BuildDirectory)/app/nupkg
+
+          - task: NodeTool@0
+            displayName: Use Node.js $(nodeVersion)
+            retryCountOnTaskFailure: 3
+            inputs:
+              versionSpec: $(nodeVersion)
+
+          - task: UseDotNet@2
+            displayName: Use .NET SDK from global.json
+            inputs:
+              useGlobalJson: true

          - pwsh: |
+              "UMBRACO_USER_LOGIN=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL)
+              UMBRACO_USER_PASSWORD=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
+              URL=$(ASPNETCORE_URLS)
+              STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json" | Out-File .env
+            displayName: Generate .env
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+
+          # Cache and restore NPM packages
+          - task: Cache@2
+            displayName: Cache NPM packages
+            inputs:
+              key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
+              restoreKeys: |
+                npm_e2e | "$(Agent.OS)"
+                npm_e2e
+              path: $(npm_config_cache)
+
+          - script: npm ci --no-fund --no-audit --prefer-offline
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+            displayName: Restore NPM packages
+
+          # Build application
+          - pwsh: |
+              $cmsVersion = "$(Build.BuildNumber)" -replace "\+",".g"
+              dotnet new nugetconfig
+              dotnet nuget add source ./nupkg --name Local
+              dotnet new install Umbraco.Templates::$cmsVersion
+              dotnet new umbraco --name UmbracoProject --version $cmsVersion --exclude-gitignore --no-restore --no-update-check
              dotnet restore UmbracoProject
              cp $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest.UmbracoProject/*.cs UmbracoProject
-            displayName: Restore project
-            workingDirectory: $(Agent.BuildDirectory)/app
-
-          - pwsh: |
-              dotnet build UmbracoProject --configuration ${{ variables.buildConfiguration }} --no-restore
+              dotnet build UmbracoProject --configuration $(buildConfiguration) --no-restore
              dotnet dev-certs https
            displayName: Build application
            workingDirectory: $(Agent.BuildDirectory)/app
-            condition: succeeded()

-          # Run application Template
-          - template: nightly-E2E-run-application-template.yml
-            parameters:
-              DatabaseType: ${{ variables.DatabaseType }}
-              buildConfiguration: ${{ variables.buildConfiguration }}
+          # Run application
+          - bash: |
+              nohup dotnet run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 &
+              echo "##vso[task.setvariable variable=AcceptanceTestProcessId]$!"
+            displayName: Run application (Linux)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+            workingDirectory: $(Agent.BuildDirectory)/app

-          # Run tests Template
-          - template: nightly-E2E-run-tests-template.yml
-            parameters:
-              testCommand: $(testCommand)
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              DatabaseType: ${{ variables.DatabaseType }}
+          - pwsh: |
+              $process = Start-Process dotnet "run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile 2>&1" -PassThru -NoNewWindow -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log
+              Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)"
+            displayName: Run application (Windows)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+            workingDirectory: $(Agent.BuildDirectory)/app
+
+          # Ensures we have the package wait-on installed
+          - pwsh: npm install wait-on
+            displayName: Install wait-on package
+
+          # Wait for application to start responding to requests
+          - pwsh: npx wait-on -v --interval 1000 --timeout 120000 $(ASPNETCORE_URLS)
+            displayName: Wait for application
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+
+          # Install Playwright and dependencies
+          - pwsh: npx playwright install --with-deps
+            displayName: Install Playwright
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+
+          # Test
+          - pwsh: $(testCommand)
+            displayName: Run Playwright tests
+            continueOnError: true
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+            env:
+              CI: true
+              CommitId: $(Build.SourceVersion)
+              AgentOs: $(Agent.OS)
+
+          # Stop application
+          - bash: kill -15 $(AcceptanceTestProcessId)
+            displayName: Stop application (Linux)
+            condition: and(succeeded(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Linux'))
+
+          - pwsh: Stop-Process -Id $(AcceptanceTestProcessId)
+            displayName: Stop application (Windows)
+            condition: and(succeeded(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Windows_NT'))
+
+          # Copy artifacts
+          - pwsh: |
+              if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
+                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
+              }
+            displayName: Copy Playwright results
+            condition: succeededOrFailed()
+
+          # Publish
+          - task: PublishPipelineArtifact@1
+            displayName: Publish test artifacts
+            condition: succeededOrFailed()
+            inputs:
+              targetPath: $(Build.ArtifactStagingDirectory)
+              artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
+
+          # Publish test results
+          - task: PublishTestResults@2
+            displayName: "Publish test results"
+            condition: succeededOrFailed()
+            inputs:
+              testResultsFormat: 'JUnit'
+              testResultsFiles: '*.xml'
+              searchFolder: "tests/Umbraco.Tests.AcceptanceTest/results"
+              testRunTitle: "$(Agent.JobName)"

      - job:
        displayName: E2E Tests (SQL Server)
        timeoutInMinutes: 180
-        condition: ${{ eq(parameters.skipDefaultConfigAcceptanceTests, false) }}
        variables:
          # Connection string
          CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=(localdb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Umbraco.mdf;Integrated Security=True
          CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
-          DatabaseType: SQLServer
-          SA_PASSWORD: UmbracoAcceptance123!
        strategy:
          matrix:
            LinuxPart1Of3:
-              testCommand: "npm run test -- --shard=1/3"
-              testFolder: "DefaultConfig"
+              testCommand: "npm run testSqlite -- --shard=1/3"
              vmImage: "ubuntu-latest"
-              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
+              SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
+              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
            LinuxPart2Of3:
-              testCommand: "npm run test -- --shard=2/3"
-              testFolder: "DefaultConfig"
+              testCommand: "npm run testSqlite -- --shard=2/3"
              vmImage: "ubuntu-latest"
-              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
+              SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
+              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
            LinuxPart3Of3:
-              testCommand: "npm run test -- --shard=3/3"
-              testFolder: "DefaultConfig"
+              testCommand: "npm run testSqlite -- --shard=3/3"
              vmImage: "ubuntu-latest"
-              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
+              SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
+              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
            WindowsPart1Of3:
-              testCommand: "npm run test -- --shard=1/3"
-              testFolder: "DefaultConfig"
              vmImage: "windows-latest"
+              testCommand: "npm run testSqlite -- --shard=1/3"
            WindowsPart2Of3:
-              testCommand: "npm run test -- --shard=2/3"
-              testFolder: "DefaultConfig"
              vmImage: "windows-latest"
+              testCommand: "npm run testSqlite -- --shard=2/3"
            WindowsPart3Of3:
-              testCommand: "npm run test -- --shard=3/3"
-              testFolder: "DefaultConfig"
              vmImage: "windows-latest"
+              testCommand: "npm run testSqlite -- --shard=3/3"
        pool:
          vmImage: $(vmImage)
        steps:
-          # Setup test environment Template
-          - template: nightly-E2E-setup-template.yml
-            parameters:
-              nodeVersion: ${{ variables.nodeVersion }}
-              PlaywrightUserEmail: ${{ variables.UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL }}
-              PlaywrightPassword: ${{ variables.UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD }}
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              npm_config_cache: ${{ variables.npm_config_cache }}
+          # Setup test environment
+          - task: DownloadPipelineArtifact@2
+            displayName: Download NuGet artifacts
+            inputs:
+              artifact: nupkg
+              path: $(Agent.BuildDirectory)/app/nupkg
+
+          - task: NodeTool@0
+            displayName: Use Node.js $(nodeVersion)
+            inputs:
+              versionSpec: $(nodeVersion)
+
+          - task: UseDotNet@2
+            displayName: Use .NET SDK from global.json
+            inputs:
+              useGlobalJson: true

          - pwsh: |
+              "UMBRACO_USER_LOGIN=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSEREMAIL)
+              UMBRACO_USER_PASSWORD=$(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
+              URL=$(ASPNETCORE_URLS)
+              STORAGE_STAGE_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/playwright/.auth/user.json" | Out-File .env
+            displayName: Generate .env
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+
+          # Cache and restore NPM packages
+          - task: Cache@2
+            displayName: Cache NPM packages
+            inputs:
+              key: 'npm_e2e | "$(Agent.OS)" | $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/package-lock.json'
+              restoreKeys: |
+                npm_e2e | "$(Agent.OS)"
+                npm_e2e
+              path: $(npm_config_cache)
+
+          - script: npm ci --no-fund --no-audit --prefer-offline
+            workingDirectory: $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest
+            displayName: Restore NPM packages
+
+          # Build application
+          - pwsh: |
+              $cmsVersion = "$(Build.BuildNumber)" -replace "\+",".g"
+              dotnet new nugetconfig
+              dotnet nuget add source ./nupkg --name Local
+              dotnet new install Umbraco.Templates::$cmsVersion
+              dotnet new umbraco --name UmbracoProject --version $cmsVersion --exclude-gitignore --no-restore --no-update-check
              dotnet restore UmbracoProject
              cp $(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest.UmbracoProject/*.cs UmbracoProject
-            displayName: Restore project
-            workingDirectory: $(Agent.BuildDirectory)/app
-
-          - pwsh: |
-              dotnet build UmbracoProject --configuration ${{ variables.buildConfiguration }} --no-restore
+              dotnet build UmbracoProject --configuration $(buildConfiguration) --no-restore
              dotnet dev-certs https
            displayName: Build application
            workingDirectory: $(Agent.BuildDirectory)/app
-            condition: succeeded()

-          # Run application Template
-          - template: nightly-E2E-run-application-template.yml
-            parameters:
-              SA_PASSWORD: ${{ variables.SA_PASSWORD }}
-              buildConfiguration: ${{ variables.buildConfiguration }}
-              DatabaseType: ${{ variables.DatabaseType }}
+          # Start SQL Server
+          - powershell: docker run --name mssql -d -p 1433:1433 -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=$(SA_PASSWORD)" mcr.microsoft.com/mssql/server:2022-latest
+            displayName: Start SQL Server Docker image (Linux)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

-          # Run tests Template
-          - template: nightly-E2E-run-tests-template.yml
-            parameters:
-              testCommand: $(testCommand)
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              DatabaseType: ${{ variables.DatabaseType }}
+          - pwsh: SqlLocalDB start MSSQLLocalDB
+            displayName: Start SQL Server LocalDB (Windows)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

-  - stage: AdditionalConfigE2E
-    displayName: Additional Config E2E Tests
-    dependsOn: Build
-    variables:
-      npm_config_cache: $(Pipeline.Workspace)/.npm_e2e
-      ASPNETCORE_URLS: https://localhost:44331
-      PlaywrightPassword: UmbracoAcceptance123!
-      PlaywrightUserEmail: playwright@umbraco.com
-    jobs:
-      - job:
-        displayName: E2E Tests with Different App settings (SQL Server)
-        condition: ${{ eq(parameters.differentAppSettingsAcceptanceTests, true) }}
-        timeoutInMinutes: 180
-        variables:
-          SA_PASSWORD: UmbracoAcceptance123!
-          DatabaseType: SQLServer
-        strategy:
-          matrix:
-            # UnattendedInstallConfig
-            WindowsUnattendedInstallConfig:
-              vmImage: "windows-latest"
-              testFolder: "UnattendedInstallConfig"
-              testCommand: "npx playwright test --project=unattendedInstallConfig --grep=InstallSQLServer"
-              port: 44331
-              additionalEnvironmentVariables: false
-            # DeliveryApiConfig
-            WindowsDeliveryApiConfig:
-              vmImage: "windows-latest"
-              testFolder: "DeliveryApi"
-              port: ''
-              testCommand: "npx playwright test --project=deliveryApi"
-              CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=(localdb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Umbraco.mdf;Integrated Security=True
-              CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
-              additionalEnvironmentVariables: false
-            LinuxDeliveryApiConfig:
-              vmImage: "ubuntu-latest"
-              testFolder: "DeliveryApi"
-              port: ''
-              testCommand: "npx playwright test --project=deliveryApi"
-              CONNECTIONSTRINGS__UMBRACODBDSN: Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True
-              CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
-              additionalEnvironmentVariables: false
-            # ExternalLogin AzureADB2C
-            WindowsExternalLoginAzureADB2C:
-              vmImage: "windows-latest"
-              testFolder: "ExternalLogin\\AzureADB2C"
-              testCommand: "npx playwright test --project=externalLoginAzureADB2C"
-              port: 44331
-              packageName: "Microsoft.AspNetCore.Authentication.OpenIdConnect"
-              packageVersion: "9.0.8"
-              CONNECTIONSTRINGS__UMBRACODBDSN: Data Source=(localdb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\Umbraco.mdf;Integrated Security=True
-              CONNECTIONSTRINGS__UMBRACODBDSN_PROVIDERNAME: Microsoft.Data.SqlClient
-              additionalEnvironmentVariables: true
-        pool:
-          vmImage: $(vmImage)
-        steps:
-          # Setup test environment Template
-          - template: nightly-E2E-setup-template.yml
-            parameters:
-              nodeVersion: ${{ variables.nodeVersion }}
-              PlaywrightUserEmail: ${{ variables.PlaywrightUserEmail }}
-              PlaywrightPassword: ${{ variables.PlaywrightPassword }}
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              npm_config_cache: ${{ variables.npm_config_cache }}
-
-          # Install NuGet package if specified in the matrix
-          - pwsh: |
-              Write-Host "Installing package $(packageName) version $(packageVersion)"
-              dotnet add package $(packageName) --version $(packageVersion)
-            displayName: "Install NuGet package: $(packageName)"
-            workingDirectory: $(Agent.BuildDirectory)/app/UmbracoProject
-            condition: and(succeeded(), ne(variables['packageName'], ''), ne(variables['packageVersion'], ''))
-
-          # Build application Template
-          - template: nightly-E2E-build-template.yml
-            parameters:
-              testFolder: $(testFolder)
-              buildConfiguration: ${{ variables.buildConfiguration }}
-              additionalEnvironmentVariables: ${{ eq(variables['additionalEnvironmentVariables'], true) }}
-
-          # Build application for AzureADB2C
-          - pwsh: |
-              dotnet build UmbracoProject --configuration ${{ variables.buildConfiguration }} --no-restore
-              dotnet dev-certs https
-            displayName: Build application for AzureADB2C
-            workingDirectory: $(Agent.BuildDirectory)/app
-            env:
-              AZUREADB2CDOMAIN: $(AZUREB2CDOMAIN)
-              AZUREADB2CTENANT: $(AZUREB2CTENANT)
-              AZUREADB2CPOLICY: $(AZUREB2CPOLICY)
-              AZUREADB2CCLIENTID: $(AZUREB2CCLIENTID)
-              AZUREADB2CCLIENTSECRET: $(AZUREB2CCLIENTSECRET)
-            condition: and(succeeded(), eq(variables['testFolder'], 'ExternalLogin\AzureADB2C'))
-
-          # Run application Template
-          - template: nightly-E2E-run-application-template.yml
-            parameters:
-              SA_PASSWORD: ${{ variables.SA_PASSWORD }}
-              additionalEnvironmentVariables: ${{ eq(variables['additionalEnvironmentVariables'], true ) }}
-              buildConfiguration: ${{ variables.buildConfiguration }}
-              DatabaseType: ${{ variables.DatabaseType }}
-
-          # Run application for Linux with additional Environment Variables for Azure AD
+          # Run application
          - bash: |
-              nohup dotnet run --project UmbracoProject --configuration ${{ variables.buildConfiguration }} --no-build --no-launch-profile > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 &
+              nohup dotnet run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile > $(Build.ArtifactStagingDirectory)/playwright.log 2>&1 &
              echo "##vso[task.setvariable variable=AcceptanceTestProcessId]$!"
            displayName: Run application (Linux)
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'), eq(variables['testFolder'], 'ExternalLogin\AzureADB2C'))
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
            workingDirectory: $(Agent.BuildDirectory)/app
-            env:
-              AZUREADB2CDOMAIN: $(AZUREB2CDOMAIN)
-              AZUREADB2CTENANT: $(AZUREB2CTENANT)
-              AZUREADB2CPOLICY: $(AZUREB2CPOLICY)
-              AZUREADB2CCLIENTID: $(AZUREB2CCLIENTID)
-              AZUREADB2CCLIENTSECRET: $(AZUREB2CCLIENTSECRET)

-          # Run application for Windows with additional Environment Variables for Azure AD
          - pwsh: |
-              $process = Start-Process dotnet "run --project UmbracoProject --configuration ${{ variables.buildConfiguration }} --no-build --no-launch-profile 2>&1" -PassThru -NoNewWindow -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log
+              $process = Start-Process dotnet "run --project UmbracoProject --configuration $(buildConfiguration) --no-build --no-launch-profile 2>&1" -PassThru -NoNewWindow -RedirectStandardOutput $(Build.ArtifactStagingDirectory)/playwright.log
              Write-Host "##vso[task.setvariable variable=AcceptanceTestProcessId]$($process.Id)"
            displayName: Run application (Windows)
-            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['testFolder'], 'ExternalLogin\AzureADB2C'))
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
            workingDirectory: $(Agent.BuildDirectory)/app
-            env:
-              AZUREADB2CDOMAIN: $(AZUREB2CDOMAIN)
-              AZUREADB2CTENANT: $(AZUREB2CTENANT)
-              AZUREADB2CPOLICY: $(AZUREB2CPOLICY)
-              AZUREADB2CCLIENTID: $(AZUREB2CCLIENTID)
-              AZUREADB2CCLIENTSECRET: $(AZUREB2CCLIENTSECRET)

-          # Run tests Template
-          - template: nightly-E2E-run-tests-template.yml
-            parameters:
-              testCommand: $(testCommand)
-              ASPNETCORE_URLS: ${{ variables.ASPNETCORE_URLS }}
-              port: $(port)
-              AZUREB2CTESTUSEREMAIL: $(AZUREB2CTESTUSEREMAIL)
-              AZUREB2CTESTUSERPASSWORD: $(AZUREB2CTESTUSERPASSWORD)
-              DatabaseType: ${{ variables.DatabaseType }}
+          # Ensures we have the package wait-on installed
+          - pwsh: npm install wait-on
+            displayName: Install wait-on package
+
+          # Wait for application to start responding to requests
+          - pwsh: npx wait-on -v --interval 1000 --timeout 120000 $(ASPNETCORE_URLS)
+            displayName: Wait for application
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+
+          # Install Playwright and dependencies
+          - pwsh: npx playwright install --with-deps
+            displayName: Install Playwright
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+
+          # Test
+          - pwsh: $(testCommand)
+            displayName: Run Playwright tests
+            continueOnError: true
+            workingDirectory: tests/Umbraco.Tests.AcceptanceTest
+            env:
+              CI: true
+              CommitId: $(Build.SourceVersion)
+              AgentOs: $(Agent.OS)
+
+          # Stop application
+          - bash: kill -15 $(AcceptanceTestProcessId)
+            displayName: Stop application (Linux)
+            condition: and(succeeded(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Linux'))
+
+          - pwsh: Stop-Process -Id $(AcceptanceTestProcessId)
+            displayName: Stop application (Windows)
+            condition: and(succeeded(), ne(variables.AcceptanceTestProcessId, ''), eq(variables['Agent.OS'], 'Windows_NT'))
+
+          # Stop SQL Server
+          - pwsh: docker stop mssql
+            displayName: Stop SQL Server Docker image (Linux)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
+
+          - pwsh: SqlLocalDB stop MSSQLLocalDB
+            displayName: Stop SQL Server LocalDB (Windows)
+            condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+
+          # Copy artifacts
+          - pwsh: |
+              if (Test-Path tests/Umbraco.Tests.AcceptanceTest/results/*) {
+                Copy-Item tests/Umbraco.Tests.AcceptanceTest/results/* $(Build.ArtifactStagingDirectory) -Recurse
+              }
+            displayName: Copy Playwright results
+            condition: succeededOrFailed()
+
+          # Publish
+          - task: PublishPipelineArtifact@1
+            displayName: Publish test artifacts
+            condition: succeededOrFailed()
+            inputs:
+              targetPath: $(Build.ArtifactStagingDirectory)
+              artifact: "Acceptance Test Results - $(Agent.JobName) - Attempt #$(System.JobAttempt)"
+
+          # Publish test results
+          - task: PublishTestResults@2
+            displayName: "Publish test results"
+            condition: succeededOrFailed()
+            inputs:
+              testResultsFormat: 'JUnit'
+              testResultsFiles: '*.xml'
+              searchFolder: "tests/Umbraco.Tests.AcceptanceTest/results"
+              testRunTitle: "$(Agent.JobName)"
@@ -7,7 +7,6 @@ using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Umbraco.Cms.Api.Common.OpenApi;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Extensions;

 namespace Umbraco.Cms.Api.Common.Configuration;
@@ -18,13 +17,6 @@ public class ConfigureUmbracoSwaggerGenOptions : IConfigureOptions<SwaggerGenOpt
    private readonly ISchemaIdSelector _schemaIdSelector;
    private readonly ISubTypesSelector _subTypesSelector;

-    [Obsolete("Use non-obsolete constructor. This will be removed in Umbraco 16.")]
-    public ConfigureUmbracoSwaggerGenOptions(
-        IOperationIdSelector operationIdSelector,
-        ISchemaIdSelector schemaIdSelector)
-        : this(operationIdSelector, schemaIdSelector, StaticServiceProvider.Instance.GetRequiredService<ISubTypesSelector>())
-    { }
-
    public ConfigureUmbracoSwaggerGenOptions(
        IOperationIdSelector operationIdSelector,
        ISchemaIdSelector schemaIdSelector,
@@ -5,8 +5,5 @@ namespace Umbraco.Cms.Api.Common.OpenApi;

 public interface IOperationIdSelector
 {
-    [Obsolete("Use overload that only takes ApiDescription instead. This will be removed in Umbraco 15.")]
-    string? OperationId(ApiDescription apiDescription, ApiVersioningOptions apiVersioningOptions);
-
    string? OperationId(ApiDescription apiDescription);
 }
@@ -16,9 +16,6 @@ public class OperationIdSelector : IOperationIdSelector
    public OperationIdSelector(IEnumerable<IOperationIdHandler> operationIdHandlers)
        => _operationIdHandlers = operationIdHandlers;

-    [Obsolete("Use overload that only takes ApiDescription instead. This will be removed in Umbraco 15.")]
-    public virtual string? OperationId(ApiDescription apiDescription, ApiVersioningOptions apiVersioningOptions) => OperationId(apiDescription);
-
    public virtual string? OperationId(ApiDescription apiDescription)
    {
        IOperationIdHandler? handler = _operationIdHandlers.FirstOrDefault(h => h.CanHandle(apiDescription));
@@ -10,12 +10,12 @@ namespace Umbraco.Cms.Api.Common.OpenApi;

 public class SubTypesSelector : ISubTypesSelector
 {
-    private readonly IOptions<GlobalSettings> _settings;
    private readonly IHostingEnvironment _hostingEnvironment;
    private readonly IHttpContextAccessor _httpContextAccessor;
    private readonly IEnumerable<ISubTypesHandler> _subTypeHandlers;
    private readonly IUmbracoJsonTypeInfoResolver _umbracoJsonTypeInfoResolver;

+    [Obsolete("The settings parameter is not required anymore, use the other constructor instead. Scheduled for removal in Umbraco 17.")]
    public SubTypesSelector(
        IOptions<GlobalSettings> settings,
        IHostingEnvironment hostingEnvironment,
@@ -23,7 +23,18 @@ public class SubTypesSelector : ISubTypesSelector
        IEnumerable<ISubTypesHandler> subTypeHandlers,
        IUmbracoJsonTypeInfoResolver umbracoJsonTypeInfoResolver)
    {
-        _settings = settings;
+        _hostingEnvironment = hostingEnvironment;
+        _httpContextAccessor = httpContextAccessor;
+        _subTypeHandlers = subTypeHandlers;
+        _umbracoJsonTypeInfoResolver = umbracoJsonTypeInfoResolver;
+    }
+
+    public SubTypesSelector(
+        IHostingEnvironment hostingEnvironment,
+        IHttpContextAccessor httpContextAccessor,
+        IEnumerable<ISubTypesHandler> subTypeHandlers,
+        IUmbracoJsonTypeInfoResolver umbracoJsonTypeInfoResolver)
+    {
        _hostingEnvironment = hostingEnvironment;
        _httpContextAccessor = httpContextAccessor;
        _subTypeHandlers = subTypeHandlers;
@@ -32,7 +43,7 @@ public class SubTypesSelector : ISubTypesSelector

    public IEnumerable<Type> SubTypes(Type type)
    {
-        var backOfficePath =  _settings.Value.GetBackOfficePath(_hostingEnvironment);
+        var backOfficePath = _hostingEnvironment.GetBackOfficePath();
        var swaggerPath = $"{backOfficePath}/swagger";

        if (_httpContextAccessor.HttpContext?.Request.Path.StartsWithSegments(swaggerPath) ?? false)
@@ -7,7 +7,7 @@ using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Swashbuckle.AspNetCore.SwaggerUI;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Web.Common.ApplicationBuilder;
 using Umbraco.Extensions;
 using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
@@ -30,24 +30,21 @@ public class SwaggerRouteTemplatePipelineFilter : UmbracoPipelineFilter
        IOptions<SwaggerGenOptions> swaggerGenOptions = applicationBuilder.ApplicationServices.GetRequiredService<IOptions<SwaggerGenOptions>>();

        applicationBuilder.UseSwagger(swaggerOptions =>
-            {
-                swaggerOptions.RouteTemplate = SwaggerRouteTemplate(applicationBuilder);
-            });
+        {
+            swaggerOptions.RouteTemplate = SwaggerRouteTemplate(applicationBuilder);
+        });

        applicationBuilder.UseSwaggerUI(swaggerUiOptions => SwaggerUiConfiguration(swaggerUiOptions, swaggerGenOptions.Value, applicationBuilder));
    }

    protected virtual bool SwaggerIsEnabled(IApplicationBuilder applicationBuilder)
-    {
-        IWebHostEnvironment webHostEnvironment = applicationBuilder.ApplicationServices.GetRequiredService<IWebHostEnvironment>();
-        return webHostEnvironment.IsProduction() is false;
-    }
+        => applicationBuilder.ApplicationServices.GetRequiredService<IWebHostEnvironment>().IsProduction() is false;

    protected virtual string SwaggerRouteTemplate(IApplicationBuilder applicationBuilder)
-        => $"{GetUmbracoPath(applicationBuilder).TrimStart(Constants.CharArrays.ForwardSlash)}/swagger/{{documentName}}/swagger.json";
+        => $"{GetBackOfficePath(applicationBuilder).TrimStart(Constants.CharArrays.ForwardSlash)}/swagger/{{documentName}}/swagger.json";

    protected virtual string SwaggerUiRoutePrefix(IApplicationBuilder applicationBuilder)
-        => $"{GetUmbracoPath(applicationBuilder).TrimStart(Constants.CharArrays.ForwardSlash)}/swagger";
+        => $"{GetBackOfficePath(applicationBuilder).TrimStart(Constants.CharArrays.ForwardSlash)}/swagger";

    protected virtual void SwaggerUiConfiguration(
        SwaggerUIOptions swaggerUiOptions,
@@ -56,8 +53,7 @@ public class SwaggerRouteTemplatePipelineFilter : UmbracoPipelineFilter
    {
        swaggerUiOptions.RoutePrefix = SwaggerUiRoutePrefix(applicationBuilder);

-        foreach ((var name, OpenApiInfo? apiInfo) in swaggerGenOptions.SwaggerGeneratorOptions.SwaggerDocs
-                     .OrderBy(x => x.Value.Title))
+        foreach ((var name, OpenApiInfo? apiInfo) in swaggerGenOptions.SwaggerGeneratorOptions.SwaggerDocs.OrderBy(x => x.Value.Title))
        {
            swaggerUiOptions.SwaggerEndpoint($"{name}/swagger.json", $"{apiInfo.Title}");
        }
@@ -70,11 +66,6 @@ public class SwaggerRouteTemplatePipelineFilter : UmbracoPipelineFilter
        swaggerUiOptions.OAuthUsePkce();
    }

-    private string GetUmbracoPath(IApplicationBuilder applicationBuilder)
-    {
-        GlobalSettings settings = applicationBuilder.ApplicationServices.GetRequiredService<IOptions<GlobalSettings>>().Value;
-        IHostingEnvironment hostingEnvironment = applicationBuilder.ApplicationServices.GetRequiredService<IHostingEnvironment>();
-
-        return settings.GetBackOfficePath(hostingEnvironment);
-    }
+    private string GetBackOfficePath(IApplicationBuilder applicationBuilder)
+        => applicationBuilder.ApplicationServices.GetRequiredService<IHostingEnvironment>().GetBackOfficePath();
 }
@@ -18,12 +18,7 @@ internal sealed class DeliveryApiOutputCachePolicy : IOutputCachePolicy
            .RequestServices
            .GetRequiredService<IRequestPreviewService>();

-        IApiAccessService apiAccessService = context
-            .HttpContext
-            .RequestServices
-            .GetRequiredService<IApiAccessService>();
-
-        context.EnableOutputCaching = requestPreviewService.IsPreview() is false && apiAccessService.HasPublicAccess();
+        context.EnableOutputCaching = requestPreviewService.IsPreview() is false;
        context.ResponseExpirationTimeSpan = _duration;

        return ValueTask.CompletedTask;
@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -8,7 +7,6 @@ using Umbraco.Cms.Core.Models.PublishedContent;

 namespace Umbraco.Cms.Api.Delivery.Controllers.Content;

-[ApiVersion("1.0")]
 [ApiVersion("2.0")]
 public class ByIdContentApiController : ContentApiItemControllerBase
 {
@@ -21,16 +19,6 @@ public class ByIdContentApiController : ContentApiItemControllerBase
        : base(apiPublishedContentCache, apiContentResponseBuilder)
        => _requestMemberAccessService = requestMemberAccessService;

-    [HttpGet("item/{id:guid}")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(IApiContentResponse), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> ById(Guid id)
-        => await HandleRequest(id);
-
    /// <summary>
    ///     Gets a content item by id.
    /// </summary>
@@ -8,7 +8,6 @@ using Umbraco.Extensions;

 namespace Umbraco.Cms.Api.Delivery.Controllers.Content;

-[ApiVersion("1.0")]
 [ApiVersion("2.0")]
 public class ByIdsContentApiController : ContentApiItemControllerBase
 {
@@ -21,15 +20,6 @@ public class ByIdsContentApiController : ContentApiItemControllerBase
        : base(apiPublishedContentCache, apiContentResponseBuilder)
        => _requestMemberAccessService = requestMemberAccessService;

-    [HttpGet("item")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(IEnumerable<IApiContentResponse>), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
-    [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> Item([FromQuery(Name = "id")] HashSet<Guid> ids)
-        => await HandleRequest(ids);
-
    /// <summary>
    ///     Gets content items by ids.
    /// </summary>
@@ -58,6 +48,6 @@ public class ByIdsContentApiController : ContentApiItemControllerBase
            .WhereNotNull()
            .ToArray();

-        return await Task.FromResult(Ok(apiContentItems));
+        return Ok(apiContentItems);
    }
 }
@@ -1,17 +1,13 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DeliveryApi;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Services;

 namespace Umbraco.Cms.Api.Delivery.Controllers.Content;

-[ApiVersion("1.0")]
 [ApiVersion("2.0")]
 public class ByRouteContentApiController : ContentApiItemControllerBase
 {
@@ -21,45 +17,6 @@ public class ByRouteContentApiController : ContentApiItemControllerBase
    private readonly IRequestMemberAccessService _requestMemberAccessService;
    private const string PreviewContentRequestPathPrefix = $"/{Constants.DeliveryApi.Routing.PreviewContentPathPrefix}";

-    [Obsolete($"Please use the constructor that accepts {nameof(IApiContentPathResolver)}. Will be removed in V15.")]
-    public ByRouteContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilder,
-        IRequestRoutingService requestRoutingService,
-        IRequestRedirectService requestRedirectService,
-        IRequestPreviewService requestPreviewService,
-        IRequestMemberAccessService requestMemberAccessService)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilder,
-            requestRedirectService,
-            requestPreviewService,
-            requestMemberAccessService,
-            StaticServiceProvider.Instance.GetRequiredService<IApiContentPathResolver>())
-    {
-    }
-
-    [Obsolete($"Please use the non-obsolete constructor. Will be removed in V15.")]
-    public ByRouteContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilder,
-        IPublicAccessService publicAccessService,
-        IRequestRoutingService requestRoutingService,
-        IRequestRedirectService requestRedirectService,
-        IRequestPreviewService requestPreviewService,
-        IRequestMemberAccessService requestMemberAccessService,
-        IApiContentPathResolver apiContentPathResolver)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilder,
-            requestRedirectService,
-            requestPreviewService,
-            requestMemberAccessService,
-            apiContentPathResolver)
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
    public ByRouteContentApiController(
        IApiPublishedContentCache apiPublishedContentCache,
        IApiContentResponseBuilder apiContentResponseBuilder,
@@ -75,16 +32,6 @@ public class ByRouteContentApiController : ContentApiItemControllerBase
        _apiContentPathResolver = apiContentPathResolver;
    }

-    [HttpGet("item/{*path}")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(IApiContentResponse), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> ByRoute(string path = "")
-        => await HandleRequest(path);
-
    /// <summary>
    ///     Gets a content item by route.
    /// </summary>
@@ -117,7 +64,7 @@ public class ByRouteContentApiController : ContentApiItemControllerBase
                return deniedAccessResult;
            }

-            return await Task.FromResult(Ok(ApiContentResponseBuilder.Build(contentItem)));
+            return Ok(ApiContentResponseBuilder.Build(contentItem));
        }

        IApiContentRoute? redirectRoute = _requestRedirectService.GetRedirectRoute(path);
@@ -12,7 +12,6 @@ using Umbraco.Extensions;

 namespace Umbraco.Cms.Api.Delivery.Controllers.Content;

-[ApiVersion("1.0")]
 [ApiVersion("2.0")]
 public class QueryContentApiController : ContentApiControllerBase
 {
@@ -30,20 +29,6 @@ public class QueryContentApiController : ContentApiControllerBase
        _requestMemberAccessService = requestMemberAccessService;
    }

-    [HttpGet]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(PagedViewModel<IApiContentResponse>), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> Query(
-        string? fetch,
-        [FromQuery] string[] filter,
-        [FromQuery] string[] sort,
-        int skip = 0,
-        int take = 10)
-        => await HandleRequest(fetch, filter, sort, skip, take);
-
    /// <summary>
    ///     Gets a paginated list of content item(s) from query.
    /// </summary>
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.Models.DeliveryApi;
@@ -8,7 +8,6 @@ using Umbraco.Cms.Infrastructure.DeliveryApi;

 namespace Umbraco.Cms.Api.Delivery.Controllers.Media;

-[ApiVersion("1.0")]
 [ApiVersion("2.0")]
 public class ByIdMediaApiController : MediaApiControllerBase
 {
@@ -19,14 +18,6 @@ public class ByIdMediaApiController : MediaApiControllerBase
    {
    }

-    [HttpGet("item/{id:guid}")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> ById(Guid id)
-        => await HandleRequest(id);
-
    /// <summary>
    ///     Gets a media item by id.
    /// </summary>
@@ -36,16 +27,16 @@ public class ByIdMediaApiController : MediaApiControllerBase
    [MapToApiVersion("2.0")]
    [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> ByIdV20(Guid id)
-        => await HandleRequest(id);
+    public Task<IActionResult> ByIdV20(Guid id)
+        => Task.FromResult(HandleRequest(id));

-    private async Task<IActionResult> HandleRequest(Guid id)
+    private IActionResult HandleRequest(Guid id)
    {
        IPublishedContent? media = PublishedMediaCache.GetById(id);

        if (media is null)
        {
-            return await Task.FromResult(NotFound());
+            return NotFound();
        }

        return Ok(BuildApiMediaWithCrops(media));
@@ -9,7 +9,6 @@ using Umbraco.Extensions;

 namespace Umbraco.Cms.Api.Delivery.Controllers.Media;

-[ApiVersion("1.0")]
 [ApiVersion("2.0")]
 public class ByIdsMediaApiController : MediaApiControllerBase
 {
@@ -18,13 +17,6 @@ public class ByIdsMediaApiController : MediaApiControllerBase
    {
    }

-    [HttpGet("item")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(IEnumerable<IApiMediaWithCropsResponse>), StatusCodes.Status200OK)]
-    [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> Item([FromQuery(Name = "id")] HashSet<Guid> ids)
-        => await HandleRequest(ids);
-
    /// <summary>
    ///     Gets media items by ids.
    /// </summary>
@@ -33,10 +25,10 @@ public class ByIdsMediaApiController : MediaApiControllerBase
    [HttpGet("items")]
    [MapToApiVersion("2.0")]
    [ProducesResponseType(typeof(IEnumerable<IApiMediaWithCropsResponse>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> ItemsV20([FromQuery(Name = "id")] HashSet<Guid> ids)
-        => await HandleRequest(ids);
+    public Task<IActionResult> ItemsV20([FromQuery(Name = "id")] HashSet<Guid> ids)
+        => Task.FromResult(HandleRequest(ids));

-    private async Task<IActionResult> HandleRequest(HashSet<Guid> ids)
+    private IActionResult HandleRequest(HashSet<Guid> ids)
    {
        IPublishedContent[] mediaItems = ids
            .Select(PublishedMediaCache.GetById)
@@ -47,6 +39,6 @@ public class ByIdsMediaApiController : MediaApiControllerBase
            .Select(BuildApiMediaWithCrops)
            .ToArray();

-        return await Task.FromResult(Ok(apiMediaItems));
+        return Ok(apiMediaItems);
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.DeliveryApi;
@@ -9,7 +9,6 @@ using Umbraco.Cms.Infrastructure.DeliveryApi;

 namespace Umbraco.Cms.Api.Delivery.Controllers.Media;

-[ApiVersion("1.0")]
 [ApiVersion("2.0")]
 public class ByPathMediaApiController : MediaApiControllerBase
 {
@@ -22,14 +21,6 @@ public class ByPathMediaApiController : MediaApiControllerBase
        : base(publishedMediaCache, apiMediaWithCropsResponseBuilder)
        => _apiMediaQueryService = apiMediaQueryService;

-    [HttpGet("item/{*path}")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> ByPath(string path)
-        => await HandleRequest(path);
-
    /// <summary>
    ///     Gets a media item by its path.
    /// </summary>
@@ -39,17 +30,17 @@ public class ByPathMediaApiController : MediaApiControllerBase
    [MapToApiVersion("2.0")]
    [ProducesResponseType(typeof(IApiMediaWithCropsResponse), StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> ByPathV20(string path)
-        => await HandleRequest(path);
+    public Task<IActionResult> ByPathV20(string path)
+        => Task.FromResult(HandleRequest(path));

-    private async Task<IActionResult> HandleRequest(string path)
+    private IActionResult HandleRequest(string path)
    {
        path = DecodePath(path);

        IPublishedContent? media = _apiMediaQueryService.GetByPath(path);
        if (media is null)
        {
-            return await Task.FromResult(NotFound());
+            return NotFound();
        }

        return Ok(BuildApiMediaWithCrops(media));
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
@@ -14,7 +14,6 @@ using Umbraco.Extensions;

 namespace Umbraco.Cms.Api.Delivery.Controllers.Media;

-[ApiVersion("1.0")]
 [ApiVersion("2.0")]
 public class QueryMediaApiController : MediaApiControllerBase
 {
@@ -27,19 +26,6 @@ public class QueryMediaApiController : MediaApiControllerBase
        : base(publishedMediaCache, apiMediaWithCropsResponseBuilder)
        => _apiMediaQueryService = apiMediaQueryService;

-    [HttpGet]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(PagedViewModel<IApiMediaWithCropsResponse>), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
-    [Obsolete("Please use version 2 of this API. Will be removed in V15.")]
-    public async Task<IActionResult> Query(
-        string? fetch,
-        [FromQuery] string[] filter,
-        [FromQuery] string[] sort,
-        int skip = 0,
-        int take = 10)
-        => await HandleRequest(fetch, filter, sort, skip, take);
-
    /// <summary>
    ///     Gets a paginated list of media item(s) from query.
    /// </summary>
@@ -53,15 +39,15 @@ public class QueryMediaApiController : MediaApiControllerBase
    [MapToApiVersion("2.0")]
    [ProducesResponseType(typeof(PagedViewModel<IApiMediaWithCropsResponse>), StatusCodes.Status200OK)]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
-    public async Task<IActionResult> QueryV20(
+    public Task<IActionResult> QueryV20(
        string? fetch,
        [FromQuery] string[] filter,
        [FromQuery] string[] sort,
        int skip = 0,
        int take = 10)
-        => await HandleRequest(fetch, filter, sort, skip, take);
+        => Task.FromResult(HandleRequest(fetch, filter, sort, skip, take));

-    private async Task<IActionResult> HandleRequest(string? fetch, string[] filter, string[] sort, int skip, int take)
+    private IActionResult HandleRequest(string? fetch, string[] filter, string[] sort, int skip, int take)
    {
        Attempt<PagedModel<Guid>, ApiMediaQueryOperationStatus> queryAttempt = _apiMediaQueryService.ExecuteQuery(fetch, filter, sort, skip, take);

@@ -79,6 +65,6 @@ public class QueryMediaApiController : MediaApiControllerBase
            Items = mediaItems.Select(BuildApiMediaWithCrops)
        };

-        return await Task.FromResult(Ok(model));
+        return Ok(model);
    }
 }
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using OpenIddict.Abstractions;
@@ -13,7 +12,6 @@ using OpenIddict.Server.AspNetCore;
 using Umbraco.Cms.Api.Delivery.Routing;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Web.Common.Security;
 using Umbraco.Extensions;
@@ -33,31 +31,6 @@ public class MemberController : DeliveryApiControllerBase
    private readonly DeliveryApiSettings _deliveryApiSettings;
    private readonly ILogger<MemberController> _logger;

-
-    [Obsolete("Please use the non-obsolete constructor. Will be removed in V16.")]
-    public MemberController(
-        IHttpContextAccessor httpContextAccessor,
-        IMemberSignInManager memberSignInManager,
-        IMemberManager memberManager,
-        IOptions<DeliveryApiSettings> deliveryApiSettings,
-        ILogger<MemberController> logger)
-        : this(memberSignInManager, memberManager, StaticServiceProvider.Instance.GetRequiredService<IMemberClientCredentialsManager>(), deliveryApiSettings, logger)
-    {
-    }
-
-    [Obsolete("Please use the non-obsolete constructor. Will be removed in V16.")]
-    public MemberController(
-        IHttpContextAccessor httpContextAccessor,
-        IMemberSignInManager memberSignInManager,
-        IMemberManager memberManager,
-        IMemberClientCredentialsManager memberClientCredentialsManager,
-        IOptions<DeliveryApiSettings> deliveryApiSettings,
-        ILogger<MemberController> logger)
-        : this(memberSignInManager, memberManager, memberClientCredentialsManager, deliveryApiSettings, logger)
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
    public MemberController(
        IMemberSignInManager memberSignInManager,
        IMemberManager memberManager,
@@ -62,7 +62,6 @@ public static class UmbracoBuilderExtensions
        builder.Services.AddTransient<IMemberApplicationManager, MemberApplicationManager>();
        builder.Services.AddTransient<IRequestMemberAccessService, RequestMemberAccessService>();
        builder.Services.AddTransient<ICurrentMemberClaimsProvider, CurrentMemberClaimsProvider>();
-        builder.Services.AddScoped<IMemberClientCredentialsManager, MemberClientCredentialsManager>();

        builder.Services.ConfigureOptions<ConfigureUmbracoDeliveryApiSwaggerGenOptions>();
        builder.AddUmbracoApiOpenApiUI();
@@ -91,7 +91,7 @@ internal sealed class InitializeMemberApplicationNotificationHandler : INotifica
        }
    }

-    private bool ValidateRedirectUrls(Uri[] redirectUrls)
+    private bool ValidateRedirectUrls(IEnumerable<Uri> redirectUrls)
    {
        if (redirectUrls.Any() is false)
        {
@@ -24,7 +24,7 @@ public class BackOfficeLoginModel
    public bool UserIsAlreadyLoggedIn { get; set; }
 }

-[ApiExplorerSettings(IgnoreApi=true)]
+[ApiExplorerSettings(IgnoreApi = true)]
 [Route(LoginPath)]
 public class BackOfficeLoginController : Controller
 {
@@ -51,7 +51,7 @@ public class BackOfficeLoginController : Controller

        if (string.IsNullOrEmpty(model.UmbracoUrl))
        {
-            model.UmbracoUrl = _hostingEnvironment.ToAbsolute(Constants.System.DefaultUmbracoPath);
+            model.UmbracoUrl = _hostingEnvironment.GetBackOfficePath();
        }

        if (string.IsNullOrEmpty(model.ReturnUrl))
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -28,7 +28,7 @@ public class AllCultureController : CultureControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<CultureReponseModel>), StatusCodes.Status200OK)]
-    public async Task<PagedViewModel<CultureReponseModel>> GetAll(CancellationToken cancellationToken, int skip = 0, int take = 100)
+    public Task<PagedViewModel<CultureReponseModel>> GetAll(CancellationToken cancellationToken, int skip = 0, int take = 100)
    {
        CultureInfo[] all = _cultureService.GetValidCultureInfos();

@@ -38,6 +38,6 @@ public class AllCultureController : CultureControllerBase
            Total = all.Length
        };

-        return await Task.FromResult(viewModel);
+        return Task.FromResult(viewModel);
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.Mapping;
@@ -38,6 +38,6 @@ public class AllDictionaryController : DictionaryControllerBase
            Total = items.Length,
            Items = _umbracoMapper.MapEnumerable<IDictionaryItem, DictionaryOverviewResponseModel>(items.Skip(skip).Take(take))
        };
-        return await Task.FromResult(model);
+        return model;
    }
 }
@@ -28,7 +28,7 @@ public class DictionaryTreeControllerBase : NamedEntityTreeControllerBase<NamedE
    protected IDictionaryItemService DictionaryItemService { get; }

    protected async Task<IEnumerable<NamedEntityTreeItemResponseModel>> MapTreeItemViewModels(IEnumerable<IDictionaryItem> dictionaryItems)
-        => await Task.WhenAll(dictionaryItems.Select(CreateEntityTreeItemViewModelAsync));
+        => await MapTreeItemViewModelsAsync(dictionaryItems).ToArrayAsync();

    protected override async Task<ActionResult<IEnumerable<NamedEntityTreeItemResponseModel>>> GetAncestors(Guid descendantKey, bool includeSelf = true)
    {
@@ -54,10 +54,19 @@ public class DictionaryTreeControllerBase : NamedEntityTreeControllerBase<NamedE
            }
        }

-        NamedEntityTreeItemResponseModel[] viewModels = await Task.WhenAll(ancestors.Select(CreateEntityTreeItemViewModelAsync));
+        NamedEntityTreeItemResponseModel[] viewModels = await MapTreeItemViewModelsAsync(ancestors).ToArrayAsync();
+
        return Ok(viewModels.Reverse());
    }

+    private async IAsyncEnumerable<NamedEntityTreeItemResponseModel> MapTreeItemViewModelsAsync(IEnumerable<IDictionaryItem> dictionaryItems)
+    {
+        foreach (IDictionaryItem dictionaryItem in dictionaryItems)
+        {
+            yield return await CreateEntityTreeItemViewModelAsync(dictionaryItem);
+        }
+    }
+
    private async Task<NamedEntityTreeItemResponseModel> CreateEntityTreeItemViewModelAsync(IDictionaryItem dictionaryItem)
    {
        var hasChildren = await DictionaryItemService.CountChildrenAsync(dictionaryItem.Key) > 0;
@@ -1,12 +1,10 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Api.Management.ViewModels.Document.Collection;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Security;
@@ -22,20 +20,6 @@ public class ByKeyDocumentCollectionController : DocumentCollectionControllerBas
    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
    private readonly IDocumentCollectionPresentationFactory _documentCollectionPresentationFactory;

-    [Obsolete("Please use the constructor taking all parameters.")]
-    public ByKeyDocumentCollectionController(
-        IContentListViewService contentListViewService,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        IUmbracoMapper mapper)
-        : this(
-              contentListViewService,
-              backOfficeSecurityAccessor,
-              mapper,
-              StaticServiceProvider.Instance.GetRequiredService<IDocumentCollectionPresentationFactory>())
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
    public ByKeyDocumentCollectionController(
        IContentListViewService contentListViewService,
        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -24,13 +24,13 @@ public class ItemDocumentItemController : DocumentItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<DocumentItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<DocumentItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<DocumentItemResponseModel>()));
        }

        IEnumerable<IDocumentEntitySlim> documents = _entityService
@@ -38,6 +38,6 @@ public class ItemDocumentItemController : DocumentItemControllerBase
            .OfType<IDocumentEntitySlim>();

        IEnumerable<DocumentItemResponseModel> documentItemResponseModels = documents.Select(_documentPresentationFactory.CreateItemResponseModel);
-        return await Task.FromResult(Ok(documentItemResponseModels));
+        return Task.FromResult<IActionResult>(Ok(documentItemResponseModels));
    }
 }
@@ -1,4 +1,3 @@
-using System.Text.Json.Serialization;
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -22,32 +21,10 @@ public class SearchDocumentItemController : DocumentItemControllerBase
        _documentPresentationFactory = documentPresentationFactory;
    }

-    [NonAction]
-    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
-    public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
-        => await SearchFromParent(cancellationToken, query, skip, take);
-
-    [NonAction]
-    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
-    public async Task<IActionResult> SearchFromParent(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null)
-        => await SearchWithTrashed(cancellationToken, query, null, skip, take, parentId);
-
-    [NonAction]
-    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
-    [ProducesResponseType(typeof(PagedModel<DocumentItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchFromParentWithAllowedTypes(
-        CancellationToken cancellationToken,
-        string query,
-        int skip = 0,
-        int take = 100,
-        Guid? parentId = null,
-        [FromQuery] IEnumerable<Guid>? allowedDocumentTypes = null) =>
-        await SearchWithTrashed(cancellationToken, query, null, skip, take, parentId, allowedDocumentTypes);
-
    [HttpGet("search")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedModel<DocumentItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchWithTrashed(
+    public Task<IActionResult> SearchWithTrashed(
        CancellationToken cancellationToken,
        string query,
        bool? trashed = null,
@@ -63,6 +40,6 @@ public class SearchDocumentItemController : DocumentItemControllerBase
            Total = searchResult.Total,
        };

-        return await Task.FromResult(Ok(result));
+        return Task.FromResult<IActionResult>(Ok(result));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.Document;
@@ -35,6 +35,6 @@ public class UpdateNotificationsController : DocumentControllerBase
        }

        _notificationService.SetNotifications(_backOfficeSecurityAccessor.BackOfficeSecurity?.CurrentUser, content, updateModel.SubscribedActionIds);
-        return await Task.FromResult(Ok());
+        return Ok();
    }
 }
@@ -14,7 +14,6 @@ using Umbraco.Cms.Core.Services.OperationStatus;

 namespace Umbraco.Cms.Api.Management.Controllers.Document;

-[ApiVersion("1.0")]
 [ApiVersion("1.1")]
 public class ValidateUpdateDocumentController : UpdateDocumentControllerBase
 {
@@ -48,31 +47,6 @@ public class ValidateUpdateDocumentController : UpdateDocumentControllerBase
        _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
    }

-    [HttpPut("{id:guid}/validate")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
-    [Obsolete("Please use version 1.1 of this API. Will be removed in V16.")]
-    public async Task<IActionResult> Validate(CancellationToken cancellationToken, Guid id, UpdateDocumentRequestModel requestModel)
-        => await HandleRequest(id, requestModel, async () =>
-        {
-            var validateUpdateDocumentRequestModel = new ValidateUpdateDocumentRequestModel
-            {
-                Values = requestModel.Values,
-                Variants = requestModel.Variants,
-                Template = requestModel.Template,
-                Cultures = null
-            };
-
-            ValidateContentUpdateModel model = _documentEditingPresentationFactory.MapValidateUpdateModel(validateUpdateDocumentRequestModel);
-            Attempt<ContentValidationResult, ContentEditingOperationStatus> result = await _contentEditingService.ValidateUpdateAsync(id, model);
-
-            return result.Success
-                ? Ok()
-                : DocumentEditingOperationStatusResult(result.Status, requestModel, result.Result);
-        });
-
    [HttpPut("{id:guid}/validate")]
    [MapToApiVersion("1.1")]
    [ProducesResponseType(StatusCodes.Status200OK)]
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -25,13 +25,13 @@ public class ItemDocumentBlueprintController : DocumentBlueprintItemControllerBa
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<DocumentBlueprintItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<DocumentBlueprintItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<DocumentBlueprintItemResponseModel>()));
        }

        IEnumerable<IDocumentEntitySlim> documents = _entityService
@@ -39,6 +39,6 @@ public class ItemDocumentBlueprintController : DocumentBlueprintItemControllerBa
            .Select(x => x as IDocumentEntitySlim)
            .WhereNotNull();
        IEnumerable<DocumentBlueprintItemResponseModel> responseModels = documents.Select(x => _documentPresentationFactory.CreateBlueprintItemResponseModel(x));
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,37 +0,0 @@
-using Asp.Versioning;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Api.Management.ViewModels.DocumentBlueprint;
-using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.Common.Authorization;
-
-namespace Umbraco.Cms.Api.Management.Controllers.DocumentBlueprint;
-
-[ApiVersion("1.0")]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessDocuments)]
-public class ScaffoldDocumentBlueprintController : DocumentBlueprintControllerBase
-{
-    private readonly IContentBlueprintEditingService _contentBlueprintEditingService;
-    private readonly IUmbracoMapper _umbracoMapper;
-
-    public ScaffoldDocumentBlueprintController(IContentBlueprintEditingService contentBlueprintEditingService, IUmbracoMapper umbracoMapper)
-    {
-        _contentBlueprintEditingService = contentBlueprintEditingService;
-        _umbracoMapper = umbracoMapper;
-    }
-
-    [HttpGet("{id:guid}/scaffold")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(typeof(DocumentBlueprintResponseModel), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> Scaffold(CancellationToken cancellationToken, Guid id)
-    {
-        IContent? blueprint = await _contentBlueprintEditingService.GetScaffoldedAsync(id);
-        return blueprint is not null
-            ? Ok(_umbracoMapper.Map<DocumentBlueprintResponseModel>(blueprint))
-            : DocumentBlueprintNotFound();
-    }
-}
@@ -23,15 +23,6 @@ public class AllowedChildrenDocumentTypeController : DocumentTypeControllerBase
        _umbracoMapper = umbracoMapper;
    }

-    [NonAction]
-    [Obsolete("Use the non obsoleted method instead. Scheduled to be removed in v16")]
-    public async Task<IActionResult> AllowedChildrenByKey(
-        CancellationToken cancellationToken,
-        Guid id,
-        int skip = 0,
-        int take = 100)
-        => await AllowedChildrenByKey(cancellationToken, id, null, skip, take);
-
    [HttpGet("{id:guid}/allowed-children")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<AllowedDocumentType>), StatusCodes.Status200OK)]
@@ -1,14 +1,9 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Api.Management.ViewModels.DocumentType;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Features;
 using Umbraco.Cms.Web.Common.Authorization;

 namespace Umbraco.Cms.Api.Management.Controllers.DocumentType;
@@ -19,30 +14,8 @@ public class ConfigurationDocumentTypeController : DocumentTypeControllerBase
 {
    private readonly IConfigurationPresentationFactory _configurationPresentationFactory;

-    [ActivatorUtilitiesConstructor]
    public ConfigurationDocumentTypeController(IConfigurationPresentationFactory configurationPresentationFactory)
-    {
-        _configurationPresentationFactory = configurationPresentationFactory;
-    }
-
-    [Obsolete("Use the constructor that only accepts IConfigurationPresentationFactory, scheduled for removal in V16")]
-    public ConfigurationDocumentTypeController(
-        UmbracoFeatures umbracoFeatures,
-        IOptionsSnapshot<DataTypesSettings> dataTypesSettings,
-        IOptionsSnapshot<SegmentSettings> segmentSettings,
-        IConfigurationPresentationFactory configurationPresentationFactory)
-    : this(configurationPresentationFactory)
-    {
-    }
-
-    [Obsolete("Use the constructor that only accepts IConfigurationPresentationFactory, scheduled for removal in V16")]
-    public ConfigurationDocumentTypeController(
-        UmbracoFeatures umbracoFeatures,
-        IOptionsSnapshot<DataTypesSettings> dataTypesSettings,
-        IOptionsSnapshot<SegmentSettings> segmentSettings)
-    : this(StaticServiceProvider.Instance.GetRequiredService<IConfigurationPresentationFactory>())
-    {
-    }
+        => _configurationPresentationFactory = configurationPresentationFactory;

    [HttpGet("configuration")]
    [MapToApiVersion("1.0")]
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.DocumentType.Item;
@@ -23,17 +23,17 @@ public class ItemDocumentTypeItemController : DocumentTypeItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<DocumentTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<DocumentTypeItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<DocumentTypeItemResponseModel>()));
        }

        IEnumerable<IContentType> contentTypes = _contentTypeService.GetMany(ids);
        List<DocumentTypeItemResponseModel> responseModels = _mapper.MapEnumerable<IContentType, DocumentTypeItemResponseModel>(contentTypes);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
@@ -2,10 +2,8 @@ using Asp.Versioning;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Actions;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Security.Authorization;
@@ -23,7 +21,6 @@ public class RollbackDocumentVersionController : DocumentVersionControllerBase
    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
    private readonly IAuthorizationService _authorizationService;

-    [ActivatorUtilitiesConstructor]
    public RollbackDocumentVersionController(
        IContentVersionService contentVersionService,
        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
@@ -34,18 +31,6 @@ public class RollbackDocumentVersionController : DocumentVersionControllerBase
        _authorizationService = authorizationService;
    }

-    // TODO (V16): Remove this constructor.
-    [Obsolete("Please use the constructor taking all parameters. This constructor will be removed in V16.")]
-    public RollbackDocumentVersionController(
-        IContentVersionService contentVersionService,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
-        : this(
-              contentVersionService,
-              backOfficeSecurityAccessor,
-              StaticServiceProvider.Instance.GetRequiredService<IAuthorizationService>())
-    {
-    }
-
    [MapToApiVersion("1.0")]
    [HttpPost("{id:guid}/rollback")]
    [ProducesResponseType(StatusCodes.Status200OK)]
@@ -21,10 +21,10 @@ public class GetQueryStepsController : DynamicRootControllerBase
    [HttpGet($"steps")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<string>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> GetQuerySteps(CancellationToken cancellationToken)
+    public Task<IActionResult> GetQuerySteps(CancellationToken cancellationToken)
    {
        IEnumerable<string> querySteps = _dynamicRootQueryStepCollection.Select(x => x.SupportedDirectionAlias);

-        return await Task.FromResult(Ok(querySteps));
+        return Task.FromResult<IActionResult>(Ok(querySteps));
    }
 }
@@ -63,6 +63,6 @@ public class ExecuteActionHealthCheckController : HealthCheckControllerBase

        HealthCheckStatus result = await healthCheck.ExecuteActionAsync(_umbracoMapper.Map<HealthCheckAction>(action)!);

-        return await Task.FromResult(Ok(_umbracoMapper.Map<HealthCheckResultResponseModel>(result)));
+        return Ok(_umbracoMapper.Map<HealthCheckResultResponseModel>(result));
    }
 }
@@ -31,7 +31,7 @@ public class AllHealthCheckGroupController : HealthCheckGroupControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<HealthCheckGroupResponseModel>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedViewModel<HealthCheckGroupResponseModel>>> All(
+    public Task<ActionResult<PagedViewModel<HealthCheckGroupResponseModel>>> All(
        CancellationToken cancellationToken,
        int skip = 0,
        int take = 100)
@@ -46,6 +46,6 @@ public class AllHealthCheckGroupController : HealthCheckGroupControllerBase
            Items = _umbracoMapper.MapEnumerable<IGrouping<string?, Core.HealthChecks.HealthCheck>, HealthCheckGroupResponseModel>(groups.Skip(skip).Take(take))
        };

-        return await Task.FromResult(Ok(viewModel));
+        return Task.FromResult<ActionResult<PagedViewModel<HealthCheckGroupResponseModel>>>(Ok(viewModel));
    }
 }
@@ -31,7 +31,7 @@ public class ByNameHealthCheckGroupController : HealthCheckGroupControllerBase
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
    [ProducesResponseType(typeof(HealthCheckGroupPresentationModel), StatusCodes.Status200OK)]
-    public async Task<IActionResult> ByName(
+    public Task<IActionResult> ByName(
        CancellationToken cancellationToken,
        string name)
    {
@@ -42,9 +42,9 @@ public class ByNameHealthCheckGroupController : HealthCheckGroupControllerBase

        if (group is null)
        {
-            return HealthCheckGroupNotFound();
+            return Task.FromResult(HealthCheckGroupNotFound());
        }

-        return await Task.FromResult(Ok(_umbracoMapper.Map<HealthCheckGroupPresentationModel>(group)));
+        return Task.FromResult<IActionResult>(Ok(_umbracoMapper.Map<HealthCheckGroupPresentationModel>(group)));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -82,6 +82,5 @@ public class GetHelpController : HelpControllerBase
        return Ok(PagedViewModel<HelpPageResponseModel>.Empty());
    }

-    private bool IsAllowedUrl(string? url) =>
-        _helpPageSettings.HelpPageUrlAllowList is null || _helpPageSettings.HelpPageUrlAllowList.Contains(url);
+    private bool IsAllowedUrl(string? url) => url is null || _helpPageSettings.HelpPageUrlAllowList.Contains(url);
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Examine;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -34,11 +34,11 @@ public class DetailsIndexerController : IndexerControllerBase
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
    [ProducesResponseType(typeof(IndexResponseModel), StatusCodes.Status200OK)]
-    public async Task<ActionResult<IndexResponseModel?>> Details(CancellationToken cancellationToken, string indexName)
+    public Task<ActionResult<IndexResponseModel?>> Details(CancellationToken cancellationToken, string indexName)
    {
        if (_examineManager.TryGetIndex(indexName, out IIndex? index))
        {
-            return await Task.FromResult(_indexPresentationFactory.Create(index!));
+            return Task.FromResult<ActionResult<IndexResponseModel?>>(_indexPresentationFactory.Create(index));
        }

        var invalidModelProblem = new ProblemDetails
@@ -49,7 +49,6 @@ public class DetailsIndexerController : IndexerControllerBase
            Type = "Error",
        };

-        return await Task.FromResult(NotFound(invalidModelProblem));
-
+        return Task.FromResult<ActionResult<IndexResponseModel?>>(NotFound(invalidModelProblem));
    }
 }
@@ -36,7 +36,7 @@ public class RebuildIndexerController : IndexerControllerBase
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status409Conflict)]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    public async Task<IActionResult> Rebuild(CancellationToken cancellationToken, string indexName)
+    public Task<IActionResult> Rebuild(CancellationToken cancellationToken, string indexName)
    {
        if (!_examineManager.TryGetIndex(indexName, out IIndex? index))
        {
@@ -48,7 +48,7 @@ public class RebuildIndexerController : IndexerControllerBase
                Type = "Error",
            };

-            return await Task.FromResult(NotFound(invalidModelProblem));
+            return Task.FromResult<IActionResult>(NotFound(invalidModelProblem));
        }

        if (!_indexingRebuilderService.CanRebuild(index.Name))
@@ -62,14 +62,14 @@ public class RebuildIndexerController : IndexerControllerBase
                Type = "Error",
            };

-            return await Task.FromResult(BadRequest(invalidModelProblem));
+            return Task.FromResult<IActionResult>(BadRequest(invalidModelProblem));
        }

        _logger.LogInformation("Rebuilding index '{IndexName}'", indexName);

        if (_indexingRebuilderService.TryRebuild(index, indexName))
        {
-            return await Task.FromResult(Ok());
+            return Task.FromResult<IActionResult>(Ok());
        }

        var problemDetails = new ProblemDetails
@@ -80,6 +80,6 @@ public class RebuildIndexerController : IndexerControllerBase
            Type = "Error",
        };

-        return await Task.FromResult(Conflict(problemDetails));
+        return Task.FromResult<IActionResult>(Conflict(problemDetails));
    }
 }
@@ -30,7 +30,7 @@ public class AllSinkLevelLogViewerController : LogViewerControllerBase
    [HttpGet("level")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<LoggerResponseModel>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedViewModel<LoggerResponseModel>>> AllLogLevels(
+    public Task<ActionResult<PagedViewModel<LoggerResponseModel>>> AllLogLevels(
        CancellationToken cancellationToken,
        int skip = 0,
        int take = 100)
@@ -45,6 +45,6 @@ public class AllSinkLevelLogViewerController : LogViewerControllerBase
            Items = _umbracoMapper.MapEnumerable<KeyValuePair<string, LogLevel>, LoggerResponseModel>(logLevels.Skip(skip).Take(take))
        };

-        return await Task.FromResult(Ok(viewModel));
+        return Task.FromResult<ActionResult<PagedViewModel<LoggerResponseModel>>>(Ok(viewModel));
    }
 }
@@ -1,12 +1,10 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Factories;
 using Umbraco.Cms.Api.Management.ViewModels.Media.Collection;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Security;
@@ -22,20 +20,6 @@ public class ByKeyMediaCollectionController : MediaCollectionControllerBase
    private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
    private readonly IMediaCollectionPresentationFactory _mediaCollectionPresentationFactory;

-    [Obsolete("Please use the constructor taking all parameters.")]
-    public ByKeyMediaCollectionController(
-        IMediaListViewService mediaListViewService,
-        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-        IUmbracoMapper mapper)
-        : this(
-              mediaListViewService,
-              backOfficeSecurityAccessor,
-              mapper,
-              StaticServiceProvider.Instance.GetRequiredService<IMediaCollectionPresentationFactory>())
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
    public ByKeyMediaCollectionController(
        IMediaListViewService mediaListViewService,
        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -7,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Media;
 namespace Umbraco.Cms.Api.Management.Controllers.Media;

 [ApiVersion("1.0")]
+[Obsolete("No longer used. Scheduled for removal in Umbraco 18.")]
 public class ConfigurationMediaController : MediaControllerBase
 {
    private readonly IConfigurationPresentationFactory _configurationPresentationFactory;
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -25,13 +25,13 @@ public class ItemMediaItemController : MediaItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<MediaItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<MediaItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<MediaItemResponseModel>()));
        }

        IEnumerable<IMediaEntitySlim> media = _entityService
@@ -39,6 +39,6 @@ public class ItemMediaItemController : MediaItemControllerBase
            .OfType<IMediaEntitySlim>();

        IEnumerable<MediaItemResponseModel> responseModels = media.Select(_mediaPresentationFactory.CreateItemResponseModel);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -23,24 +23,13 @@ public class SearchMediaItemController : MediaItemControllerBase

    [NonAction]
    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
-    public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
-        => await SearchFromParent(cancellationToken, query, skip, take, null);
-
-    [NonAction]
-    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
-    [ProducesResponseType(typeof(PagedModel<MediaItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchFromParent(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null)
-        => await SearchFromParentWithAllowedTypes(cancellationToken, query, skip, take, parentId);
-
-    [NonAction]
-    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
-    public async Task<IActionResult> SearchFromParentWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null, [FromQuery]IEnumerable<Guid>? allowedMediaTypes = null)
-        => await SearchFromParentWithAllowedTypes(cancellationToken, query, null, skip, take, parentId);
+    public Task<IActionResult> SearchFromParentWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, Guid? parentId = null, [FromQuery]IEnumerable<Guid>? allowedMediaTypes = null)
+        => SearchFromParentWithAllowedTypes(cancellationToken, query, null, skip, take, parentId);

    [HttpGet("search")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedModel<MediaItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchFromParentWithAllowedTypes(CancellationToken cancellationToken, string query, bool? trashed = null, int skip = 0, int take = 100, Guid? parentId = null, [FromQuery]IEnumerable<Guid>? allowedMediaTypes = null)
+    public Task<IActionResult> SearchFromParentWithAllowedTypes(CancellationToken cancellationToken, string query, bool? trashed = null, int skip = 0, int take = 100, Guid? parentId = null, [FromQuery]IEnumerable<Guid>? allowedMediaTypes = null)
    {
        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Media, query, parentId, allowedMediaTypes, trashed, skip, take);
        var result = new PagedModel<MediaItemResponseModel>
@@ -49,6 +38,6 @@ public class SearchMediaItemController : MediaItemControllerBase
            Total = searchResult.Total,
        };

-        return await Task.FromResult(Ok(result));
+        return Task.FromResult<IActionResult>(Ok(result));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -25,10 +25,10 @@ public class MediaUrlController : MediaControllerBase
    [MapToApiVersion("1.0")]
    [HttpGet("urls")]
    [ProducesResponseType(typeof(IEnumerable<MediaUrlInfoResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> GetUrls([FromQuery(Name = "id")] HashSet<Guid> ids)
+    public Task<IActionResult> GetUrls([FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        IEnumerable<IMedia> items = _mediaService.GetByIds(ids);

-        return await Task.FromResult(Ok(_mediaUrlFactory.CreateUrlSets(items)));
+        return Task.FromResult<IActionResult>(Ok(_mediaUrlFactory.CreateUrlSets(items)));
    }
 }
@@ -23,15 +23,6 @@ public class AllowedChildrenMediaTypeController : MediaTypeControllerBase
        _umbracoMapper = umbracoMapper;
    }

-    [NonAction]
-    [Obsolete("Use the non obsoleted method instead. Scheduled for removal in Umbraco 16.")]
-    public async Task<IActionResult> AllowedChildrenByKey(
-        CancellationToken cancellationToken,
-        Guid id,
-        int skip = 0,
-        int take = 100)
-        => await AllowedChildrenByKey(cancellationToken, id, null, skip, take);
-
    [HttpGet("{id:guid}/allowed-children")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<AllowedMediaType>), StatusCodes.Status200OK)]
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.MediaType;
@@ -34,6 +34,6 @@ public class ByKeyMediaTypeController : MediaTypeControllerBase
        }

        MediaTypeResponseModel model = _umbracoMapper.Map<MediaTypeResponseModel>(mediaType)!;
-        return await Task.FromResult(Ok(model));
+        return Ok(model);
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.MediaType.Item;
@@ -23,17 +23,17 @@ public class ItemMediaTypeItemController : MediaTypeItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<MediaTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<MediaTypeItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<MediaTypeItemResponseModel>()));
        }

        IEnumerable<IMediaType> mediaTypes = _mediaTypeService.GetMany(ids);
        List<MediaTypeItemResponseModel> responseModels = _mapper.MapEnumerable<IMediaType, MediaTypeItemResponseModel>(mediaTypes);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.MediaType.Item;
@@ -27,12 +27,12 @@ public class SearchMediaTypeItemController : MediaTypeItemControllerBase
    [HttpGet("search")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedModel<MediaTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
+    public Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
    {
        PagedModel<IEntitySlim> searchResult = _entitySearchService.Search(UmbracoObjectTypes.MediaType, query, skip, take);
        if (searchResult.Items.Any() is false)
        {
-            return await Task.FromResult(Ok(new PagedModel<MediaTypeItemResponseModel> { Total = searchResult.Total }));
+            return Task.FromResult<IActionResult>(Ok(new PagedModel<MediaTypeItemResponseModel> { Total = searchResult.Total }));
        }

        IEnumerable<IMediaType> mediaTypes = _mediaTypeService.GetMany(searchResult.Items.Select(item => item.Key).ToArray().EmptyNull());
@@ -42,6 +42,6 @@ public class SearchMediaTypeItemController : MediaTypeItemControllerBase
            Total = searchResult.Total
        };

-        return Ok(result);
+        return Task.FromResult<IActionResult>(Ok(result));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -25,13 +25,13 @@ public class ItemMemberItemController : MemberItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<MemberItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<MemberItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<MemberItemResponseModel>()));
        }

        IEnumerable<IMemberEntitySlim> members = _entityService
@@ -39,6 +39,6 @@ public class ItemMemberItemController : MemberItemControllerBase
            .OfType<IMemberEntitySlim>();

        IEnumerable<MemberItemResponseModel> responseModels = members.Select(_memberPresentationFactory.CreateItemResponseModel);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -21,15 +21,10 @@ public class SearchMemberItemController : MemberItemControllerBase
        _memberPresentationFactory = memberPresentationFactory;
    }

-    [NonAction]
-    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
-    public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
-        => await SearchWithAllowedTypes(cancellationToken, query, skip, take);
-
    [HttpGet("search")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedModel<MemberItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> SearchWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, [FromQuery]IEnumerable<Guid>? allowedMemberTypes = null)
+    public Task<IActionResult> SearchWithAllowedTypes(CancellationToken cancellationToken, string query, int skip = 0, int take = 100, [FromQuery]IEnumerable<Guid>? allowedMemberTypes = null)
    {
        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Member, query, null, allowedMemberTypes, skip, take);
        var result = new PagedModel<MemberItemResponseModel>
@@ -38,6 +33,6 @@ public class SearchMemberItemController : MemberItemControllerBase
            Total = searchResult.Total
        };

-        return await Task.FromResult(Ok(result));
+        return Task.FromResult<IActionResult>(Ok(result));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
@@ -36,6 +36,6 @@ public class AllMemberGroupController : MemberGroupControllerBase
            Items = _mapper.MapEnumerable<IMemberGroup, MemberGroupResponseModel>(memberGroups.Skip(skip).Take(take)),
        };

-        return await Task.FromResult(Ok(viewModel));
+        return Ok(viewModel);
    }
 }
@@ -25,17 +25,17 @@ public class ItemMemberGroupItemController : MemberGroupItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<MemberGroupItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<MemberGroupItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<MemberGroupItemResponseModel>()));
        }

        IEnumerable<IEntitySlim> memberGroups = _entityService.GetAll(UmbracoObjectTypes.MemberGroup, ids.ToArray());
        List<MemberGroupItemResponseModel> responseModel = _mapper.MapEnumerable<IEntitySlim, MemberGroupItemResponseModel>(memberGroups);
-        return Ok(responseModel);
+        return Task.FromResult<IActionResult>(Ok(responseModel));
    }
 }
@@ -23,17 +23,17 @@ public class ItemMemberTypeItemController : MemberTypeItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<MemberTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<MemberTypeItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<MemberTypeItemResponseModel>()));
        }

        IEnumerable<IMemberType> memberTypes = _memberTypeService.GetMany(ids);
        List<MemberTypeItemResponseModel> responseModels = _mapper.MapEnumerable<IMemberType, MemberTypeItemResponseModel>(memberTypes);
-        return Ok(responseModels);
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.MemberType.Item;
@@ -26,12 +26,12 @@ public class SearchMemberTypeItemController : MemberTypeItemControllerBase
    [HttpGet("search")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedModel<MemberTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
+    public Task<IActionResult> Search(CancellationToken cancellationToken, string query, int skip = 0, int take = 100)
    {
        PagedModel<IEntitySlim> searchResult = _entitySearchService.Search(UmbracoObjectTypes.MemberType, query, skip, take);
        if (searchResult.Items.Any() is false)
        {
-            return await Task.FromResult(Ok(new PagedModel<MemberTypeItemResponseModel> { Total = searchResult.Total }));
+            return Task.FromResult<IActionResult>(Ok(new PagedModel<MemberTypeItemResponseModel> { Total = searchResult.Total }));
        }

        IEnumerable<IMemberType> memberTypes = _memberTypeService.GetMany(searchResult.Items.Select(item => item.Key).ToArray());
@@ -41,6 +41,6 @@ public class SearchMemberTypeItemController : MemberTypeItemControllerBase
            Total = searchResult.Total
        };

-        return Ok(result);
+        return Task.FromResult<IActionResult>(Ok(result));
    }
 }
@@ -19,7 +19,6 @@ public class BuildModelsBuilderController : ModelsBuilderControllerBase
    private readonly ModelsGenerationError _mbErrors;
    private readonly IModelsGenerator _modelGenerator;

-    [ActivatorUtilitiesConstructor]
    public BuildModelsBuilderController(
        IOptionsMonitor<ModelsBuilderSettings> modelsBuilderSettings,
        ModelsGenerationError mbErrors,
@@ -32,31 +31,11 @@ public class BuildModelsBuilderController : ModelsBuilderControllerBase
        modelsBuilderSettings.OnChange(x => _modelsBuilderSettings = x);
    }

-    [Obsolete("Please use the constructor that accepts IModelsGenerator only. Will be removed in V16.")]
-    public BuildModelsBuilderController(
-        IOptionsMonitor<ModelsBuilderSettings> modelsBuilderSettings,
-        ModelsGenerationError mbErrors,
-        ModelsGenerator modelGenerator)
-        : this(modelsBuilderSettings, mbErrors, (IModelsGenerator)modelGenerator)
-    {
-    }
-
-    // this constructor is required for the DI, otherwise it'll throw an "Ambiguous Constructor" errors at boot time.
-    [Obsolete("Please use the constructor that accepts IModelsGenerator only. Will be removed in V16.")]
-    public BuildModelsBuilderController(
-        IOptionsMonitor<ModelsBuilderSettings> modelsBuilderSettings,
-        ModelsGenerationError mbErrors,
-        IModelsGenerator modelGenerator,
-        ModelsGenerator notUsed)
-        : this(modelsBuilderSettings, mbErrors, modelGenerator)
-    {
-    }
-
    [HttpPost("build")]
    [ProducesResponseType(StatusCodes.Status200OK)]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status428PreconditionRequired)]
    [MapToApiVersion("1.0")]
-    public async Task<IActionResult> BuildModels(CancellationToken cancellationToken)
+    public Task<IActionResult> BuildModels(CancellationToken cancellationToken)
    {
        try
        {
@@ -70,7 +49,7 @@ public class BuildModelsBuilderController : ModelsBuilderControllerBase
                    Type = "Error",
                };

-                return new ObjectResult(problemDetailsModel) { StatusCode = StatusCodes.Status428PreconditionRequired };
+                return Task.FromResult<IActionResult>(new ObjectResult(problemDetailsModel) { StatusCode = StatusCodes.Status428PreconditionRequired });
            }

            _modelGenerator.GenerateModels();
@@ -81,6 +60,6 @@ public class BuildModelsBuilderController : ModelsBuilderControllerBase
            _mbErrors.Report("Failed to build models.", e);
        }

-        return Ok();
+        return Task.FromResult<IActionResult>(Ok());
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Factories;
@@ -16,6 +16,6 @@ public class GetModelsBuilderController : ModelsBuilderControllerBase
    [HttpGet("dashboard")]
    [ProducesResponseType(typeof(ModelsBuilderResponseModel), StatusCodes.Status200OK)]
    [MapToApiVersion("1.0")]
-    public async Task<ActionResult<ModelsBuilderResponseModel>> GetDashboard(CancellationToken cancellationToken)
-        => await Task.FromResult(Ok(_modelsBuilderPresentationFactory.Create()));
+    public Task<ActionResult<ModelsBuilderResponseModel>> GetDashboard(CancellationToken cancellationToken)
+        => Task.FromResult<ActionResult<ModelsBuilderResponseModel>>(Ok(_modelsBuilderPresentationFactory.Create()));
 }
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -18,7 +18,7 @@ public class StatusModelsBuilderController : ModelsBuilderControllerBase
    [HttpGet("status")]
    [ProducesResponseType(typeof(OutOfDateStatusResponseModel), StatusCodes.Status200OK)]
    [MapToApiVersion("1.0")]
-    public async Task<ActionResult<OutOfDateStatusResponseModel>> GetModelsOutOfDateStatus(CancellationToken cancellationToken)
+    public Task<ActionResult<OutOfDateStatusResponseModel>> GetModelsOutOfDateStatus(CancellationToken cancellationToken)
    {
        OutOfDateStatusResponseModel status = _outOfDateModelsStatus.IsEnabled
            ? _outOfDateModelsStatus.IsOutOfDate
@@ -26,6 +26,6 @@ public class StatusModelsBuilderController : ModelsBuilderControllerBase
                : new OutOfDateStatusResponseModel { Status = OutOfDateType.Current }
            : new OutOfDateStatusResponseModel { Status = OutOfDateType.Unknown };

-        return await Task.FromResult(Ok(status));
+        return Task.FromResult<ActionResult<OutOfDateStatusResponseModel>>(Ok(status));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
@@ -17,11 +17,11 @@ public class AllowedObjectTypesController : ObjectTypesControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<ObjectTypeResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Allowed(CancellationToken cancellationToken, int skip = 0, int take = 100)
+    public Task<IActionResult> Allowed(CancellationToken cancellationToken, int skip = 0, int take = 100)
    {
        ObjectTypeResponseModel[] objectTypes = _objectTypePresentationFactory.Create().ToArray();

-        return await Task.FromResult(Ok(new PagedViewModel<ObjectTypeResponseModel>
+        return Task.FromResult<IActionResult>(Ok(new PagedViewModel<ObjectTypeResponseModel>
        {
            Total = objectTypes.Length,
            Items = objectTypes.Skip(skip).Take(take),
@@ -44,6 +44,6 @@ public class AllCreatedPackageController : CreatedPackageControllerBase
            Items = _umbracoMapper.MapEnumerable<PackageDefinition, PackageDefinitionResponseModel>(createdPackages.Items)
        };

-        return await Task.FromResult(Ok(viewModel));
+        return Ok(viewModel);
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Extensions;
@@ -18,17 +18,17 @@ public class ItemPartialViewItemController : PartialViewItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<PartialViewItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "path")] HashSet<string> paths)
    {
        if (paths.Count is 0)
        {
-            return Ok(Enumerable.Empty<PartialViewItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<PartialViewItemResponseModel>()));
        }

        paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet();
        IEnumerable<PartialViewItemResponseModel> responseModels = _fileItemPresentationFactory.CreatePartialViewItemResponseModels(paths);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,18 +0,0 @@
-using Asp.Versioning;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Umbraco.Cms.Api.Management.Controllers.PublishedCache;
-
-[Obsolete("This controller no longer serves a purpose")]
-[ApiVersion("1.0")]
-public class CollectPublishedCacheController : PublishedCacheControllerBase
-{
-    [HttpPost("collect")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(StatusCodes.Status501NotImplemented)]
-    public async Task<IActionResult> Collect(CancellationToken cancellationToken)
-    {
-        return StatusCode(StatusCodes.Status501NotImplemented);
-    }
-}
@@ -22,7 +22,7 @@ public class RebuildPublishedCacheController : PublishedCacheControllerBase
            var problemDetails = new ProblemDetails
            {
                Title = "Database cache cannot be rebuilt",
-                Detail = $"The database cache is in the process of rebuilding.",
+                Detail = "The database cache is in the process of rebuilding.",
                Status = StatusCodes.Status400BadRequest,
                Type = "Error",
            };
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.Cache;
@@ -16,10 +16,9 @@ public class ReloadPublishedCacheController : PublishedCacheControllerBase
    [HttpPost("reload")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    public async Task<IActionResult> Reload(CancellationToken cancellationToken)
+    public Task<IActionResult> Reload(CancellationToken cancellationToken)
    {
        _distributedCache.RefreshAllPublishedSnapshot();
-        return await Task.FromResult(Ok());
+        return Task.FromResult<IActionResult>(Ok());
    }
 }
-
@@ -1,18 +0,0 @@
-using Asp.Versioning;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Umbraco.Cms.Api.Management.Controllers.PublishedCache;
-
-[ApiVersion("1.0")]
-[Obsolete("This no longer relevant since snapshots are no longer used")]
-public class StatusPublishedCacheController : PublishedCacheControllerBase
-{
-    [HttpGet("status")]
-    [MapToApiVersion("1.0")]
-    [ProducesResponseType(StatusCodes.Status501NotImplemented)]
-    public async Task<ActionResult<string>> Status(CancellationToken cancellationToken)
-    {
-        return StatusCode(StatusCodes.Status501NotImplemented);
-    }
-}
@@ -23,17 +23,18 @@ public abstract class RecycleBinControllerBase<TItem> : ContentControllerBase

    protected abstract Guid RecycleBinRootKey { get; }

-    protected async Task<ActionResult<PagedViewModel<TItem>>> GetRoot(int skip, int take)
+    protected Task<ActionResult<PagedViewModel<TItem>>> GetRoot(int skip, int take)
    {
        IEntitySlim[] rootEntities = GetPagedRootEntities(skip, take, out var totalItems);

        TItem[] treeItemViewModels = MapRecycleBinViewModels(null, rootEntities);

        PagedViewModel<TItem> result = PagedViewModel(treeItemViewModels, totalItems);
-        return await Task.FromResult(Ok(result));
+
+        return Task.FromResult<ActionResult<PagedViewModel<TItem>>>(Ok(result));
    }

-    protected async Task<ActionResult<PagedViewModel<TItem>>> GetChildren(Guid parentKey, int skip, int take)
+    protected Task<ActionResult<PagedViewModel<TItem>>> GetChildren(Guid parentKey, int skip, int take)
    {
        IEntitySlim[] children = GetPagedChildEntities(parentKey, skip, take, out var totalItems);

@@ -41,7 +42,7 @@ public abstract class RecycleBinControllerBase<TItem> : ContentControllerBase

        PagedViewModel<TItem> result = PagedViewModel(treeItemViewModels, totalItems);

-        return await Task.FromResult(Ok(result));
+        return Task.FromResult<ActionResult<PagedViewModel<TItem>>>(Ok(result));
    }

    protected virtual TItem MapRecycleBinViewModel(Guid? parentKey, IEntitySlim entity)
@@ -18,9 +18,9 @@ public class DeleteByKeyRedirectUrlManagementController : RedirectUrlManagementC
    [MapToApiVersion("1.0")]
    [HttpDelete("{id:guid}")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    public async Task<IActionResult> DeleteByKey(CancellationToken cancellationToken, Guid id)
+    public Task<IActionResult> DeleteByKey(CancellationToken cancellationToken, Guid id)
    {
        _redirectUrlService.Delete(id);
-        return Ok();
+        return Task.FromResult<IActionResult>(Ok());
    }
 }
@@ -27,7 +27,7 @@ public class GetAllRedirectUrlManagementController : RedirectUrlManagementContro
    [HttpGet]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
    [ProducesResponseType(typeof(PagedViewModel<RedirectUrlResponseModel>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedViewModel<RedirectUrlResponseModel>>> GetAll(
+    public Task<ActionResult<PagedViewModel<RedirectUrlResponseModel>>> GetAll(
        CancellationToken cancellationToken,
        string? filter,
        int skip = 0,
@@ -39,6 +39,6 @@ public class GetAllRedirectUrlManagementController : RedirectUrlManagementContro
            : _redirectUrlService.SearchRedirectUrls(filter, skip, take, out total);

        IEnumerable<RedirectUrlResponseModel> redirectViewModels = _redirectUrlPresentationFactory.CreateMany(redirects);
-        return new PagedViewModel<RedirectUrlResponseModel> { Items = redirectViewModels, Total = total };
+        return Task.FromResult<ActionResult<PagedViewModel<RedirectUrlResponseModel>>>(new PagedViewModel<RedirectUrlResponseModel> { Items = redirectViewModels, Total = total });
    }
 }
@@ -43,16 +43,15 @@ public class ByRelationTypeKeyRelationController : RelationControllerBase

        if (relationsAttempt.Success is false)
        {
-            return await Task.FromResult(RelationOperationStatusResult(relationsAttempt.Status));
+            return RelationOperationStatusResult(relationsAttempt.Status);
        }

        IEnumerable<RelationResponseModel> mappedRelations = relationsAttempt.Result.Items.Select(_relationPresentationFactory.Create);

-        return await Task.FromResult(Ok(new PagedViewModel<RelationResponseModel>
+        return Ok(new PagedViewModel<RelationResponseModel>
        {
            Total = relationsAttempt.Result.Total,
            Items = mappedRelations,
-        }));
-
+        });
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.RelationType;
@@ -24,16 +24,16 @@ public class ByKeyRelationTypeController : RelationTypeControllerBase
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(RelationTypeResponseModel), StatusCodes.Status200OK)]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> ByKey(CancellationToken cancellationToken, Guid id)
+    public Task<IActionResult> ByKey(CancellationToken cancellationToken, Guid id)
    {
        IRelationType? relationType = _relationService.GetRelationTypeById(id);
        if (relationType is null)
        {
-            return RelationTypeNotFound();
+            return Task.FromResult(RelationTypeNotFound());
        }

        RelationTypeResponseModel mappedRelationType = _mapper.Map<RelationTypeResponseModel>(relationType)!;

-        return await Task.FromResult(Ok(mappedRelationType));
+        return Task.FromResult<IActionResult>(Ok(mappedRelationType));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.ViewModels.RelationType.Item;
@@ -23,13 +23,13 @@ public class ItemRelationTypeItemController : RelationTypeItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<RelationTypeItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "id")] HashSet<Guid> ids)
    {
        if (ids.Count is 0)
        {
-            return Ok(Enumerable.Empty<RelationTypeItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<RelationTypeItemResponseModel>()));
        }

        // relation service does not allow fetching a collection of relation types by their ids; instead it relies
@@ -40,6 +40,6 @@ public class ItemRelationTypeItemController : RelationTypeItemControllerBase

        List<RelationTypeItemResponseModel> responseModels = _mapper.MapEnumerable<IRelationType, RelationTypeItemResponseModel>(relationTypes);

-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Extensions;
@@ -18,17 +18,17 @@ public class ItemScriptItemController : ScriptItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<ScriptItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "path")] HashSet<string> paths)
    {
        if (paths.Count is 0)
        {
-            return Ok(Enumerable.Empty<ScriptItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<ScriptItemResponseModel>()));
        }

        paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet();
        IEnumerable<ScriptItemResponseModel> responseModels = _fileItemPresentationFactory.CreateScriptItemResponseModels(paths);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Examine;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -22,7 +22,7 @@ public class AllSearcherController : SearcherControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<SearcherResponse>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedViewModel<SearcherResponse>>> All(
+    public Task<ActionResult<PagedViewModel<SearcherResponse>>> All(
        CancellationToken cancellationToken,
        int skip = 0,
        int take = 100)
@@ -37,6 +37,6 @@ public class AllSearcherController : SearcherControllerBase
            Total = searchers.Count,
        };

-        return await Task.FromResult(Ok(viewModel));
+        return Task.FromResult<ActionResult<PagedViewModel<SearcherResponse>>>(Ok(viewModel));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Examine;
 using Examine.Lucene.Search;
 using Examine.Search;
@@ -23,7 +23,7 @@ public class QuerySearcherController : SearcherControllerBase
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<SearchResultResponseModel>), StatusCodes.Status200OK)]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<PagedViewModel<SearchResultResponseModel>>> Query(
+    public Task<ActionResult<PagedViewModel<SearchResultResponseModel>>> Query(
        CancellationToken cancellationToken,
        string searcherName,
        string? term,
@@ -34,7 +34,7 @@ public class QuerySearcherController : SearcherControllerBase

        if (term.IsNullOrWhiteSpace())
        {
-            return new PagedViewModel<SearchResultResponseModel>();
+            return Task.FromResult<ActionResult<PagedViewModel<SearchResultResponseModel>>>(new PagedViewModel<SearchResultResponseModel>());
        }

        if (!_examineManagerService.TryFindSearcher(searcherName, out ISearcher searcher))
@@ -47,7 +47,7 @@ public class QuerySearcherController : SearcherControllerBase
                Type = "Error",
            };

-            return NotFound(invalidModelProblem);
+            return Task.FromResult<ActionResult<PagedViewModel<SearchResultResponseModel>>>(NotFound(invalidModelProblem));
        }

        ISearchResults results;
@@ -71,10 +71,10 @@ public class QuerySearcherController : SearcherControllerBase
                Type = "Error",
            };

-            return BadRequest(invalidModelProblem);
+            return Task.FromResult<ActionResult<PagedViewModel<SearchResultResponseModel>>>(BadRequest(invalidModelProblem));
        }

-        return await Task.FromResult(new PagedViewModel<SearchResultResponseModel>
+        return Task.FromResult<ActionResult<PagedViewModel<SearchResultResponseModel>>>(new PagedViewModel<SearchResultResponseModel>
        {
            Total = results.TotalItemCount,
            Items = results.Select(x => new SearchResultResponseModel
@@ -492,7 +492,7 @@ public class BackOfficeController : SecurityControllerBase
        return new ChallengeResult(provider, properties);
    }

-    private async Task<IActionResult> SignInBackOfficeUser(ClaimsPrincipal backOfficePrincipal, OpenIddictRequest request)
+    private Task<IActionResult> SignInBackOfficeUser(ClaimsPrincipal backOfficePrincipal, OpenIddictRequest request)
    {
        Claim[] backOfficeClaims = backOfficePrincipal.Claims.ToArray();
        foreach (Claim backOfficeClaim in backOfficeClaims)
@@ -506,7 +506,7 @@ public class BackOfficeController : SecurityControllerBase
            backOfficePrincipal.SetScopes(OpenIddictConstants.Scopes.OfflineAccess);
        }

-        return new SignInResult(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, backOfficePrincipal);
+        return Task.FromResult<IActionResult>(new SignInResult(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme, backOfficePrincipal));
    }

    private async Task<IActionResult> SignInBackOfficeUser(BackOfficeIdentityUser backOfficeUser, OpenIddictRequest request)
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -20,13 +20,13 @@ public class ConfigurationSecurityController : SecurityControllerBase
    [HttpGet("configuration")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(SecurityConfigurationResponseModel), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Configuration(CancellationToken cancellationToken)
+    public Task<IActionResult> Configuration(CancellationToken cancellationToken)
    {
        var viewModel = new SecurityConfigurationResponseModel
        {
            PasswordConfiguration = _passwordConfigurationPresentationFactory.CreatePasswordConfigurationResponseModel(),
        };

-        return await Task.FromResult(Ok(viewModel));
+        return Task.FromResult<IActionResult>(Ok(viewModel));
    }
 }
@@ -1,13 +1,11 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Api.Management.Security;
 using Umbraco.Cms.Api.Management.ViewModels.Server;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.DependencyInjection;

 namespace Umbraco.Cms.Api.Management.Controllers.Server;

@@ -18,19 +16,6 @@ public class ConfigurationServerController : ServerControllerBase
    private readonly GlobalSettings _globalSettings;
    private readonly IBackOfficeExternalLoginProviders _externalLoginProviders;

-    [Obsolete("Use the constructor that accepts all arguments. Will be removed in V16.")]
-    public ConfigurationServerController(IOptions<SecuritySettings> securitySettings)
-        : this(securitySettings, StaticServiceProvider.Instance.GetRequiredService<IOptions<GlobalSettings>>())
-    {
-    }
-
-    [Obsolete("Use the constructor that accepts all arguments. Will be removed in V16.")]
-    public ConfigurationServerController(IOptions<SecuritySettings> securitySettings, IOptions<GlobalSettings> globalSettings)
-        : this(securitySettings, globalSettings, StaticServiceProvider.Instance.GetRequiredService<IBackOfficeExternalLoginProviders>())
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
    public ConfigurationServerController(IOptions<SecuritySettings> securitySettings, IOptions<GlobalSettings> globalSettings, IBackOfficeExternalLoginProviders externalLoginProviders)
    {
        _securitySettings = securitySettings.Value;
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -19,6 +19,6 @@ public class StatusServerController : ServerControllerBase
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)]
    [ProducesResponseType(typeof(ServerStatusResponseModel), StatusCodes.Status200OK)]
-    public async Task<ActionResult<ServerStatusResponseModel>> Get(CancellationToken cancellationToken) =>
-        await Task.FromResult(new ServerStatusResponseModel { ServerStatus = _runtimeState.Level });
+    public Task<ActionResult<ServerStatusResponseModel>> Get(CancellationToken cancellationToken)
+        => Task.FromResult<ActionResult<ServerStatusResponseModel>>(new ServerStatusResponseModel { ServerStatus = _runtimeState.Level });
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Extensions;
@@ -18,17 +18,17 @@ public class ItemStaticFileItemController : StaticFileItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<StaticFileItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "path")] HashSet<string> paths)
    {
        if (paths.Count is 0)
        {
-            return Ok(Enumerable.Empty<StaticFileItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<StaticFileItemResponseModel>()));
        }

        paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet();
        IEnumerable<StaticFileItemResponseModel> responseModels = _fileItemPresentationFactory.CreateStaticFileItemResponseModels(paths);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Management.Extensions;
@@ -18,17 +18,17 @@ public class ItemStylesheetItemController : StylesheetItemControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(IEnumerable<StylesheetItemResponseModel>), StatusCodes.Status200OK)]
-    public async Task<IActionResult> Item(
+    public Task<IActionResult> Item(
        CancellationToken cancellationToken,
        [FromQuery(Name = "path")] HashSet<string> paths)
    {
        if (paths.Count is 0)
        {
-            return Ok(Enumerable.Empty<StylesheetItemResponseModel>());
+            return Task.FromResult<IActionResult>(Ok(Enumerable.Empty<StylesheetItemResponseModel>()));
        }

        paths = paths.Select(path => path.VirtualPathToSystemPath()).ToHashSet();
        IEnumerable<StylesheetItemResponseModel> responseModels = _fileItemPresentationFactory.CreateStylesheetItemResponseModels(paths);
-        return await Task.FromResult(Ok(responseModels));
+        return Task.FromResult<IActionResult>(Ok(responseModels));
    }
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
@@ -42,6 +42,6 @@ public class ByQueryTagController : TagControllerBase
            Total = responseModels.Count,
        };

-        return await Task.FromResult(Ok(pagedViewModel));
+        return Ok(pagedViewModel);
    }
 }
@@ -13,13 +13,13 @@ public class AllTelemetryController : TelemetryControllerBase
    [HttpGet]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(PagedViewModel<TelemetryResponseModel>), StatusCodes.Status200OK)]
-    public async Task<PagedViewModel<TelemetryResponseModel>> GetAll(
+    public Task<PagedViewModel<TelemetryResponseModel>> GetAll(
        CancellationToken cancellationToken,
        int skip = 0,
        int take = 100)
    {
        TelemetryLevel[] levels = Enum.GetValues<TelemetryLevel>();
-        return await Task.FromResult(new PagedViewModel<TelemetryResponseModel>
+        return Task.FromResult(new PagedViewModel<TelemetryResponseModel>
        {
            Total = levels.Length,
            Items = levels.Skip(skip).Take(take).Select(level => new TelemetryResponseModel { TelemetryLevel = level }),
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.Services;
@@ -16,6 +16,6 @@ public class GetTelemetryController : TelemetryControllerBase
    [HttpGet("level")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(typeof(TelemetryResponseModel), StatusCodes.Status200OK)]
-    public async Task<TelemetryRepresentationBase> Get(CancellationToken cancellationToken)
-        => await Task.FromResult(new TelemetryResponseModel { TelemetryLevel = _metricsConsentService.GetConsentLevel() });
+    public Task<TelemetryRepresentationBase> Get(CancellationToken cancellationToken)
+        => Task.FromResult<TelemetryRepresentationBase>(new TelemetryResponseModel { TelemetryLevel = _metricsConsentService.GetConsentLevel() });
 }
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core.Services;
@@ -34,6 +34,6 @@ public class SetTelemetryController : TelemetryControllerBase
        }

        await _metricsConsentService.SetConsentLevelAsync(telemetryRepresentationBase.TelemetryLevel);
-        return await Task.FromResult(Ok());
+        return Ok();
    }
 }
--- a/Show More
+++ b/Show More