Merge branch 'v16/dev' into v16/bugfix/nested-document-types

# Conflicts: # src/Umbraco.Core/Services/PublicAccessService.cs # src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts
Merge remote-tracking branch 'origin/v15/dev' into v16/bugfix/nested-document-types
2025-04-14 20:22:37 +02:00 · 2025-04-14 20:20:27 +02:00 · 2025-04-14 16:01:44 +02:00 · 2025-03-26 15:04:30 +01:00 · 2025-03-26 14:46:38 +01:00 · 2025-03-26 09:00:31 +01:00
1950 changed files with 21397 additions and 43134 deletions
@@ -1,8 +1,8 @@
 # Contributing to Umbraco CMS

-👍🎉 First of all, thanks for taking the time to contribute! 🎉👍
+👍🎉 First off, thanks for taking the time to contribute! 🎉👍

-These contribution guidelines are mostly just that - guidelines, not rules. This is what we've found to work best over the years, but if you choose to ignore them, we still love you! 💖 Use your best judgment, and feel free to propose changes to this document in a pull request.
+These contribution guidelines are mostly just that - guidelines, not rules. This is what we've found to work best over the years, but if you choose to ignore them, we still love you! 💖 Use your best judgement, and feel free to propose changes to this document in a pull request.

 We have a guide on [what to consider before you start](contributing-before-you-start.md) and more detailed guides at the end of this article.

@@ -12,56 +12,56 @@ This guide describes each step to make your first contribution:

 1. **Fork**

-   Create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)
+    Create a fork of [`Umbraco-CMS` on GitHub](https://github.com/umbraco/Umbraco-CMS)

-   ![Fork the repository](img/forkrepositorynew.png)
+    ![Fork the repository](img/forkrepository.png)

 2. **Clone**

-   When GitHub has created your fork, you can clone it in your favorite Git tool or on the command line with `git clone https://github.com/[YourUsername]/Umbraco-CMS`.
+    When GitHub has created your fork, you can clone it in your favorite Git tool or on the command line with `git clone https://github.com/[YourUsername]/Umbraco-CMS`.

-   ![Clone the fork](img/cloneforknew.png)
+    ![Clone the fork](img/clonefork.png)

 3. **Switch to the correct branch**

-   Switch to the `main` branch
+    Switch to the `contrib` branch

 4. **Branch out**

-   Create a new branch based on `main` and name it after the issue you're fixing. For example: `v15/bugfix/18132-rte-tinymce-onchange-value-check`.
+    Create a new branch based on `contrib` and name it after the issue you're fixing, For example: `v15/bugfix/18132-rte-tinymce-onchange-value-check`.

-   Please follow this format for branches: `v{major}/{feature|bugfix|task}/{issue}-{description}`.
+    Please follow this format for branches: `v{major}/{feature|bugfix|task}/{issue}-{description}`. 

-   This is a development branch for the particular issue you're working on, in this case, a bug-fix for issue number `18132` that affects Umbraco v.15.
+    This is a development branch for the particular issue you're working on, in this case a bug-fix for issue number `18132` that affects Umbraco v.15.

-   Don't commit to `main`, create a new branch first.
+    Don't commit to `contrib`, create a new branch first.

 5. **Build or run a Development Server**

-   You can build or run a Development Server with any IDE that supports .NET or the command line.
+    You can build or run a Development Server with any IDE that supports DotNet or the command line.

-   Read [Build or run a Development Server](BUILD.md) for the right approach to your needs.
+    Read [Build or run a Development Server](BUILD.md) for the right approach to your needs.

 6. **Change**

-   Make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](contributing-first-issue.md#questions).
+    Make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](contributing-first-issue.md#questions).

 7. **Commit and push**

-   Done? Yay! 🎉
+    Done? Yay! 🎉

-   Remember to commit to your branch. When it's ready, push the changes to your fork on GitHub.
+    Remember to commit to your branch. When it's ready push the changes to your fork on GitHub.

 8. **Create pull request**

-   On GitHub, in your forked repository (`https://github.com/[YourUsername]/Umbraco-CMS`), you will see a banner saying that you pushed a new branch and a button to make a pull request. Tap the button and follow the instructions.
+    On GitHub, in your forked repository (`https://github.com/[YourUsername]/Umbraco-CMS`) you will see a banner saying that you pushed a new branch and a button to make a pull request. Tap the button and follow the instuctions.

-   Would you like to read further? [Creating a pull request and what happens next](contributing-creating-a-pr.md).
+    Want to read further? [Creating a pull request and what happens next](contributing-creating-a-pr.md).

 ## 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)


@@ -114,7 +114,7 @@ To declare the Published Cache Status Dashboard as a new manifest, we need to ad
 	},
 	conditions: [
 		{
-			alias: UMB_SECTION_ALIAS_CONDITION_ALIAS,
+			alias: 'Umb.Condition.SectionAlias',
 			match: 'Umb.Section.Settings',
 		},
 	],
@@ -1,223 +0,0 @@
-# **Contributing to Localization in the Backoffice**
-
-Do you want to help keep our translations accurate and up to standard? 🌍✨
-
-Your input makes a real difference! By reviewing, refining, or suggesting improvements, you ensure that our translations remain clear, consistent, and user-friendly for everyone.
-
-
-## **How Can I Contribute?**
-
-To contribute to localization in the Backoffice, follow this step-by-step guide:
-
-
-### **1. Change the Language in Backoffice**
-
-
-
-1. Open the Backoffice, click on your profile icon in the top-right corner, and select "Edit." 
-
-
-
-![Menubar profile image](/.github/img/contributing/ProfileImage.png "Menubar profile image")
-
-
-
-![Edit button inside profile](/.github/img/contributing/editBtn.png "Edit button inside profile")
-
-
-2. Under "UI Culture," select the language you want to review from the dropdown menu. 
-
-
-
-![Dropdown of languages in Umbraco](/.github/img/contributing/uiCulture.png "Dropdown of languages in Umbraco")
-
-
-
-### **2. Find a Translation Error**
-
-
-
-1. Navigate through the Backoffice and check if everything is translated correctly. 
-
-2. When you find a translation error, right-click on it and select "Inspect." 
-
-3. Look for the nearest element that starts with `umb-` and has a name indicating something specific to the given location. 
- 
-    **Example:**  
-
-    * The closest parent element should be specific, such as `umb-document-type-workspace-view-settings` instead of a generic element like `umb-property-layout.`
-
-
-### **3. Find the Code in VS Code**
-
-
-
-1. Open VS Code and search for the nearest `umb-` element you identified. 
-
-
-
-![Search for nearest umb element in code](/.github/img/contributing/searchInVsCode.png "Search for nearest umb element in code")
-
-2. Scroll down to find `render() {` and look for the element label that needs updating. 
-
-
-![Find render and label in code](/.github/img/contributing/renderCode.png "Find render and label in code")
-
-3. If the label is hardcoded, it must be updated. 
- 
-    **Example:**  
-    `label="Vary by culture"`
-
-
-### **4. Find the Correct Translation**
-
-
-
-1. Open the `en.ts` or `en-us.ts` file and search for relevant keywords. \
- \
-    **Example:** 
-
-    * If the text is "Vary by culture," search for `vary`, `culture`, or `Vary by culture`. 
-
-
-2. Once you find the translation, take the element name and search for it in the target language file (e.g., `da-dk.ts` for Danish). 
-
-
-![Search for translation in language files](/.github/img/contributing/searchingThroughLanguageFiles.png "Search for translation in language files")
-
-3. If a translation exists, insert it into the label element found earlier. 
-
-
-
-### **5. Insert the Translation**
-
-To display the new translation correctly, insert the following code inside the label element:
-
-`${this.localize.term('action_key')}`
-
-Replace `action_key` with the correct translation key.
-
-**Example:**
-
-`${this.localize.term('contentTypeEditor_allowVaryByCulture')}`
-
-![Localization code snippet](/.github/img/contributing/localizationCodeSnippetInCode.png "Localization code snippet")
-
-
-Save the changes and return to the Backoffice to see the update.
-
-
-![Changes in backoffice after changes in code](/.github/img/contributing/changedBackofficeAfterLocalization.png "Changes in backoffice after changes in code")
-
-
-
-### **6. Commit and Push**
-
-
-
-1. Commit your changes to a new temporary branch (avoid committing directly to `contrib`). 
-
-2. Push the changes to your fork on GitHub.
-
-
-### **7. Create a Pull Request**
-
-
-
-1. In your forked repository on GitHub (`https://github.com/[YourUsername]/Umbraco-CMS`), a banner will appear stating that you pushed a new branch. 
-
-2. Click the button to create a pull request and follow the instructions.
-
-
-## **I Can’t Find the Correct Translation**
-
-If you can’t find the translation you need, it may not exist yet. In this case, you can create a new action with related keys.
-
-
-### **1. Ensure It Doesn’t Already Exist**
-
-Search thoroughly in `en.ts` or `en-us.ts` for all relevant keywords.
-
-
-### **2. Create an Action**
-
-
-
-1. Choose a meaningful name for the action to avoid confusion. \
- \
- **Example:** Translation for the Data Type "Color Picker." 
-
-    * **Good name:** `colorPickerConfigurations`
-    * **Bad name:** `colorpicker`
-2. A specific action name prevents unnecessarily long key names. 
-
-3. Define the action: 
-
-
-
-### **3. Create Keys**
-
-
-
-1. Use clear and descriptive key names. \
- \
- **Example:**
-    * **Good name:** `colorsTitle`
-    * **Bad name:** `colors`
-2. Add the necessary keys inside the action with proper translations. 
-
-
-
-![Action and related Keys in language files](/.github/img/contributing/actionAndKeys.png "Action and related Keys in language files")
-
-
-
-## **I Can’t Find a <code>render()</code> Code in VS Code**
-
-In some cases, such as Data Types, the label might not be inside `render()`. Instead, it may be in a manifest file.
-
-
-### 1. Search for the Text
-
-Copy the text from the Backoffice and search for it in the code.
-
-
-### 2. Open the Manifest File
-
-Once you find the relevant manifest file, open it to confirm you’re in the right place.
-
-
-### 3. Change the Label
-
-In Markdown files, localization is slightly different. Instead of:
-`${this.localize.term('action_key')}`
-
-Use: `#action_key`
-
-**Example:**
-`#colorPickerConfigurations_showLabelTitle`
-
-### 4. Change the Description
-
-For descriptions in Markdown files, use:
-`{umbLocalize: action_key}`
-
-**Example:**
-`{umbLocalize: colorPickerConfigurations_showLabelDescription}`
-
-
-### 5. Save and Verify
-
-Once all changes are made, your manifest should look something like this:
-
-
-![Localization changes to manifest files](/.github/img/contributing/finishedManifestAfterLocalizatonChanges.png "Localization changes to manifest files")
-
-
-
---
-
-
-### Thank you 
-
-Following these steps ensures that the Umbraco Backoffice remains accessible and user-friendly in all supported languages. Thanks for contributing! 🎉
@@ -3,9 +3,8 @@ name: Backoffice Static Web Apps CI/CD
 on:
  push:
    branches:
-      - main
+      - contrib
      - v*/dev
-      - v*/main
    paths:
      - src/Umbraco.Web.UI.Client/package.json
      - src/Umbraco.Web.UI.Client/package-lock.json
@@ -14,9 +13,8 @@ on:
  pull_request:
    types: [opened, synchronize, reopened, closed]
    branches:
-      - main
+      - contrib
      - v*/dev
-      - v*/main

 jobs:
  build_and_deploy_job:
@@ -31,7 +29,7 @@ jobs:
        id: builddeploy
        uses: Azure/static-web-apps-deploy@v1
        with:
-          production_branch: main
+          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"
@@ -3,9 +3,8 @@ name: Storybook CI/CD
 on:
  push:
    branches:
-      - main
+      - contrib
      - v*/dev
-      - v*/main
    paths:
      - src/Umbraco.Web.UI.Client/package.json
      - src/Umbraco.Web.UI.Client/package-lock.json
@@ -14,9 +13,8 @@ on:
  pull_request:
    types: [opened, synchronize, reopened, closed]
    branches:
-      - main
+      - contrib
      - v*/dev
-      - v*/main

 env:
  NODE_OPTIONS: --max_old_space_size=16384
@@ -32,7 +30,7 @@ jobs:
        id: builddeploy
        uses: Azure/static-web-apps-deploy@v1
        with:
-          production_branch: main
+          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"
@@ -4,15 +4,15 @@ on:
  push:
    branches:
      - "*/dev"
-      - "*/main"
-      - "main"
+      - "*/contrib"
+      - "contrib"
      - "release/*"
  pull_request:
    # The branches below must be a subset of the branches above
    branches:
      - "*/dev"
-      - "*/main"
-      - "main"
+      - "*/contrib"
+      - "contrib"
      - "release/*"
  schedule:
    - cron: "33 2 * * 1"
@@ -3,18 +3,16 @@ name: Test Backoffice
 on:
  push:
    branches:
-      - main
+      - contrib
      - release/*
      - v*/dev
-      - v*/main
    paths:
      - src/Umbraco.Web.UI.Client/**
  pull_request:
    branches:
-      - main
+      - contrib
      - release/*
      - v*/dev
-      - v*/main
    paths:
      - src/Umbraco.Web.UI.Client/**

@@ -62,7 +62,6 @@
      "cwd": "${workspaceFolder}/src/Umbraco.Web.UI",
      "stopAtEntry": false,
      "requireExactSource": false,
-      "postDebugTask": "kill-umbraco-web-ui",
      // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
      "serverReadyAction": {
        "action": "openExternally",
@@ -97,7 +96,6 @@
      "stopAtEntry": false,
      "requireExactSource": false,
      "checkForDevCert": true,
-      "postDebugTask": "kill-umbraco-web-ui",
      "env": {
        "ASPNETCORE_ENVIRONMENT": "Development",
        "ASPNETCORE_URLS": "https://localhost:44339",
@@ -1,87 +1,76 @@
 {
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Build",
-      "detail": "Builds the client and SLN",
-      "promptOnClose": true,
-      "group": "build",
-      "dependsOn": ["Client Build", "Dotnet build"],
-      "problemMatcher": []
-    },
-    {
-      "label": "Client Install",
-      "detail": "install npm for Umbraco.Web.UI.Client",
-      "promptOnClose": true,
-      "type": "npm",
-      "script": "install",
-      "path": "src/Umbraco.Web.UI.Client/",
-      "problemMatcher": []
-    },
-    {
-      "label": "Client Build",
-      "detail": "runs npm run build for Umbraco.Web.UI.Client",
-      "promptOnClose": true,
-      "group": "build",
-      "type": "npm",
-      "script": "build:for:cms",
-      "path": "src/Umbraco.Web.UI.Client/",
-      "problemMatcher": []
-    },
-    {
-      "label": "Client Watch",
-      "detail": "runs npm run dev for Umbraco.Web.UI.Client",
-      "promptOnClose": true,
-      "group": "build",
-      "type": "npm",
-      "script": "dev",
-      "path": "src/Umbraco.Web.UI.Client/",
-      "problemMatcher": []
-    },
-    {
-      "label": "Dotnet build",
-      "detail": "Dotnet build of SLN",
-      "promptOnClose": true,
-      "group": "build",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "build",
-        "${workspaceFolder}/umbraco.sln",
-        "/property:GenerateFullPaths=true",
-        "/consoleloggerparameters:NoSummary"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "Dotnet watch",
-      "detail": "Dotnet run and watch of Web.UI",
-      "promptOnClose": true,
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "watch",
-        "run",
-        "--project",
-        "${workspaceFolder}/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj",
-        "/property:GenerateFullPaths=true",
-        "/consoleloggerparameters:NoSummary"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "kill-umbraco-web-ui",
-      "type": "shell",
-      "problemMatcher": [],
-      "osx": {
-        "command": "pkill -f Umbraco.Web.UI"
-      },
-      "linux": {
-        "command": "pkill -f Umbraco.Web.UI"
-      },
-      "windows": {
-        "command": "taskkill /IM Umbraco.Web.UI.exe /F"
-      }
-    }
-  ]
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build",
+            "detail": "Builds the client and SLN",
+            "promptOnClose": true,
+            "group": "build",
+            "dependsOn": [
+                "Client Build",
+                "Dotnet build"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Client Install",
+            "detail": "install npm for Umbraco.Web.UI.Client",
+            "promptOnClose": true,
+            "type": "npm",
+            "script": "install",
+            "path": "src/Umbraco.Web.UI.Client/",
+            "problemMatcher": []
+        },
+        {
+            "label": "Client Build",
+            "detail": "runs npm run build for Umbraco.Web.UI.Client",
+            "promptOnClose": true,
+            "group": "build",
+            "type": "npm",
+            "script": "build:for:cms",
+            "path": "src/Umbraco.Web.UI.Client/",
+            "problemMatcher": []
+        },
+        {
+            "label": "Client Watch",
+            "detail": "runs npm run dev for Umbraco.Web.UI.Client",
+            "promptOnClose": true,
+            "group": "build",
+            "type": "npm",
+            "script": "dev",
+            "path": "src/Umbraco.Web.UI.Client/",
+            "problemMatcher": []
+        },
+        {
+            "label": "Dotnet build",
+            "detail": "Dotnet build of SLN",
+            "promptOnClose": true,
+            "group": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/umbraco.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Dotnet watch",
+            "detail": "Dotnet run and watch of Web.UI",
+            "promptOnClose": true,
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
 }
@@ -40,8 +40,8 @@
  <!-- Package Validation -->
  <PropertyGroup>
    <GenerateCompatibilitySuppressionFile>false</GenerateCompatibilitySuppressionFile>
-    <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>16.0.0</PackageValidationBaselineVersion>
+    <EnablePackageValidation>false</EnablePackageValidation>
+    <PackageValidationBaselineVersion>15.0.0</PackageValidationBaselineVersion>
    <EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
    <EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
  </PropertyGroup>
@@ -5,102 +5,99 @@
  </PropertyGroup>
  <!-- Global packages (private, build-time packages for all projects) -->
  <ItemGroup>
-    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <GlobalPackageReference Include="Umbraco.Code" Version="2.3.0" />
+    <GlobalPackageReference Include="Umbraco.Code" Version="2.2.0" />
    <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
  </ItemGroup>
  <!-- Microsoft packages -->
  <ItemGroup>
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.4.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.0.0-preview.9.24556.5" />
  </ItemGroup>
  <!-- Umbraco packages -->
  <ItemGroup>
    <PackageVersion Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" />
+    <PackageVersion Include="Umbraco.CSharpTest.Net.Collections" Version="15.0.0" />
  </ItemGroup>
  <!-- Third-party packages -->
  <ItemGroup>
    <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="HtmlAgilityPack" Version="1.12.1" />
-    <PackageVersion Include="JsonPatch.Net" Version="3.3.0" />
+    <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" />
-    <PackageVersion Include="MailKit" Version="4.11.0" />
+    <PackageVersion Include="MailKit" Version="4.10.0" />
    <PackageVersion Include="Markdown" Version="2.2.1" />
-    <PackageVersion Include="MessagePack" Version="3.1.3" />
-    <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
+    <PackageVersion Include="MessagePack" Version="2.5.192" />
+    <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
    <PackageVersion Include="MiniProfiler.Shared" Version="4.5.4" />
    <PackageVersion Include="ncrontab" Version="3.3.3" />
    <PackageVersion Include="NPoco" Version="5.7.1" />
    <PackageVersion Include="NPoco.SqlServer" Version="5.7.1" />
-    <PackageVersion Include="OpenIddict.Abstractions" Version="6.2.1" />
-    <PackageVersion Include="OpenIddict.AspNetCore" Version="6.2.1" />
-    <PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="6.2.1" />
+    <PackageVersion Include="OpenIddict.Abstractions" Version="6.1.1" />
+    <PackageVersion Include="OpenIddict.AspNetCore" Version="6.1.1" />
+    <PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="6.1.1" />
    <PackageVersion Include="Serilog" Version="4.2.0" />
-    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="8.0.3" />
    <PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />
    <PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
    <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
-    <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
    <PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
    <PackageVersion Include="Serilog.Formatting.Compact.Reader" Version="4.0.0" />
-    <PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.4" />
    <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
    <PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.7" />
-    <PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.4" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
+    <PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.1.0" />
  </ItemGroup>
  <!-- Transitive pinned versions (only required because our direct dependencies have vulnerable versions of transitive dependencies) -->
  <ItemGroup>
    <!-- Microsoft.EntityFrameworkCore.SqlServer and NPoco.SqlServer brings in a vulnerable version of Azure.Identity -->
    <!-- Take top-level depedendency on Azure.Identity, because Microsoft.EntityFrameworkCore.SqlServer depends on a vulnerable version -->
-    <PackageVersion Include="Azure.Identity" Version="1.13.2" />
+    <PackageVersion Include="Azure.Identity" Version="1.13.1" />
    <!-- Microsoft.EntityFrameworkCore.SqlServer brings in a vulnerable version of System.Runtime.Caching -->
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.4" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.0" />
    <!-- Dazinator.Extensions.FileProviders brings in a vulnerable version of System.Net.Http -->
    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
    <!-- Examine brings in a vulnerable version of System.Security.Cryptography.Xml -->
-    <PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.4" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="9.0.0" />
    <!-- Dazinator.Extensions.FileProviders and MiniProfiler.AspNetCore.Mvc brings in a vulnerable version of System.Text.RegularExpressions -->
    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
    <!-- OpenIddict.AspNetCore, Npoco.SqlServer and Microsoft.EntityFrameworkCore.SqlServer brings in a vulnerable version of Microsoft.IdentityModel.JsonWebTokens -->
    <!-- Take top-level depedendency on Microsoft.IdentityModel.JsonWebTokens, because OpenIddict.AspNetCore, Npoco.SqlServer and Microsoft.EntityFrameworkCore.SqlServer depends on a vulnerable version -->
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.8.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.1" />
    <!-- Azure.Identity, Microsoft.EntityFrameworkCore.SqlServer and Dazinator.Extensions.FileProviders brings in a legacy version of System.Text.Encodings.Web -->
-    <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.4" />
+    <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.0" />
    <!-- NPoco.SqlServer brings in a vulnerable version of Microsoft.Data.SqlClient  -->
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
    <!-- 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,571 +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
-
---
-
-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
@@ -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'))
@@ -567,8 +540,7 @@ stages:
              "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
-              CONSOLE_ERRORS_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/console-errors.json" | Out-File .env
+              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

@@ -651,14 +623,6 @@ stages:
            displayName: Copy Playwright results
            condition: succeededOrFailed()

-          # Copy console error log
-          - pwsh: |
-              if (Test-Path tests/Umbraco.Tests.AcceptanceTest/console-errors.json) {
-                  Copy-Item tests/Umbraco.Tests.AcceptanceTest/console-errors.json $(Build.ArtifactStagingDirectory)
-              }
-            displayName: Copy console error log
-            condition: succeededOrFailed()
-
          # Publish test artifacts
          - task: PublishPipelineArtifact@1
            displayName: Publish test artifacts
@@ -734,8 +698,7 @@ stages:
              "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
-              CONSOLE_ERRORS_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/console-errors.json" | Out-File .env
+              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

@@ -836,14 +799,6 @@ stages:
            displayName: Copy Playwright results
            condition: succeededOrFailed()

-          # Copy console error log
-          - pwsh: |
-              if (Test-Path tests/Umbraco.Tests.AcceptanceTest/console-errors.json) {
-                  Copy-Item tests/Umbraco.Tests.AcceptanceTest/console-errors.json $(Build.ArtifactStagingDirectory)
-              }
-            displayName: Copy console error log
-            condition: succeededOrFailed()
-
          # Publish test artifacts
          - task: PublishPipelineArtifact@1
            displayName: Publish test artifacts
@@ -874,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
@@ -937,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
@@ -8,16 +8,9 @@ schedules:
    displayName: Daily midnight build
    branches:
      include:
+        - v14/dev
        - v15/dev
-        - release/16.0
-        - main
-
-parameters:
-    # Skipped due to DB locks
-  - name: sqliteAcceptanceTests
-    displayName: Run SQLite Acceptance Tests
-    type: boolean
-    default: false
+        - v16/dev

 variables:
  nodeVersion: 20
@@ -40,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:
@@ -62,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:
@@ -74,33 +75,6 @@ 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: E2E
    displayName: E2E Tests
    dependsOn: Build
@@ -129,7 +103,6 @@ stages:
      # E2E Tests
      - job:
        displayName: E2E Tests (SQLite)
-        condition: eq(${{parameters.sqliteAcceptanceTests}}, True)
        timeoutInMinutes: 180
        variables:
          # Connection string
@@ -139,22 +112,22 @@ stages:
          matrix:
            LinuxPart1Of3:
              vmImage: "ubuntu-latest"
-              testCommand: "npm run testSqlite -- --shard=1/3"
+              testCommand: "npm run test -- --shard=1/3"
            LinuxPart2Of3:
              vmImage: "ubuntu-latest"
-              testCommand: "npm run testSqlite -- --shard=2/3"
+              testCommand: "npm run test -- --shard=2/3"
            LinuxPart3Of3:
              vmImage: "ubuntu-latest"
-              testCommand: "npm run testSqlite -- --shard=3/3"
+              testCommand: "npm run test -- --shard=3/3"
            WindowsPart1Of3:
              vmImage: "windows-latest"
-              testCommand: "npm run testSqlite -- --shard=1/3"
+              testCommand: "npm run test -- --shard=1/3"
            WindowsPart2Of3:
              vmImage: "windows-latest"
-              testCommand: "npm run testSqlite -- --shard=2/3"
+              testCommand: "npm run test -- --shard=2/3"
            WindowsPart3Of3:
              vmImage: "windows-latest"
-              testCommand: "npm run testSqlite -- --shard=3/3"
+              testCommand: "npm run test -- --shard=3/3"
        pool:
          vmImage: $(vmImage)
        steps:
@@ -180,8 +153,7 @@ stages:
              "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
-              CONSOLE_ERRORS_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/console-errors.json" | Out-File .env
+              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

@@ -237,9 +209,9 @@ stages:
            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
+          # Install Playwright and dependencies
+          - pwsh: npx playwright install --with-deps
+            displayName: Install Playwright
            workingDirectory: tests/Umbraco.Tests.AcceptanceTest

          # Test
@@ -269,14 +241,6 @@ stages:
            displayName: Copy Playwright results
            condition: succeededOrFailed()

-          # Copy console error log
-          - pwsh: |
-              if (Test-Path tests/Umbraco.Tests.AcceptanceTest/console-errors.json) {
-                  Copy-Item tests/Umbraco.Tests.AcceptanceTest/console-errors.json $(Build.ArtifactStagingDirectory)
-              }
-            displayName: Copy console error log
-            condition: succeededOrFailed()
-
          # Publish
          - task: PublishPipelineArtifact@1
            displayName: Publish test artifacts
@@ -305,29 +269,29 @@ stages:
        strategy:
          matrix:
            LinuxPart1Of3:
-              testCommand: "npm run test -- --shard=1/3"
+              testCommand: "npm run testSqlite -- --shard=1/3"
              vmImage: "ubuntu-latest"
              SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
-              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
+              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
            LinuxPart2Of3:
-              testCommand: "npm run test -- --shard=2/3"
+              testCommand: "npm run testSqlite -- --shard=2/3"
              vmImage: "ubuntu-latest"
              SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
-              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
+              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
            LinuxPart3Of3:
-              testCommand: "npm run test -- --shard=3/3"
+              testCommand: "npm run testSqlite -- --shard=3/3"
              vmImage: "ubuntu-latest"
              SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
-              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);Encrypt=True;TrustServerCertificate=True"
+              CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
            WindowsPart1Of3:
              vmImage: "windows-latest"
-              testCommand: "npm run test -- --shard=1/3"
+              testCommand: "npm run testSqlite -- --shard=1/3"
            WindowsPart2Of3:
              vmImage: "windows-latest"
-              testCommand: "npm run test -- --shard=2/3"
+              testCommand: "npm run testSqlite -- --shard=2/3"
            WindowsPart3Of3:
              vmImage: "windows-latest"
-              testCommand: "npm run test -- --shard=3/3"
+              testCommand: "npm run testSqlite -- --shard=3/3"
        pool:
          vmImage: $(vmImage)
        steps:
@@ -352,8 +316,7 @@ stages:
              "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
-              CONSOLE_ERRORS_PATH=$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/console-errors.json" | Out-File .env
+              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

@@ -419,8 +382,8 @@ stages:
            workingDirectory: tests/Umbraco.Tests.AcceptanceTest

          # Install Playwright and dependencies
-          - pwsh: npx playwright install chromium
-            displayName: Install Playwright only with Chromium browser
+          - pwsh: npx playwright install --with-deps
+            displayName: Install Playwright
            workingDirectory: tests/Umbraco.Tests.AcceptanceTest

          # Test
@@ -459,14 +422,6 @@ stages:
            displayName: Copy Playwright results
            condition: succeededOrFailed()

-          # Copy console error log
-          - pwsh: |
-              if (Test-Path tests/Umbraco.Tests.AcceptanceTest/console-errors.json) {
-                  Copy-Item tests/Umbraco.Tests.AcceptanceTest/console-errors.json $(Build.ArtifactStagingDirectory)
-              }
-            displayName: Copy console error log
-            condition: succeededOrFailed()
-
          # Publish
          - task: PublishPipelineArtifact@1
            displayName: Publish test artifacts
@@ -10,7 +10,9 @@ schedules:
    include:
    - v10/dev
    - v13/dev
-    - main
+    - v14/dev
+    - v15/dev
+    - v16/dev

 steps:
 - checkout: none
@@ -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;
@@ -13,7 +13,7 @@ namespace Umbraco.Cms.Api.Delivery.Controllers.Content;
 [DeliveryApiAccess]
 [VersionedDeliveryApiRoute("content")]
 [ApiExplorerSettings(GroupName = "Content")]
-[ContextualizeFromAcceptHeaders]
+[LocalizeFromAcceptLanguageHeader]
 [ValidateStartItem]
 [AddVaryHeader]
 [OutputCache(PolicyName = Constants.DeliveryApi.OutputCache.ContentCachePolicy)]
@@ -49,7 +49,6 @@ public static class UmbracoBuilderExtensions
                : provider.GetRequiredService<RequestContextOutputExpansionStrategyV2>();
        });
        builder.Services.AddSingleton<IRequestCultureService, RequestCultureService>();
-        builder.Services.AddSingleton<IRequestSegmmentService, RequestSegmentService>();
        builder.Services.AddSingleton<IRequestRoutingService, RequestRoutingService>();
        builder.Services.AddSingleton<IRequestRedirectService, RequestRedirectService>();
        builder.Services.AddSingleton<IRequestPreviewService, RequestPreviewService>();
@@ -4,7 +4,7 @@ namespace Umbraco.Cms.Api.Delivery.Filters;

 public sealed class AddVaryHeaderAttribute : ActionFilterAttribute
 {
-    private const string Vary = "Accept-Language, Accept-Segment, Preview, Start-Item";
+    private const string Vary = "Accept-Language, Preview, Start-Item";

    public override void OnResultExecuting(ResultExecutingContext context)
        => context.HttpContext.Response.Headers.Vary = context.HttpContext.Response.Headers.Vary.Count > 0
@@ -1,53 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Umbraco.Cms.Core.DeliveryApi;
-using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Api.Delivery.Filters;
-
-internal sealed class ContextualizeFromAcceptHeadersAttribute : TypeFilterAttribute
-{
-    public ContextualizeFromAcceptHeadersAttribute()
-        : base(typeof(LocalizeFromAcceptLanguageHeaderAttributeFilter))
-    {
-    }
-
-    private class LocalizeFromAcceptLanguageHeaderAttributeFilter : IActionFilter
-    {
-        private readonly IRequestCultureService _requestCultureService;
-        private readonly IRequestSegmmentService _requestSegmentService;
-        private readonly IVariationContextAccessor _variationContextAccessor;
-
-        public LocalizeFromAcceptLanguageHeaderAttributeFilter(
-            IRequestCultureService requestCultureService,
-            IRequestSegmmentService requestSegmentService,
-            IVariationContextAccessor variationContextAccessor)
-        {
-            _requestCultureService = requestCultureService;
-            _requestSegmentService = requestSegmentService;
-            _variationContextAccessor = variationContextAccessor;
-        }
-
-        public void OnActionExecuting(ActionExecutingContext context)
-        {
-            var requestedCulture = _requestCultureService.GetRequestedCulture().NullOrWhiteSpaceAsNull();
-            var requestedSegment = _requestSegmentService.GetRequestedSegment().NullOrWhiteSpaceAsNull();
-            if (requestedCulture.IsNullOrWhiteSpace() && requestedSegment.IsNullOrWhiteSpace())
-            {
-                return;
-            }
-
-            // contextualize the request
-            // NOTE: request culture or segment can be null here (but not both), so make sure to retain any existing
-            //       context by means of fallback to current variation context (if available)
-            _variationContextAccessor.VariationContext = new VariationContext(
-                requestedCulture ?? _variationContextAccessor.VariationContext?.Culture,
-                requestedSegment ?? _variationContextAccessor.VariationContext?.Segment);
-        }
-
-        public void OnActionExecuted(ActionExecutedContext context)
-        {
-        }
-    }
-}
@@ -0,0 +1,37 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Api.Delivery.Filters;
+
+internal sealed class LocalizeFromAcceptLanguageHeaderAttribute : TypeFilterAttribute
+{
+    public LocalizeFromAcceptLanguageHeaderAttribute()
+        : base(typeof(LocalizeFromAcceptLanguageHeaderAttributeFilter))
+    {
+    }
+
+    private class LocalizeFromAcceptLanguageHeaderAttributeFilter : IActionFilter
+    {
+        private readonly IRequestCultureService _requestCultureService;
+
+        public LocalizeFromAcceptLanguageHeaderAttributeFilter(IRequestCultureService requestCultureService)
+            => _requestCultureService = requestCultureService;
+
+        public void OnActionExecuting(ActionExecutingContext context)
+        {
+            var requestedCulture = _requestCultureService.GetRequestedCulture();
+            if (requestedCulture.IsNullOrWhiteSpace())
+            {
+                return;
+            }
+
+            _requestCultureService.SetRequestCulture(requestedCulture);
+        }
+
+        public void OnActionExecuted(ActionExecutedContext context)
+        {
+        }
+    }
+}
@@ -33,20 +33,6 @@ internal sealed class SwaggerContentDocumentationFilter : SwaggerDocumentationFi
            }
        });

-        operation.Parameters.Add(new OpenApiParameter
-        {
-            Name = "Accept-Segment",
-            In = ParameterLocation.Header,
-            Required = false,
-            Description = "Defines the segment to return. Use this when querying segment variant content items.",
-            Schema = new OpenApiSchema { Type = "string" },
-            Examples = new Dictionary<string, OpenApiExample>
-            {
-                { "Default", new OpenApiExample { Value = new OpenApiString(string.Empty) } },
-                { "Segment One", new OpenApiExample { Value = new OpenApiString("segment-one") } }
-            }
-        });
-
        AddApiKey(operation);

        operation.Parameters.Add(new OpenApiParameter
@@ -2,15 +2,17 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Net.Http.Headers;
 using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.Models.PublishedContent;

 namespace Umbraco.Cms.Api.Delivery.Services;

 internal sealed partial class RequestCultureService : RequestHeaderHandler, IRequestCultureService
 {
-    public RequestCultureService(IHttpContextAccessor httpContextAccessor)
-        : base(httpContextAccessor)
-    {
-    }
+    private readonly IVariationContextAccessor _variationContextAccessor;
+
+    public RequestCultureService(IHttpContextAccessor httpContextAccessor, IVariationContextAccessor variationContextAccessor)
+        : base(httpContextAccessor) =>
+        _variationContextAccessor = variationContextAccessor;

    /// <inheritdoc />
    public string? GetRequestedCulture()
@@ -19,10 +21,15 @@ internal sealed partial class RequestCultureService : RequestHeaderHandler, IReq
        return ValidLanguageHeaderRegex().IsMatch(acceptLanguage) ? acceptLanguage : null;
    }

-    [Obsolete("Use IVariationContextAccessor to manipulate the variation context. Scheduled for removal in V17.")]
+    /// <inheritdoc />
    public void SetRequestCulture(string culture)
    {
-        // no-op
+        if (_variationContextAccessor.VariationContext?.Culture == culture)
+        {
+            return;
+        }
+
+        _variationContextAccessor.VariationContext = new VariationContext(culture);
    }

    // at the time of writing we're introducing this to get rid of accept-language header values like "en-GB,en-US;q=0.9,en;q=0.8",
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Umbraco.Cms.Core.DeliveryApi;
+using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
@@ -10,19 +11,14 @@ namespace Umbraco.Cms.Api.Delivery.Services;
 internal sealed class RequestRoutingService : RoutingServiceBase, IRequestRoutingService
 {
    private readonly IRequestCultureService _requestCultureService;
-    private readonly IVariationContextAccessor _variationContextAccessor;

    public RequestRoutingService(
        IDomainCache domainCache,
        IHttpContextAccessor httpContextAccessor,
        IRequestStartItemProviderAccessor requestStartItemProviderAccessor,
-        IRequestCultureService requestCultureService,
-        IVariationContextAccessor variationContextAccessor)
-        : base(domainCache, httpContextAccessor, requestStartItemProviderAccessor)
-    {
+        IRequestCultureService requestCultureService)
+        : base(domainCache, httpContextAccessor, requestStartItemProviderAccessor) =>
        _requestCultureService = requestCultureService;
-        _variationContextAccessor = variationContextAccessor;
-    }

    /// <inheritdoc />
    public string GetContentRoute(string requestedPath)
@@ -54,14 +50,9 @@ internal sealed class RequestRoutingService : RoutingServiceBase, IRequestRoutin
        }

        // the Accept-Language header takes precedence over configured domain culture
-        if (domainAndUri.Culture != null
-            && _requestCultureService.GetRequestedCulture().IsNullOrWhiteSpace()
-            && _variationContextAccessor.VariationContext?.Culture != domainAndUri.Culture)
+        if (domainAndUri.Culture != null && _requestCultureService.GetRequestedCulture().IsNullOrWhiteSpace())
        {
-            // update the variation context to match the requested domain culture while retaining any contextualized segment
-            _variationContextAccessor.VariationContext = new VariationContext(
-                culture: domainAndUri.Culture,
-                segment: _variationContextAccessor.VariationContext?.Segment);
+            _requestCultureService.SetRequestCulture(domainAndUri.Culture);
        }

        // when resolving content from a configured domain, the content cache expects the content route
@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Umbraco.Cms.Core.DeliveryApi;
-
-namespace Umbraco.Cms.Api.Delivery.Services;
-
-internal sealed class RequestSegmentService : RequestHeaderHandler, IRequestSegmmentService
-{
-    public RequestSegmentService(IHttpContextAccessor httpContextAccessor)
-        : base(httpContextAccessor)
-    {
-    }
-
-    /// <inheritdoc />
-    public string? GetRequestedSegment()
-        => GetHeaderValue("Accept-Segment");
-}
@@ -36,7 +36,7 @@ internal abstract class RoutingServiceBase
    }

    protected static string GetContentRoute(DomainAndUri domainAndUri, Uri contentRoute)
-        => $"{domainAndUri.ContentId}{DomainUtilities.PathRelativeToDomain(domainAndUri.Uri, contentRoute.LocalPath)}"; // Use LocalPath over AbsolutePath to keep the path decoded.
+        => $"{domainAndUri.ContentId}{DomainUtilities.PathRelativeToDomain(domainAndUri.Uri, contentRoute.AbsolutePath)}";

    protected DomainAndUri? GetDomainAndUriForRoute(Uri contentUrl)
    {
@@ -22,9 +22,6 @@
    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
      <_Parameter1>Umbraco.Tests.UnitTests</_Parameter1>
    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>Umbraco.Tests.Integration</_Parameter1>
-    </AssemblyAttribute>
    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
      <_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
    </AssemblyAttribute>
@@ -27,10 +27,6 @@ public abstract class ContentControllerBase : ManagementApiControllerBase
                .WithTitle("Content type culture variance mismatch")
                .WithDetail("The content type variance did not match that of the passed content data.")
                .Build()),
-            ContentEditingOperationStatus.ContentTypeSegmentVarianceMismatch => BadRequest(problemDetailsBuilder
-                .WithTitle("Content type segment variance mismatch")
-                .WithDetail("The content type variance did not match that of the passed content data.")
-                .Build()),
            ContentEditingOperationStatus.NotFound => NotFound(problemDetailsBuilder
                .WithTitle("The content could not be found")
                .Build()),
@@ -1,4 +1,4 @@
-using Asp.Versioning;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -42,16 +42,12 @@ public class CopyDocumentController : DocumentControllerBase
        Guid id,
        CopyDocumentRequestModel copyDocumentRequestModel)
    {
-        AuthorizationResult sourceAuthorizationResult = await _authorizationService.AuthorizeResourceAsync(
+        AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
            User,
-            ContentPermissionResource.WithKeys(ActionCopy.ActionLetter, [id]),
-            AuthorizationPolicies.ContentPermissionByResource);
-        AuthorizationResult destinationAuthorizationResult = await _authorizationService.AuthorizeResourceAsync(
-            User,
-            ContentPermissionResource.WithKeys(ActionNew.ActionLetter, [copyDocumentRequestModel.Target?.Id]),
+            ContentPermissionResource.WithKeys(ActionCopy.ActionLetter, new[] { copyDocumentRequestModel.Target?.Id, id }),
            AuthorizationPolicies.ContentPermissionByResource);

-        if (sourceAuthorizationResult.Succeeded is false || destinationAuthorizationResult.Succeeded is false)
+        if (!authorizationResult.Succeeded)
        {
            return Forbidden();
        }
@@ -24,23 +24,22 @@ public class SearchDocumentItemController : DocumentItemControllerBase
    [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,
-        string? culture = null,
        int skip = 0,
        int take = 100,
        Guid? parentId = null,
        [FromQuery] IEnumerable<Guid>? allowedDocumentTypes = null)
    {
-        PagedModel<IEntitySlim> searchResult = await _indexedEntitySearchService.SearchAsync(UmbracoObjectTypes.Document, query, parentId, allowedDocumentTypes, trashed, culture, skip, take);
+        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Document, query, parentId, allowedDocumentTypes, trashed, skip, take);
        var result = new PagedModel<DocumentItemResponseModel>
        {
            Items = searchResult.Items.OfType<IDocumentEntitySlim>().Select(_documentPresentationFactory.CreateItemResponseModel),
            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.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -39,16 +39,12 @@ public class MoveDocumentController : DocumentControllerBase
    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
    public async Task<IActionResult> Move(CancellationToken cancellationToken, Guid id, MoveDocumentRequestModel moveDocumentRequestModel)
    {
-        AuthorizationResult sourceAuthorizationResult = await _authorizationService.AuthorizeResourceAsync(
+        AuthorizationResult authorizationResult = await _authorizationService.AuthorizeResourceAsync(
            User,
-            ContentPermissionResource.WithKeys(ActionMove.ActionLetter, [id]),
-            AuthorizationPolicies.ContentPermissionByResource);
-        AuthorizationResult destinationAuthorizationResult = await _authorizationService.AuthorizeResourceAsync(
-            User,
-            ContentPermissionResource.WithKeys(ActionNew.ActionLetter, [moveDocumentRequestModel.Target?.Id]),
+            ContentPermissionResource.WithKeys(ActionMove.ActionLetter, new[] { moveDocumentRequestModel.Target?.Id, id }),
            AuthorizationPolicies.ContentPermissionByResource);

-        if (sourceAuthorizationResult.Succeeded is false || destinationAuthorizationResult.Succeeded is false)
+        if (!authorizationResult.Succeeded)
        {
            return Forbidden();
        }
@@ -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();
-    }
-}
@@ -13,7 +13,6 @@ using Umbraco.Cms.Core.Features;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Filters;

 namespace Umbraco.Cms.Api.Management.Controllers;

@@ -23,7 +22,6 @@ namespace Umbraco.Cms.Api.Management.Controllers;
 [MapToApi(ManagementApiConfiguration.ApiName)]
 [JsonOptionsName(Constants.JsonOptionsNames.BackOffice)]
 [AppendEventMessages]
-[DisableBrowserCache]
 [Produces("application/json")]
 public abstract class ManagementApiControllerBase : Controller, IUmbracoFeature
 {
@@ -21,26 +21,23 @@ public class SearchMediaItemController : MediaItemControllerBase
        _mediaPresentationFactory = mediaPresentationFactory;
    }

+    [NonAction]
+    [Obsolete("Scheduled to be removed in v16, use the non obsoleted method instead")]
+    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,
-        string? culture = 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 = await _indexedEntitySearchService.SearchAsync(UmbracoObjectTypes.Media, query, parentId, allowedMediaTypes, trashed, culture, skip, take);
+        PagedModel<IEntitySlim> searchResult = _indexedEntitySearchService.Search(UmbracoObjectTypes.Media, query, parentId, allowedMediaTypes, trashed, skip, take);
        var result = new PagedModel<MediaItemResponseModel>
        {
            Items = searchResult.Items.OfType<IMediaEntitySlim>().Select(_mediaPresentationFactory.CreateItemResponseModel),
            Total = searchResult.Total,
        };

-        return Ok(result);
+        return Task.FromResult<IActionResult>(Ok(result));
    }
 }
@@ -1,11 +1,8 @@
 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.Package;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Packaging;
 using Umbraco.Cms.Core.Services;
@@ -17,25 +14,12 @@ namespace Umbraco.Cms.Api.Management.Controllers.Package;
 public class AllMigrationStatusPackageController : PackageControllerBase
 {
    private readonly IPackagingService _packagingService;
-    private readonly IPackagePresentationFactory _packagePresentationFactory;
+    private readonly IUmbracoMapper _umbracoMapper;

-    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in V18.")]
    public AllMigrationStatusPackageController(IPackagingService packagingService, IUmbracoMapper umbracoMapper)
-        : this(packagingService, StaticServiceProvider.Instance.GetRequiredService<IPackagePresentationFactory>())
-    {
-    }
-
-    [Obsolete("Please use the non-obsolete constructor. Scheduled for removal in V18.")]
-    public AllMigrationStatusPackageController(IPackagingService packagingService, IUmbracoMapper umbracoMapper, IPackagePresentationFactory packagePresentationFactory)
-        : this(packagingService, packagePresentationFactory)
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
-    public AllMigrationStatusPackageController(IPackagingService packagingService, IPackagePresentationFactory packagePresentationFactory)
    {
        _packagingService = packagingService;
-        _packagePresentationFactory = packagePresentationFactory;
+        _umbracoMapper = umbracoMapper;
    }

    /// <summary>
@@ -54,7 +38,11 @@ public class AllMigrationStatusPackageController : PackageControllerBase
    {
        PagedModel<InstalledPackage> migrationPlans = await _packagingService.GetInstalledPackagesFromMigrationPlansAsync(skip, take);

-        PagedViewModel<PackageMigrationStatusResponseModel> viewModel = _packagePresentationFactory.CreatePackageMigrationStatusResponseModel(migrationPlans);
+        var viewModel = new PagedViewModel<PackageMigrationStatusResponseModel>
+        {
+            Total = migrationPlans.Total,
+            Items = _umbracoMapper.MapEnumerable<InstalledPackage, PackageMigrationStatusResponseModel>(migrationPlans.Items)
+        };

        return Ok(viewModel);
    }
@@ -15,7 +15,7 @@ public class RebuildPublishedCacheController : PublishedCacheControllerBase
    [HttpPost("rebuild")]
    [MapToApiVersion("1.0")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    public Task<IActionResult> Rebuild(CancellationToken cancellationToken)
+    public async Task<IActionResult> Rebuild(CancellationToken cancellationToken)
    {
        if (_databaseCacheRebuilder.IsRebuilding())
        {
@@ -27,10 +27,10 @@ public class RebuildPublishedCacheController : PublishedCacheControllerBase
                Type = "Error",
            };

-            return Task.FromResult<IActionResult>(Conflict(problemDetails));
+            return await Task.FromResult(Conflict(problemDetails));
        }

        _databaseCacheRebuilder.Rebuild(true);
-        return Task.FromResult<IActionResult>(Ok());
+        return await Task.FromResult(Ok());
    }
 }
@@ -14,6 +14,7 @@ using Umbraco.Cms.Web.Common.Authorization;
 namespace Umbraco.Cms.Api.Management.Controllers.Segment;

 [ApiVersion("1.0")]
+[Authorize(Policy = AuthorizationPolicies.SectionAccessSettings)]
 public class AllSegmentController : SegmentControllerBase
 {
    private readonly ISegmentService _segmentService;
@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.Factories;
@@ -6,13 +5,11 @@ using Umbraco.Cms.Api.Management.Routing;
 using Umbraco.Cms.Api.Management.ViewModels.Webhook.Logs;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Web.Common.Authorization;

 namespace Umbraco.Cms.Api.Management.Controllers.Webhook.Logs;

 [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Webhook}")]
 [ApiExplorerSettings(GroupName = "Webhook")]
-[Authorize(Policy = AuthorizationPolicies.TreeAccessWebhooks)]
 public class WebhookLogControllerBase : ManagementApiControllerBase
 {
    protected PagedViewModel<WebhookLogResponseModel> CreatePagedWebhookLogResponseModel(PagedModel<WebhookLog> logs, IWebhookPresentationFactory webhookPresentationFactory)
@@ -35,17 +35,11 @@ internal static class ApplicationBuilderExtensions
                        return;
                    }

-                    var statusCode = (exception as BadHttpRequestException)?.StatusCode;
-                    if (statusCode.HasValue)
-                    {
-                        context.Response.StatusCode = statusCode.Value;
-                    }
-
                    var response = new ProblemDetails
                    {
                        Title = exception.Message,
                        Detail = isDebug ? exception.StackTrace : null,
-                        Status = statusCode ?? StatusCodes.Status500InternalServerError,
+                        Status = StatusCodes.Status500InternalServerError,
                        Instance = isDebug ? exception.GetType().Name : null,
                        Type = "Error"
                    };
@@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Umbraco.Cms.Api.Management.NotificationHandlers;
 using Umbraco.Cms.Api.Management.Security;
 using Umbraco.Cms.Api.Management.Services;
 using Umbraco.Cms.Api.Management.Telemetry;
@@ -13,7 +12,6 @@ using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Net;
-using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Security;
@@ -76,9 +74,6 @@ public static partial class UmbracoBuilderExtensions

        services.AddScoped<IBackOfficeExternalLoginService, BackOfficeExternalLoginService>();

-        // Register a notification handler to interrogate the registered external login providers at startup.
-        builder.AddNotificationHandler<UmbracoApplicationStartingNotification, ExternalLoginProviderStartupHandler>();
-
        return builder;
    }

@@ -1,6 +1,5 @@
 using Umbraco.Cms.Api.Management.ViewModels;
 using Umbraco.Cms.Api.Management.ViewModels.AuditLog;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Services;
@@ -20,17 +19,19 @@ public class AuditLogPresentationFactory : IAuditLogPresentationFactory

    public IEnumerable<AuditLogResponseModel> CreateAuditLogViewModel(IEnumerable<IAuditItem> auditItems) => auditItems.Select(CreateAuditLogViewModel);

-    private AuditLogResponseModel CreateAuditLogViewModel(IAuditItem auditItem) =>
-        new()
+    private AuditLogResponseModel CreateAuditLogViewModel(IAuditItem auditItem)
+    {
+        Guid userKey = _userIdKeyResolver.GetAsync(auditItem.UserId).GetAwaiter().GetResult();
+        IUser user = _userService.GetAsync(userKey).GetAwaiter().GetResult()
+                     ?? throw new ArgumentException($"Could not find user with id {auditItem.UserId}");
+
+        return new AuditLogResponseModel
        {
            Comment = auditItem.Comment,
            LogType = auditItem.AuditType,
            Parameters = auditItem.Parameters,
            Timestamp = auditItem.CreateDate,
-            User = auditItem.UserId switch
-            {
-                Constants.Security.UnknownUserId => new ReferenceByIdModel(),
-                _ => new ReferenceByIdModel(_userIdKeyResolver.GetAsync(auditItem.UserId).GetAwaiter().GetResult()),
-            },
+            User = new ReferenceByIdModel(user.Key)
        };
+    }
 }
@@ -1,4 +1,6 @@
-using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Api.Management.Extensions;
+using Umbraco.Cms.Api.Management.ViewModels.Content;
+using Umbraco.Cms.Core.Models.ContentEditing;

 namespace Umbraco.Cms.Api.Management.Factories;

@@ -6,22 +8,32 @@ internal abstract class ContentEditingPresentationFactory<TValueModel, TVariantM
    where TValueModel : ValueModelBase
    where TVariantModel : VariantModelBase
 {
-    protected TContentEditingModel MapContentEditingModel<TContentEditingModel>(
-        ContentModelBase<TValueModel, TVariantModel> contentModel)
+    protected TContentEditingModel MapContentEditingModel<TContentEditingModel>(ContentModelBase<TValueModel, TVariantModel> contentModel)
        where TContentEditingModel : ContentEditingModelBase, new()
-        => new()
+    {
+        TVariantModel? invariantVariant = contentModel.Variants.FirstOrDefault(variant => variant.DoesNotVaryByCulture() && variant.DoesNotVaryBySegment());
+        TValueModel[] invariantProperties = contentModel.Values.Where(value => value.DoesNotVaryByCulture() && value.DoesNotVaryBySegment()).ToArray();
+
+        PropertyValueModel ToPropertyValueModel(TValueModel valueModel)
+            => new() { Alias = valueModel.Alias, Value = valueModel.Value };
+
+        return new TContentEditingModel
        {
-            Properties = contentModel
-                .Values
-                .Select(value => new PropertyValueModel
-                {
-                    Alias = value.Alias, Value = value.Value, Culture = value.Culture, Segment = value.Segment
-                }).ToArray(),
+            InvariantName = invariantVariant?.Name,
+            InvariantProperties = invariantProperties.Select(ToPropertyValueModel).ToArray(),
            Variants = contentModel
                .Variants
+                .Where(variant => variant.VariesByCulture() || variant.VariesBySegment())
                .Select(variant => new VariantModel
                {
-                    Culture = variant.Culture, Segment = variant.Segment, Name = variant.Name
+                    Culture = variant.Culture,
+                    Segment = variant.Segment,
+                    Name = variant.Name,
+                    Properties = contentModel
+                        .Values
+                        .Where(value => value.Culture == variant.Culture && value.Segment == variant.Segment)
+                        .Select(ToPropertyValueModel).ToArray()
                })
        };
+    }
 }
@@ -45,6 +45,8 @@ internal sealed class DocumentPresentationFactory : IDocumentPresentationFactory
    {
        DocumentResponseModel responseModel = _umbracoMapper.Map<DocumentResponseModel>(content)!;

+        responseModel.Urls = await _documentUrlFactory.CreateUrlsAsync(content);
+
        Guid? templateKey = content.TemplateId.HasValue
            ? _templateService.GetAsync(content.TemplateId.Value).Result?.Key
            : null;
@@ -60,6 +62,8 @@ internal sealed class DocumentPresentationFactory : IDocumentPresentationFactory
    {
        PublishedDocumentResponseModel responseModel = _umbracoMapper.Map<PublishedDocumentResponseModel>(content)!;

+        responseModel.Urls = await _documentUrlFactory.CreateUrlsAsync(content);
+
        Guid? templateKey = content.PublishTemplateId.HasValue
            ? _templateService.GetAsync(content.PublishTemplateId.Value).Result?.Key
            : null;
@@ -76,6 +80,8 @@ internal sealed class DocumentPresentationFactory : IDocumentPresentationFactory
        DocumentResponseModel responseModel = _umbracoMapper.Map<DocumentResponseModel>(content)!;
        _umbracoMapper.Map(schedule, responseModel);

+        responseModel.Urls = await _documentUrlFactory.CreateUrlsAsync(content);
+
        Guid? templateKey = content.TemplateId.HasValue
            ? _templateService.GetAsync(content.TemplateId.Value).Result?.Key
            : null;
@@ -1,6 +1,5 @@
 using Umbraco.Cms.Api.Management.ViewModels;
 using Umbraco.Cms.Api.Management.ViewModels.Document;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Extensions;
@@ -20,26 +19,17 @@ internal sealed class DocumentVersionPresentationFactory : IDocumentVersionPrese
        _userIdKeyResolver = userIdKeyResolver;
    }

-    public async Task<DocumentVersionItemResponseModel> CreateAsync(ContentVersionMeta contentVersion)
-    {
-        ReferenceByIdModel userReference = contentVersion.UserId switch
-        {
-            Constants.Security.UnknownUserId => new ReferenceByIdModel(),
-            _ => new ReferenceByIdModel(await _userIdKeyResolver.GetAsync(contentVersion.UserId)),
-        };
-
-        return new DocumentVersionItemResponseModel(
+    public async Task<DocumentVersionItemResponseModel> CreateAsync(ContentVersionMeta contentVersion) =>
+        new(
            contentVersion.VersionId.ToGuid(), // this is a magic guid since versions do not have keys in the DB
            new ReferenceByIdModel(_entityService.GetKey(contentVersion.ContentId, UmbracoObjectTypes.Document).Result),
-            new ReferenceByIdModel(
-                _entityService.GetKey(contentVersion.ContentTypeId, UmbracoObjectTypes.DocumentType)
-                    .Result),
-            userReference,
+            new ReferenceByIdModel(_entityService.GetKey(contentVersion.ContentTypeId, UmbracoObjectTypes.DocumentType)
+                .Result),
+            new ReferenceByIdModel(await _userIdKeyResolver.GetAsync(contentVersion.UserId)),
            new DateTimeOffset(contentVersion.VersionDate),
            contentVersion.CurrentPublishedVersion,
            contentVersion.CurrentDraftVersion,
            contentVersion.PreventCleanup);
-    }

    public async Task<IEnumerable<DocumentVersionItemResponseModel>> CreateMultipleAsync(IEnumerable<ContentVersionMeta> contentVersions)
        => await CreateMultipleImplAsync(contentVersions).ToArrayAsync();
@@ -1,6 +1,4 @@
-using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.ViewModels.Package;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Packaging;

 namespace Umbraco.Cms.Api.Management.Factories;
@@ -10,6 +8,4 @@ public interface IPackagePresentationFactory
    PackageDefinition CreatePackageDefinition(CreatePackageRequestModel createPackageRequestModel);

    PackageConfigurationResponseModel CreateConfigurationResponseModel();
-
-    PagedViewModel<PackageMigrationStatusResponseModel> CreatePackageMigrationStatusResponseModel(PagedModel<InstalledPackage> installedPackages) => new();
 }
@@ -1,4 +1,4 @@
-using Umbraco.Cms.Api.Management.ViewModels;
+using Umbraco.Cms.Api.Management.ViewModels;
 using Umbraco.Cms.Api.Management.ViewModels.Content;
 using Umbraco.Cms.Api.Management.ViewModels.Media;
 using Umbraco.Cms.Api.Management.ViewModels.Media.Item;
@@ -14,42 +14,56 @@ namespace Umbraco.Cms.Api.Management.Factories;
 internal sealed class MediaPresentationFactory : IMediaPresentationFactory
 {
    private readonly IUmbracoMapper _umbracoMapper;
+    private readonly IMediaUrlFactory _mediaUrlFactory;
    private readonly IIdKeyMap _idKeyMap;

    public MediaPresentationFactory(
        IUmbracoMapper umbracoMapper,
+        IMediaUrlFactory mediaUrlFactory,
        IIdKeyMap idKeyMap)
    {
        _umbracoMapper = umbracoMapper;
+        _mediaUrlFactory = mediaUrlFactory;
        _idKeyMap = idKeyMap;
    }

-    public MediaResponseModel CreateResponseModel(IMedia media) => _umbracoMapper.Map<MediaResponseModel>(media)!;
+    public MediaResponseModel CreateResponseModel(IMedia media)
+    {
+        MediaResponseModel responseModel = _umbracoMapper.Map<MediaResponseModel>(media)!;
+
+        responseModel.Urls = _mediaUrlFactory.CreateUrls(media);
+
+        return responseModel;
+    }

    public MediaItemResponseModel CreateItemResponseModel(IMediaEntitySlim entity)
    {
        Attempt<Guid> parentKeyAttempt = _idKeyMap.GetKeyForId(entity.ParentId, UmbracoObjectTypes.Media);

-        return new MediaItemResponseModel
+        var responseModel = new MediaItemResponseModel
        {
            Id = entity.Key,
            IsTrashed = entity.Trashed,
            Parent = parentKeyAttempt.Success ? new ReferenceByIdModel { Id = parentKeyAttempt.Result } : null,
            HasChildren = entity.HasChildren,
-            MediaType = _umbracoMapper.Map<MediaTypeReferenceResponseModel>(entity)!,
-            Variants = CreateVariantsItemResponseModels(entity)
        };
+
+        responseModel.MediaType = _umbracoMapper.Map<MediaTypeReferenceResponseModel>(entity)!;
+
+        responseModel.Variants = CreateVariantsItemResponseModels(entity);
+
+        return responseModel;
    }

    public IEnumerable<VariantItemResponseModel> CreateVariantsItemResponseModels(IMediaEntitySlim entity)
-        =>
-        [
+        => new[]
+        {
            new VariantItemResponseModel
            {
                Name = entity.Name ?? string.Empty,
                Culture = null
            }
-        ];
+        };

    public MediaTypeReferenceResponseModel CreateMediaTypeReferenceResponseModel(IMediaEntitySlim entity)
        => _umbracoMapper.Map<MediaTypeReferenceResponseModel>(entity)!;
@@ -45,7 +45,6 @@ internal sealed class MediaTypeEditingPresentationFactory : ContentTypeEditingPr

        updateModel.AllowedContentTypes = MapAllowedContentTypes(requestModel.AllowedMediaTypes);
        updateModel.Compositions = MapCompositions(CompositionTypesByKey(requestModel.Compositions));
-
        updateModel.ListView = requestModel.Collection?.Id;

        return updateModel;
@@ -1,12 +1,10 @@
 using System.Collections.Specialized;
 using System.Web;
 using Microsoft.Extensions.Options;
-using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Api.Management.ViewModels.Package;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Mapping;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Packaging;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Extensions;
@@ -44,25 +42,6 @@ internal class PackagePresentationFactory : IPackagePresentationFactory
            MarketplaceUrl = GetMarketplaceUrl(),
        };

-    public PagedViewModel<PackageMigrationStatusResponseModel> CreatePackageMigrationStatusResponseModel(PagedModel<InstalledPackage> installedPackages)
-    {
-        InstalledPackage[] installedPackagesAsArray = installedPackages.Items as InstalledPackage[] ?? installedPackages.Items.ToArray();
-
-        return new PagedViewModel<PackageMigrationStatusResponseModel>
-        {
-            Total = installedPackages.Total,
-            Items = installedPackagesAsArray
-                .GroupBy(package => package.PackageName)
-                .Select(packages => packages.OrderByDescending(package => package.HasPendingMigrations).First())
-                .Select(package => new PackageMigrationStatusResponseModel
-                {
-                    PackageName = package.PackageName ?? string.Empty,
-                    HasPendingMigrations = package.HasPendingMigrations,
-                })
-                .ToArray(),
-        };
-    }
-
    private string GetMarketplaceUrl()
    {
        var uriBuilder = new UriBuilder(Constants.Marketplace.Url);
@@ -56,8 +56,7 @@ public abstract class ContentMapDefinition<TContent, TValueViewModel, TVariantVi
    {
        IPropertyValue[] propertyValues = source.Properties.SelectMany(propertyCollection => propertyCollection.Values).ToArray();
        var cultures = source.AvailableCultures.DefaultIfEmpty(null).ToArray();
-        // the default segment (null) must always be included in the view model - both for variant and invariant documents
-        var segments = propertyValues.Select(property => property.Segment).Union([null]).Distinct().ToArray();
+        var segments = propertyValues.Select(property => property.Segment).Distinct().DefaultIfEmpty(null).ToArray();

        return cultures
            .SelectMany(culture => segments.Select(segment =>
@@ -84,8 +84,9 @@ public abstract class ContentTypeMapDefinition<TContentType, TPropertyTypeModel,
            : CompositionType.Composition;

    protected static IEnumerable<T> MapCompositions<T>(IEnumerable<IContentTypeComposition> directCompositions, int contentTypeParentId, Func<ReferenceByIdModel, CompositionType, T> contentTypeCompositionFactory)
-         => directCompositions
-         .Select(composition => contentTypeCompositionFactory(
-            new ReferenceByIdModel(composition.Key),
-             CalculateCompositionType(contentTypeParentId, composition))).ToArray();
+        => directCompositions
+            .Select(composition => contentTypeCompositionFactory(
+                new ReferenceByIdModel(composition.Key),
+                CalculateCompositionType(contentTypeParentId, composition)))
+            .ToArray();
 }
@@ -58,7 +58,6 @@ public class PackageViewModelMapDefinition : IMapDefinition
    }

    // Umbraco.Code.MapAll
-    [Obsolete("Please use the IPackagePresentationFactory instead. Scheduled for removal in V18.")]
    private static void Map(InstalledPackage source, PackageMigrationStatusResponseModel target, MapperContext context)
    {
        if (source.PackageName is not null)
@@ -65,21 +65,13 @@ public class BackOfficeAuthorizationInitializationMiddleware : IMiddleware
            return;
        }

-        var host = $"{context.Request.Scheme}://{context.Request.Host}";
-        if (_knownHosts.Contains(host))
+        if (_knownHosts.Add($"{context.Request.Scheme}://{context.Request.Host}") is false)
        {
            return;
        }

        await _firstBackOfficeRequestLocker.WaitAsync();

-        // NOTE: _knownHosts is not thread safe; check again after entering the semaphore
-        if (_knownHosts.Add(host) is false)
-        {
-            _firstBackOfficeRequestLocker.Release();
-            return;
-        }
-
        // ensure we explicitly add UmbracoApplicationUrl if configured (https://github.com/umbraco/Umbraco-CMS/issues/16179)
        if (_webRoutingSettings.UmbracoApplicationUrl.IsNullOrWhiteSpace() is false)
        {
@@ -1,44 +0,0 @@
-using Umbraco.Cms.Api.Management.Security;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Sync;
-
-namespace Umbraco.Cms.Api.Management.NotificationHandlers;
-
-/// <summary>
-/// Invalidates backoffice sessions and clears external logins for removed providers if the external login
-/// provider setup has changed.
-/// </summary>
-internal sealed class ExternalLoginProviderStartupHandler : INotificationHandler<UmbracoApplicationStartingNotification>
-{
-    private readonly IBackOfficeExternalLoginProviders _backOfficeExternalLoginProviders;
-    private readonly IRuntimeState _runtimeState;
-    private readonly IServerRoleAccessor _serverRoleAccessor;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ExternalLoginProviderStartupHandler"/> class.
-    /// </summary>
-    public ExternalLoginProviderStartupHandler(
-        IBackOfficeExternalLoginProviders backOfficeExternalLoginProviders,
-        IRuntimeState runtimeState,
-        IServerRoleAccessor serverRoleAccessor)
-    {
-        _backOfficeExternalLoginProviders = backOfficeExternalLoginProviders;
-        _runtimeState = runtimeState;
-        _serverRoleAccessor = serverRoleAccessor;
-    }
-
-    /// <inheritdoc/>
-    public void Handle(UmbracoApplicationStartingNotification notification)
-    {
-        if (_runtimeState.Level != RuntimeLevel.Run ||
-            _serverRoleAccessor.CurrentServerRole == ServerRole.Subscriber)
-        {
-            return;
-        }
-
-        _backOfficeExternalLoginProviders.InvalidateSessionsIfExternalLoginProvidersChanged();
-    }
-}
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.4",
+  "openapi": "3.0.1",
  "info": {
    "title": "Umbraco Management API",
    "description": "This shows all APIs available in this version of Umbraco - including all the legacy apis that are available for backward compatibility",
@@ -3485,66 +3485,6 @@
        ]
      }
    },
-    "/umbraco/management/api/v1/document-blueprint/{id}/scaffold": {
-      "get": {
-        "tags": [
-          "Document Blueprint"
-        ],
-        "operationId": "GetDocumentBlueprintByIdScaffold",
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "format": "uuid"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "oneOf": [
-                    {
-                      "$ref": "#/components/schemas/DocumentBlueprintResponseModel"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not Found",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "oneOf": [
-                    {
-                      "$ref": "#/components/schemas/ProblemDetails"
-                    }
-                  ]
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "The resource is protected and requires an authentication token"
-          },
-          "403": {
-            "description": "The authenticated user does not have access to this resource"
-          }
-        },
-        "security": [
-          {
-            "Backoffice User": [ ]
-          }
-        ]
-      }
-    },
    "/umbraco/management/api/v1/document-blueprint/folder": {
      "post": {
        "tags": [
@@ -10159,13 +10099,6 @@
              "type": "boolean"
            }
          },
-          {
-            "name": "culture",
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
          {
            "name": "skip",
            "in": "query",
@@ -15925,13 +15858,6 @@
              "type": "boolean"
            }
          },
-          {
-            "name": "culture",
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
          {
            "name": "skip",
            "in": "query",
@@ -37627,8 +37553,7 @@
                  "$ref": "#/components/schemas/DocumentUrlInfoModel"
                }
              ]
-            },
-            "deprecated": true
+            }
          },
          "template": {
            "oneOf": [
@@ -39801,8 +39726,7 @@
                  "$ref": "#/components/schemas/MediaUrlInfoModel"
                }
              ]
-            },
-            "deprecated": true
+            }
          },
          "isTrashed": {
            "type": "boolean"
@@ -43505,8 +43429,7 @@
                  "$ref": "#/components/schemas/DocumentUrlInfoModel"
                }
              ]
-            },
-            "deprecated": true
+            }
          },
          "template": {
            "oneOf": [
@@ -1,9 +1,5 @@
 using Microsoft.AspNetCore.Authentication;
 using Umbraco.Cms.Core.Security;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Services;

 namespace Umbraco.Cms.Api.Management.Security;

@@ -12,37 +8,13 @@ public class BackOfficeExternalLoginProviders : IBackOfficeExternalLoginProvider
 {
    private readonly IAuthenticationSchemeProvider _authenticationSchemeProvider;
    private readonly Dictionary<string, BackOfficeExternalLoginProvider> _externalLogins;
-    private readonly IKeyValueService _keyValueService;
-    private readonly IExternalLoginWithKeyService _externalLoginWithKeyService;
-    private readonly ILogger<BackOfficeExternalLoginProviders> _logger;

-    private const string ExternalLoginProvidersKey = "Umbraco.Cms.Web.BackOffice.Security.BackOfficeExternalLoginProviders";
-
-    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 17.")]
    public BackOfficeExternalLoginProviders(
        IEnumerable<BackOfficeExternalLoginProvider> externalLogins,
        IAuthenticationSchemeProvider authenticationSchemeProvider)
-        : this(
-              externalLogins,
-              authenticationSchemeProvider,
-              StaticServiceProvider.Instance.GetRequiredService<IKeyValueService>(),
-              StaticServiceProvider.Instance.GetRequiredService<IExternalLoginWithKeyService>(),
-              StaticServiceProvider.Instance.GetRequiredService<ILogger<BackOfficeExternalLoginProviders>>())
-    {
-    }
-
-    public BackOfficeExternalLoginProviders(
-        IEnumerable<BackOfficeExternalLoginProvider> externalLogins,
-        IAuthenticationSchemeProvider authenticationSchemeProvider,
-        IKeyValueService keyValueService,
-        IExternalLoginWithKeyService externalLoginWithKeyService,
-        ILogger<BackOfficeExternalLoginProviders> logger)
    {
        _externalLogins = externalLogins.ToDictionary(x => x.AuthenticationType);
        _authenticationSchemeProvider = authenticationSchemeProvider;
-        _keyValueService = keyValueService;
-        _externalLoginWithKeyService = externalLoginWithKeyService;
-        _logger = logger;
    }

    /// <inheritdoc />
@@ -88,25 +60,4 @@ public class BackOfficeExternalLoginProviders : IBackOfficeExternalLoginProvider
        var found = _externalLogins.Values.Where(x => x.Options.DenyLocalLogin).ToList();
        return found.Count > 0;
    }
-
-    /// <inheritdoc />
-    public void InvalidateSessionsIfExternalLoginProvidersChanged()
-    {
-        var previousExternalLoginProvidersValue = _keyValueService.GetValue(ExternalLoginProvidersKey);
-        var currentExternalLoginProvidersValue = string.Join("|", _externalLogins.Keys.OrderBy(key => key));
-
-        if ((previousExternalLoginProvidersValue ?? string.Empty) != currentExternalLoginProvidersValue)
-        {
-            _logger.LogWarning(
-                "The configured external login providers have changed. Existing backoffice sessions using the removed providers will be invalidated and external login data removed.");
-
-            _externalLoginWithKeyService.PurgeLoginsForRemovedProviders(_externalLogins.Keys);
-
-            _keyValueService.SetValue(ExternalLoginProvidersKey, currentExternalLoginProvidersValue);
-        }
-        else if (previousExternalLoginProvidersValue is null)
-        {
-            _keyValueService.SetValue(ExternalLoginProvidersKey, string.Empty);
-        }
-    }
 }
@@ -23,11 +23,4 @@ public interface IBackOfficeExternalLoginProviders
    /// </summary>
    /// <returns></returns>
    bool HasDenyLocalLogin();
-
-    /// <summary>
-    ///     Used during startup to see if the configured external login providers is different from the persisted information.
-    ///     If they are different, this will invalidate backoffice sessions and clear external logins for removed providers
-    ///     if the external login provider setup has changed.
-    /// </summary>
-    void InvalidateSessionsIfExternalLoginProvidersChanged() { }
 }
@@ -33,7 +33,6 @@ public class ConfigureUmbracoBackofficeJsonOptions : IConfigureNamedOptions<Json
        options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
        options.JsonSerializerOptions.Converters.Add(new JsonUdiConverter());
        options.JsonSerializerOptions.Converters.Add(new JsonUdiRangeConverter());
-        options.JsonSerializerOptions.Converters.Add(new ValidationProblemDetailsConverter());
        options.JsonSerializerOptions.Converters.Add(new JsonObjectConverter());

        options.JsonSerializerOptions.TypeInfoResolver = _umbracoJsonTypeInfoResolver;
@@ -1,70 +0,0 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Mvc;
-using Umbraco.Cms.Core;
-using Umbraco.Extensions;
-
-namespace Umbraco.Cms.Api.Management.Serialization;
-
-/// <summary>
-/// Custom JSON converter registered via <see cref="ConfigureUmbracoBackofficeJsonOptions"/> to serialize <see cref="ValidationProblemDetails" /> to JSON.
-/// </summary>
-public sealed class ValidationProblemDetailsConverter : JsonConverter<ValidationProblemDetails>
-{
-    /// <inheritdoc />
-    public override ValidationProblemDetails? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        => null;
-
-    /// <inheritdoc />
-    public override void Write(Utf8JsonWriter writer, ValidationProblemDetails value, JsonSerializerOptions options)
-    {
-        writer.WriteStartObject();
-        writer.WriteString("type", value.Type);
-        writer.WriteString("title", value.Title);
-
-        if (value.Status.HasValue)
-        {
-            writer.WriteNumber("status", value.Status.Value);
-        }
-
-        if (value.Detail is not null)
-        {
-            writer.WriteString("detail", value.Detail);
-        }
-
-        if (value.Instance is not null)
-        {
-            writer.WriteString("instance", value.Instance);
-        }
-
-        if (value.Errors.Any())
-        {
-            writer.WritePropertyName("errors");
-            writer.WriteStartArray();
-
-            foreach (KeyValuePair<string, string[]> error in value.Errors)
-            {
-                writer.WriteStartObject();
-                writer.WritePropertyName($"$.{string.Join(".", error.Key.Split(Constants.CharArrays.Period).Select(s => s.ToFirstLowerInvariant()))}");
-                writer.WriteStartArray();
-
-                foreach (var errorDetails in error.Value)
-                {
-                    writer.WriteStringValue(errorDetails);
-                }
-
-                writer.WriteEndArray();
-                writer.WriteEndObject();
-            }
-
-            writer.WriteEndArray();
-        }
-
-        if (value.Extensions.TryGetValue("traceId", out var traceId) && traceId is string traceIdValue)
-        {
-            writer.WriteString("traceId", traceIdValue);
-        }
-
-        writer.WriteEndObject();
-    }
-}
@@ -1,8 +1,7 @@
-namespace Umbraco.Cms.Api.Management.ViewModels.Document;
+namespace Umbraco.Cms.Api.Management.ViewModels.Document;

 public class DocumentResponseModel : DocumentResponseModelBase<DocumentValueResponseModel, DocumentVariantResponseModel>
 {
-    [Obsolete("This property is no longer populated. Please use /document/{id}/urls instead to retrieve the URLs for a document. Scheduled for removal in Umbraco 17.")]
    public IEnumerable<DocumentUrlInfo> Urls { get; set; } = Enumerable.Empty<DocumentUrlInfo>();

    public ReferenceByIdModel? Template { get; set; }
@@ -1,11 +1,10 @@
-using Umbraco.Cms.Api.Management.ViewModels.Content;
+using Umbraco.Cms.Api.Management.ViewModels.Content;
 using Umbraco.Cms.Api.Management.ViewModels.MediaType;

 namespace Umbraco.Cms.Api.Management.ViewModels.Media;

 public class MediaResponseModel : ContentResponseModelBase<MediaValueResponseModel, MediaVariantResponseModel>
 {
-    [Obsolete("This property is no longer populated. Please use /media/{id}/urls instead to retrieve the URLs for a document. Scheduled for removal in Umbraco 17.")]
    public IEnumerable<MediaUrlInfo> Urls { get; set; } = Enumerable.Empty<MediaUrlInfo>();

    public bool IsTrashed { get; set; }
@@ -26,36 +26,23 @@
    <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
  </ItemGroup>

-  <!-- General ignored files -->
-  <ItemGroup>
-    <Content Remove="wwwroot\umbraco\assets\README.md" />
-  </ItemGroup>
-
-
-
-  <!-- BEGIN: Restore and build backoffice project -->
+  <!-- Restore and build backoffice project -->
  <PropertyGroup>
    <BackofficeProjectDirectory Condition="'$(BackofficeProjectDirectory)' == ''">..\Umbraco.Web.UI.Client\</BackofficeProjectDirectory>
-    <BackofficeAssetsPath>$(ProjectDir)wwwroot\umbraco\backoffice</BackofficeAssetsPath>
+    <BackofficeAssetsPath>wwwroot\umbraco\backoffice</BackofficeAssetsPath>
  </PropertyGroup>

  <ItemGroup>
+    <BackofficeAssetsInputs Include="$(BackofficeProjectDirectory)package.json;$(BackofficeProjectDirectory)package-lock.json;$(BackofficeProjectDirectory)src\**" Exclude="$(DefaultItemExcludes)" />
    <Content Remove="$(BackofficeAssetsPath)\**" />
  </ItemGroup>

-  <Target Name="BuildStaticAssetsPreconditions" BeforeTargets="AssignTargetPaths">
-    <Message Text="Skip BuildBackoffice target because UmbracoBuild is '$(UmbracoBuild)' (this is not Visual Studio)" Importance="high" Condition="'$(UmbracoBuild)' != ''" />
-    <Message Text="Skip BuildBackoffice target because '$(BackofficeAssetsPath)' already exists" Importance="high" Condition="Exists('$(BackofficeAssetsPath)')" />
-    <Message Text="Call BuildBackoffice target because UmbracoBuild is empty (this is Visual Studio) and '$(BackofficeAssetsPath)' doesn't exist" Importance="high" Condition="'$(UmbracoBuild)' == '' and !Exists('$(BackofficeAssetsPath)')" />
-    <CallTarget Targets="BuildBackoffice" Condition="'$(UmbracoBuild)' == '' and !Exists('$(BackofficeAssetsPath)')" />
-  </Target>
-
  <Target Name="RestoreBackoffice" Inputs="$(BackofficeProjectDirectory)package-lock.json" Outputs="$(BackofficeProjectDirectory)node_modules\.package-lock.json">
    <Message Importance="high" Text="Restoring Backoffice NPM packages..." />
-    <Exec Command="npm i --no-fund --no-audit" WorkingDirectory="$(BackofficeProjectDirectory)" />
+    <Exec Command="npm ci --no-fund --no-audit --prefer-offline" WorkingDirectory="$(BackofficeProjectDirectory)" />
  </Target>

-  <Target Name="BuildBackoffice" DependsOnTargets="RestoreBackoffice">
+  <Target Name="BuildBackoffice" DependsOnTargets="RestoreBackoffice" BeforeTargets="AssignTargetPaths" Inputs="@(BackofficeAssetsInputs)" Outputs="$(IntermediateOutputPath)backoffice.complete.txt">
    <Message Importance="high" Text="Executing Backoffice NPM build script..." />
    <Exec Command="npm run build:for:cms" WorkingDirectory="$(BackofficeProjectDirectory)" />
    <ItemGroup>
@@ -74,46 +61,27 @@
    </DefineStaticWebAssets>
  </Target>

-  <Target Name="CleanStaticAssetsPreconditions" AfterTargets="Clean" Condition="'$(UmbracoBuild)' == ''">
-    <Message Text="Skip CleanBackoffice target because '$(BackofficeAssetsPath)' doesn't exist" Importance="high" Condition="!Exists('$(BackofficeAssetsPath)')" />
-    <Message Text="Skip CleanBackoffice target because preserve.backoffice marker file exists" Importance="high" Condition="Exists('$(BackofficeAssetsPath)') and Exists('$(SolutionDir)preserve.backoffice')" />
-    <Message Text="Call CleanBackoffice target because '$(BackofficeAssetsPath)' exists and preserve.backoffice marker file doesn't exist" Importance="high" Condition="Exists('$(BackofficeAssetsPath)') and !Exists('$(SolutionDir)preserve.backoffice')" />
-    <CallTarget Targets="CleanBackoffice" Condition="Exists('$(BackofficeAssetsPath)') and !Exists('$(SolutionDir)preserve.backoffice')" />
-  </Target>
-
-  <Target Name="CleanBackoffice">
-    <ItemGroup>
-      <BackofficeDirectories Include="$(BackofficeAssetsPath)" />
-    </ItemGroup>
-    <RemoveDir Directories="@(BackofficeDirectories)" />
-  </Target>
-  <!-- END: Restore and build backoffice project -->
-
-
-
-  <!-- BEGIN: Restore and build login project -->
+  <!-- Restore and build login project -->
  <PropertyGroup>
    <LoginProjectDirectory Condition="'$(LoginProjectDirectory)' == ''">..\Umbraco.Web.UI.Login\</LoginProjectDirectory>
-    <LoginAssetsPath>$(ProjectDir)wwwroot\umbraco\login</LoginAssetsPath>
+    <LoginAssetsPath>wwwroot\umbraco\login</LoginAssetsPath>
  </PropertyGroup>

  <ItemGroup>
+    <LoginAssetsInputs Include="$(LoginProjectDirectory)**" Exclude="$(DefaultItemExcludes)" />
    <Content Remove="$(LoginAssetsPath)\**" />
  </ItemGroup>

-  <Target Name="BuildLoginStaticAssetsPreconditions" BeforeTargets="AssignTargetPaths">
-    <Message Text="Skip BuildLogin target because UmbracoBuild is '$(UmbracoBuild)' (this is not Visual Studio)" Importance="high" Condition="'$(UmbracoBuild)' != ''" />
-    <Message Text="Skip BuildLogin target because '$(LoginAssetsPath)' already exists" Importance="high" Condition="Exists('$(LoginAssetsPath)')" />
-    <Message Text="Call BuildLogin target because UmbracoBuild is empty (this is Visual Studio) and '$(LoginAssetsPath)' doesn't exist" Importance="high" Condition="'$(UmbracoBuild)' == '' and !Exists('$(LoginAssetsPath)')" />
-    <CallTarget Targets="BuildLogin" Condition="'$(UmbracoBuild)' == '' and !Exists('$(LoginAssetsPath)')" />
-  </Target>
+  <ItemGroup>
+    <Content Remove="wwwroot\umbraco\assets\README.md" />
+  </ItemGroup>

  <Target Name="RestoreLogin" Inputs="$(LoginProjectDirectory)package-lock.json" Outputs="$(LoginProjectDirectory)node_modules/.package-lock.json">
    <Message Importance="high" Text="Restoring Login NPM packages..." />
-    <Exec Command="npm i --no-fund --no-audit" WorkingDirectory="$(LoginProjectDirectory)" />
+    <Exec Command="npm ci --no-fund --no-audit --prefer-offline" WorkingDirectory="$(LoginProjectDirectory)" />
  </Target>

-  <Target Name="BuildLogin" DependsOnTargets="RestoreLogin">
+  <Target Name="BuildLogin" DependsOnTargets="RestoreLogin" BeforeTargets="AssignTargetPaths" Inputs="@(LoginAssetsInputs)" Outputs="$(IntermediateOutputPath)login.complete.txt">
    <Message Importance="high" Text="Executing Login NPM build script..." />
    <Exec Command="npm run build" WorkingDirectory="$(LoginProjectDirectory)" />
    <ItemGroup>
@@ -131,19 +99,4 @@
      <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
    </DefineStaticWebAssets>
  </Target>
-
-  <Target Name="CleanLoginStaticAssetsPreconditions" AfterTargets="Clean" Condition="'$(UmbracoBuild)' == ''">
-    <Message Text="Skip CleanLogin target because '$(LoginAssetsPath)' doesn't exist" Importance="high" Condition="!Exists('$(LoginAssetsPath)')" />
-    <Message Text="Skip CleanLogin target because preserve.login marker file exists" Importance="high" Condition="Exists('$(LoginAssetsPath)') and Exists('$(SolutionDir)preserve.login')" />
-    <Message Text="Call CleanLogin target because '$(LoginAssetsPath)' exists and preserve.login marker file doesn't exist" Importance="high" Condition="Exists('$(LoginAssetsPath)') and !Exists('$(SolutionDir)preserve.login')" />
-    <CallTarget Targets="CleanLogin" Condition="Exists('$(LoginAssetsPath)') and !Exists('$(SolutionDir)preserve.login')" />
-  </Target>
-
-  <Target Name="CleanLogin">
-    <ItemGroup>
-      <LoginDirectories Include="$(LoginAssetsPath)" />
-    </ItemGroup>
-    <RemoveDir Directories="@(LoginDirectories)" />
-  </Target>
-  <!-- END: Restore and build login project -->
 </Project>
@@ -41,7 +41,7 @@ public static class AppCacheExtensions
    public static T? GetCacheItem<T>(this IAppCache provider, string cacheKey)
    {
        var result = provider.Get(cacheKey);
-        if (IsRetrievedItemNull(result))
+        if (result == null)
        {
            return default;
        }
@@ -52,7 +52,7 @@ public static class AppCacheExtensions
    public static T? GetCacheItem<T>(this IAppCache provider, string cacheKey, Func<T> getCacheItem)
    {
        var result = provider.Get(cacheKey, () => getCacheItem());
-        if (IsRetrievedItemNull(result))
+        if (result == null)
        {
            return default;
        }
@@ -60,8 +60,6 @@ public static class AppCacheExtensions
        return result.TryConvertTo<T>().Result;
    }

-    private static bool IsRetrievedItemNull(object? result) => result is null or (object)Cms.Core.Constants.Cache.NullRepresentationInCache;
-
    public static async Task<T?> GetCacheItemAsync<T>(
        this IAppPolicyCache provider,
        string cacheKey,
@@ -22,6 +22,4 @@ public static class CacheKeys

    public const string PreviewPropertyCacheKeyPrefix = "Cache.Property.CacheValues[D:";
    public const string PropertyCacheKeyPrefix = "Cache.Property.CacheValues[P:";
-
-    public const string MemberUserNameCachePrefix = "uRepo_userNameKey+";
 }
@@ -1,16 +0,0 @@
-namespace Umbraco.Cms.Core.Cache.PartialViewCacheInvalidators;
-
-/// <summary>
-/// Defines behaviours for clearing of cached partials views that are configured to be cached individually by member.
-/// </summary>
-public interface IMemberPartialViewCacheInvalidator
-{
-    /// <summary>
-    /// Clears the partial view cache items for the specified member ids.
-    /// </summary>
-    /// <param name="memberIds">The member Ids to clear the cache for.</param>
-    /// <remarks>
-    /// Called from the <see cref="MemberCacheRefresher"/> when a member is saved or deleted.
-    /// </remarks>
-    void ClearPartialViewCacheItems(IEnumerable<int> memberIds);
-}
@@ -1,5 +1,3 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
@@ -23,11 +21,9 @@ public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCac
    private readonly IDocumentNavigationManagementService _documentNavigationManagementService;
    private readonly IContentService _contentService;
    private readonly IDocumentCacheService _documentCacheService;
-    private readonly ICacheManager _cacheManager;
    private readonly IPublishStatusManagementService _publishStatusManagementService;
    private readonly IIdKeyMap _idKeyMap;

-    [Obsolete("Use the constructor with ICacheManager instead, scheduled for removal in V17.")]
    public ContentCacheRefresher(
        AppCaches appCaches,
        IJsonSerializer serializer,
@@ -42,39 +38,6 @@ public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCac
        IContentService contentService,
        IPublishStatusManagementService publishStatusManagementService,
        IDocumentCacheService documentCacheService)
-        : this(
-            appCaches,
-            serializer,
-            idKeyMap,
-            domainService,
-            eventAggregator,
-            factory,
-            documentUrlService,
-            domainCacheService,
-            documentNavigationQueryService,
-            documentNavigationManagementService,
-            contentService,
-            publishStatusManagementService,
-            documentCacheService,
-            StaticServiceProvider.Instance.GetRequiredService<ICacheManager>())
-    {
-    }
-
-    public ContentCacheRefresher(
-        AppCaches appCaches,
-        IJsonSerializer serializer,
-        IIdKeyMap idKeyMap,
-        IDomainService domainService,
-        IEventAggregator eventAggregator,
-        ICacheRefresherNotificationFactory factory,
-        IDocumentUrlService documentUrlService,
-        IDomainCacheService domainCacheService,
-        IDocumentNavigationQueryService documentNavigationQueryService,
-        IDocumentNavigationManagementService documentNavigationManagementService,
-        IContentService contentService,
-        IPublishStatusManagementService publishStatusManagementService,
-        IDocumentCacheService documentCacheService,
-        ICacheManager cacheManager)
        : base(appCaches, serializer, eventAggregator, factory)
    {
        _idKeyMap = idKeyMap;
@@ -86,11 +49,6 @@ public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCac
        _contentService = contentService;
        _documentCacheService = documentCacheService;
        _publishStatusManagementService = publishStatusManagementService;
-
-        // TODO: Ideally we should inject IElementsCache
-        // this interface is in infrastructure, and changing this is very breaking
-        // so as long as we have the cache manager, which casts the IElementsCache to a simple AppCache we might as well use that.
-        _cacheManager = cacheManager;
    }

    #region Indirect
@@ -125,13 +83,6 @@ public sealed class ContentCacheRefresher : PayloadCacheRefresherBase<ContentCac
        AppCaches.RuntimeCache.ClearOfType<PublicAccessEntry>();
        AppCaches.RuntimeCache.ClearByKey(CacheKeys.ContentRecycleBinCacheKey);

-        // Ideally, we'd like to not have to clear the entire cache here. However, this was the existing behavior in NuCache.
-        // The reason for this is that we have no way to know which elements are affected by the changes or what their keys are.
-        // This is because currently published elements live exclusively in a JSON blob in the umbracoPropertyData table.
-        // This means that the only way to resolve these keys is to actually parse this data with a specific value converter, and for all cultures, which is not possible.
-        // If published elements become their own entities with relations, instead of just property data, we can revisit this.
-        _cacheManager.ElementsCache.Clear();
-
        var idsRemoved = new HashSet<int>();
        IAppPolicyCache isolatedCache = AppCaches.IsolatedCaches.GetOrCreate<IContent>();

@@ -1,5 +1,3 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
@@ -20,9 +18,7 @@ public sealed class MediaCacheRefresher : PayloadCacheRefresherBase<MediaCacheRe
    private readonly IMediaNavigationManagementService _mediaNavigationManagementService;
    private readonly IMediaService _mediaService;
    private readonly IMediaCacheService _mediaCacheService;
-    private readonly ICacheManager _cacheManager;

-    [Obsolete("Use the constructor with ICacheManager instead, scheduled for removal in V17.")]
    public MediaCacheRefresher(
        AppCaches appCaches,
        IJsonSerializer serializer,
@@ -33,31 +29,6 @@ public sealed class MediaCacheRefresher : PayloadCacheRefresherBase<MediaCacheRe
        IMediaNavigationManagementService mediaNavigationManagementService,
        IMediaService mediaService,
        IMediaCacheService mediaCacheService)
-        : this(
-            appCaches,
-            serializer,
-            idKeyMap,
-            eventAggregator,
-            factory,
-            mediaNavigationQueryService,
-            mediaNavigationManagementService,
-            mediaService,
-            mediaCacheService,
-            StaticServiceProvider.Instance.GetRequiredService<ICacheManager>())
-    {
-    }
-
-    public MediaCacheRefresher(
-        AppCaches appCaches,
-        IJsonSerializer serializer,
-        IIdKeyMap idKeyMap,
-        IEventAggregator eventAggregator,
-        ICacheRefresherNotificationFactory factory,
-        IMediaNavigationQueryService mediaNavigationQueryService,
-        IMediaNavigationManagementService mediaNavigationManagementService,
-        IMediaService mediaService,
-        IMediaCacheService mediaCacheService,
-        ICacheManager cacheManager)
        : base(appCaches, serializer, eventAggregator, factory)
    {
        _idKeyMap = idKeyMap;
@@ -65,9 +36,6 @@ public sealed class MediaCacheRefresher : PayloadCacheRefresherBase<MediaCacheRe
        _mediaNavigationManagementService = mediaNavigationManagementService;
        _mediaService = mediaService;
        _mediaCacheService = mediaCacheService;
-
-        // TODO: Use IElementsCache instead of ICacheManager, see ContentCacheRefresher for more information.
-        _cacheManager = cacheManager;
    }

    #region Indirect
@@ -119,13 +87,6 @@ public sealed class MediaCacheRefresher : PayloadCacheRefresherBase<MediaCacheRe
        AppCaches.RuntimeCache.ClearByKey(CacheKeys.MediaRecycleBinCacheKey);
        Attempt<IAppPolicyCache?> mediaCache = AppCaches.IsolatedCaches.Get<IMedia>();

-        // Ideally, we'd like to not have to clear the entire cache here. However, this was the existing behavior in NuCache.
-        // The reason for this is that we have no way to know which elements are affected by the changes or what their keys are.
-        // This is because currently published elements live exclusively in a JSON blob in the umbracoPropertyData table.
-        // This means that the only way to resolve these keys is to actually parse this data with a specific value converter, and for all cultures, which is not possible.
-        // If published elements become their own entities with relations, instead of just property data, we can revisit this.
-        _cacheManager.ElementsCache.Clear();
-
        foreach (JsonPayload payload in payloads)
        {
            if (payload.ChangeTypes == TreeChangeTypes.Remove)
@@ -1,12 +1,10 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.Cache.PartialViewCacheInvalidators;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Extensions;

 namespace Umbraco.Cms.Core.Cache;

@@ -15,32 +13,10 @@ public sealed class MemberCacheRefresher : PayloadCacheRefresherBase<MemberCache
    public static readonly Guid UniqueId = Guid.Parse("E285DF34-ACDC-4226-AE32-C0CB5CF388DA");

    private readonly IIdKeyMap _idKeyMap;
-    private readonly IMemberPartialViewCacheInvalidator _memberPartialViewCacheInvalidator;

-    [Obsolete("Use the non obsoleted contructor instead. Planned for removal in V18")]
    public MemberCacheRefresher(AppCaches appCaches, IJsonSerializer serializer, IIdKeyMap idKeyMap, IEventAggregator eventAggregator, ICacheRefresherNotificationFactory factory)
-        : this(
-            appCaches,
-            serializer,
-            idKeyMap,
-            eventAggregator,
-            factory,
-            StaticServiceProvider.Instance.GetRequiredService<IMemberPartialViewCacheInvalidator>())
-    {
-    }
-
-    public MemberCacheRefresher(
-        AppCaches appCaches,
-        IJsonSerializer serializer,
-        IIdKeyMap idKeyMap,
-        IEventAggregator eventAggregator,
-        ICacheRefresherNotificationFactory factory,
-        IMemberPartialViewCacheInvalidator memberPartialViewCacheInvalidator)
-        : base(appCaches, serializer, eventAggregator, factory)
-    {
+        : base(appCaches, serializer, eventAggregator, factory) =>
        _idKeyMap = idKeyMap;
-        _memberPartialViewCacheInvalidator = memberPartialViewCacheInvalidator;
-    }

    #region Indirect

@@ -89,29 +65,17 @@ public sealed class MemberCacheRefresher : PayloadCacheRefresherBase<MemberCache

    private void ClearCache(params JsonPayload[] payloads)
    {
-        _memberPartialViewCacheInvalidator.ClearPartialViewCacheItems(payloads.Select(p => p.Id));
-
+        AppCaches.ClearPartialViewCache();
        Attempt<IAppPolicyCache?> memberCache = AppCaches.IsolatedCaches.Get<IMember>();

        foreach (JsonPayload p in payloads)
        {
            _idKeyMap.ClearCache(p.Id);
-            if (memberCache.Success is false)
+            if (memberCache.Success)
            {
-                continue;
+                memberCache.Result?.Clear(RepositoryCacheKeys.GetKey<IMember, int>(p.Id));
+                memberCache.Result?.Clear(RepositoryCacheKeys.GetKey<IMember, string>(p.Username));
            }
-
-            memberCache.Result?.Clear(RepositoryCacheKeys.GetKey<IMember, int>(p.Id));
-            memberCache.Result?.Clear(RepositoryCacheKeys.GetKey<IMember, string>(p.Username));
-
-            // This specific cache key was introduced to fix an issue where the member username could not be the same as the member id, because the cache keys collided.
-            // This is done in a bit of a hacky way, because the cache key is created internally in the repository, but we need to clear it here.
-            // Ideally, we want to use a shared way of generating the key between this and the repository.
-            // Additionally, the RepositoryCacheKeys actually caches the string to avoid re-allocating memory; we would like to also use this in the repository
-            // See:
-            // https://github.com/umbraco/Umbraco-CMS/pull/17350
-            // https://github.com/umbraco/Umbraco-CMS/pull/17815
-            memberCache.Result?.Clear(RepositoryCacheKeys.GetKey<IMember, string>(CacheKeys.MemberUserNameCachePrefix + p.Username));
        }
    }
 }
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Umbraco.Cms.Core.Configuration.Models.ContentSettings.get_Error404Collection</Target>
-    <Left>lib/net9.0/Umbraco.Core.dll</Left>
-    <Right>lib/net9.0/Umbraco.Core.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-</Suppressions>
@@ -25,8 +25,8 @@ public class TypeFinderConfig : ITypeFinderConfig

            var s = _settings.AssembliesAcceptingLoadExceptions;
            return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
-                ? []
-                : s.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+                ? Array.Empty<string>()
+                : s.Split(',').Select(x => x.Trim()).ToArray();
        }
    }
 }
@@ -14,8 +14,8 @@ public static class ContentSettingsExtensions
    ///   <c>true</c> if the file extension is allowed for upload; otherwise, <c>false</c>.
    /// </returns>
    public static bool IsFileAllowedForUpload(this ContentSettings contentSettings, string extension)
-        => contentSettings.AllowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension.Trim())) ||
-        (contentSettings.AllowedUploadedFileExtensions.Any() == false && contentSettings.DisallowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension.Trim())) == false);
+        => contentSettings.AllowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) ||
+        (contentSettings.AllowedUploadedFileExtensions.Any() == false && contentSettings.DisallowedUploadedFileExtensions.Any(x => x.InvariantEquals(extension)) == false);

    /// <summary>
    /// Gets the auto-fill configuration for a specified property alias.
@@ -50,7 +50,7 @@ public class ContentSettings
    /// <summary>
    ///     Gets or sets a value for the collection of error pages.
    /// </summary>
-    public IEnumerable<ContentErrorPage> Error404Collection { get; set; } = [];
+    public ISet<ContentErrorPage> Error404Collection { get; set; } = new HashSet<ContentErrorPage>();

    /// <summary>
    ///     Gets or sets a value for the preview badge mark-up.
@@ -144,7 +144,7 @@ public class DeliveryApiSettings
        /// <value>
        /// The URLs allowed as redirect targets.
        /// </value>
-        public IEnumerable<Uri> LoginRedirectUrls { get; set; } = [];
+        public ISet<Uri> LoginRedirectUrls { get; set; } = new HashSet<Uri>();

        /// <summary>
        ///     Gets or sets the URLs allowed to use as redirect targets after a successful logout (session termination).
@@ -155,7 +155,7 @@ public class DeliveryApiSettings
        /// <remarks>
        /// These are only required if logout is to be used.
        /// </remarks>
-        public IEnumerable<Uri> LogoutRedirectUrls { get; set; } = [];
+        public ISet<Uri> LogoutRedirectUrls { get; set; } = new HashSet<Uri>();
    }

    /// <summary>
@@ -2,7 +2,6 @@
 // See LICENSE for more details.

 using System.ComponentModel;
-using Umbraco.Cms.Core.Logging;

 namespace Umbraco.Cms.Core.Configuration.Models;

@@ -14,8 +13,6 @@ public class LoggingSettings
 {
    internal const string StaticMaxLogAge = "1.00:00:00"; // TimeSpan.FromHours(24);
    internal const string StaticDirectory = Constants.SystemDirectories.LogFiles;
-    internal const string StaticFileNameFormat = LoggingConfiguration.DefaultLogFileNameFormat;
-    internal const string StaticFileNameFormatArguments = "MachineName";

    /// <summary>
    /// Gets or sets a value for the maximum age of a log file.
@@ -34,25 +31,4 @@ public class LoggingSettings
    /// </value>
    [DefaultValue(StaticDirectory)]
    public string Directory { get; set; } = StaticDirectory;
-
-    /// <summary>
-    /// Gets or sets the file name format to use for log files.
-    /// </summary>
-    /// <value>
-    /// The file name format.
-    /// </value>
-    [DefaultValue(StaticFileNameFormat)]
-    public string FileNameFormat { get; set; } = StaticFileNameFormat;
-
-    /// <summary>
-    /// Gets or sets the file name format arguments to use for log files.
-    /// </summary>
-    /// <value>
-    /// The file name format arguments as a comma delimited string of accepted values.
-    /// </value>
-    /// <remarks>
-    /// Accepted values for format arguments are: MachineName, EnvironmentName.
-    /// </remarks>
-    [DefaultValue(StaticFileNameFormatArguments)]
-    public string FileNameFormatArguments { get; set; } = StaticFileNameFormatArguments;
 }
@@ -4,23 +4,10 @@
 namespace Umbraco.Cms.Core.Configuration.Models;

 /// <summary>
-///     The serializer type that the published content cache uses to persist documents in the database.
+///     The serializer type that nucache uses to persist documents in the database.
 /// </summary>
 public enum NuCacheSerializerType
 {
-    /// <summary>
-    /// The default serializer type, which uses MessagePack for serialization.
-    /// </summary>
-    MessagePack = 1,
-
-    /// <summary>
-    /// The legacy JSON serializer type, which uses JSON for serialization.
-    /// </summary>
-    /// <remarks>
-    /// This option was provided for backward compatibility for the Umbraco cache implementation used from Umbraco 8 to 14 (NuCache).
-    /// It is no longer supported with the cache implementation from Umbraco 15 based on .NET's Hybrid cache.
-    /// Use the faster and more compact <see cref="MessagePack"/> instead.
-    /// The option is kept available only for a more readable format suitable for testing purposes.
-    /// </remarks>
+    MessagePack = 1, // Default
    JSON = 2,
 }
@@ -98,5 +98,5 @@ public class RequestHandlerSettings
    /// <summary>
    ///     Add additional character replacements, or override defaults
    /// </summary>
-    public IEnumerable<CharItem> UserDefinedCharCollection { get; set; } = [];
+    public ISet<CharItem> UserDefinedCharCollection { get; set; } = new HashSet<CharItem>();
 }
@@ -19,6 +19,7 @@ public class RuntimeSettings
    public RuntimeMode Mode { get; set; } = RuntimeMode.BackofficeDevelopment;

    /// <summary>
+    [Obsolete("No longer used and will be removed in Umbraco 16.")]
    ///     Gets or sets a value for the maximum request length in kb.
    /// </summary>
    public long? MaxRequestLength { get; set; }
@@ -28,8 +28,8 @@ public class SecuritySettings

    internal const int StaticMemberDefaultLockoutTimeInMinutes = 30 * 24 * 60;
    internal const int StaticUserDefaultLockoutTimeInMinutes = 30 * 24 * 60;
-    internal const long StaticUserDefaultFailedLoginDurationInMilliseconds = 1000;
-    internal const long StaticUserMinimumFailedLoginDurationInMilliseconds = 250;
+    private const long StaticUserDefaultFailedLoginDurationInMilliseconds = 1000;
+    private const long StaticUserMinimumFailedLoginDurationInMilliseconds = 250;
    internal const string StaticAuthorizeCallbackPathName = "/umbraco/oauth_complete";
    internal const string StaticAuthorizeCallbackLogoutPathName = "/umbraco/logout";
    internal const string StaticAuthorizeCallbackErrorPathName = "/umbraco/error";
@@ -1,51 +0,0 @@
-// Copyright (c) Umbraco.
-// See LICENSE for more details.
-
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.Logging;
-
-namespace Umbraco.Cms.Core.Configuration.Models.Validation;
-
-/// <summary>
-///     Validator for configuration representated as <see cref="LoggingSettings" />.
-/// </summary>
-public class LoggingSettingsValidator : ConfigurationValidatorBase, IValidateOptions<LoggingSettings>
-{
-    /// <inheritdoc />
-    public ValidateOptionsResult Validate(string? name, LoggingSettings options)
-    {
-        if (!ValidateFileNameFormatArgument(options.FileNameFormat, options.FileNameFormatArguments, out var message))
-        {
-            return ValidateOptionsResult.Fail(message);
-        }
-
-
-        return ValidateOptionsResult.Success;
-    }
-
-    private bool ValidateFileNameFormatArgument(string fileNameFormat, string fileNameFormatArguments, out string message)
-    {
-        var fileNameFormatArgumentsAsArray = fileNameFormatArguments
-            .Split([','], StringSplitOptions.RemoveEmptyEntries)
-            .Select(x => x.Trim())
-            .ToArray();
-        if (fileNameFormatArgumentsAsArray.Any(x => LoggingConfiguration.SupportedFileNameFormatArguments.Contains(x) is false))
-        {
-            message = $"The file name arguments '{string.Join(",", fileNameFormatArgumentsAsArray)}' contain one or more values that aren't in the supported list of values '{string.Join(",", LoggingConfiguration.SupportedFileNameFormatArguments)}'.";
-            return false;
-        }
-
-        try
-        {
-            _ = string.Format(fileNameFormat, fileNameFormatArgumentsAsArray);
-        }
-        catch (FormatException)
-        {
-            message = $"The provided file name format '{fileNameFormat}' could not be used with the provided arguments '{string.Join(",", fileNameFormatArgumentsAsArray)}'.";
-            return false;
-        }
-
-        message = string.Empty;
-        return true;
-    }
-}
@@ -1,5 +1,4 @@
-using System.ComponentModel;
-using Umbraco.Cms.Core.Webhooks;
+using System.ComponentModel;

 namespace Umbraco.Cms.Core.Configuration.Models;

@@ -11,7 +10,6 @@ public class WebhookSettings
    internal const string StaticPeriod = "00:00:10";
    private const bool StaticEnableLoggingCleanup = true;
    private const int StaticKeepLogsForDays = 30;
-    private const WebhookPayloadType StaticPayloadType = Constants.Webhooks.DefaultPayloadType;


    /// <summary>
@@ -65,16 +63,4 @@ public class WebhookSettings
    /// </remarks>
    [DefaultValue(StaticKeepLogsForDays)]
    public int KeepLogsForDays { get; set; } = StaticKeepLogsForDays;
-
-    /// <summary>
-    ///     Gets or sets a value indicating the type of payload used for sending webhooks
-    /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         By default, Legacy payloads are used see <see cref="WebhookPayloadType"/> for more info.
-    ///         This default will change to minimal starting from v17.
-    ///     </para>
-    /// </remarks>
-    [DefaultValue(StaticPayloadType)]
-    public WebhookPayloadType PayloadType { get; set; } = StaticPayloadType;
 }
@@ -1,21 +0,0 @@
-namespace Umbraco.Cms.Core;
-public static partial class Constants
-{
-    public static class Cache
-    {
-        public static class Tags
-        {
-            public const string Content = "content";
-
-            public const string Media = "media";
-        }
-
-        /// <summary>
-        /// Defines the string used to represent a null value in the cache.
-        /// </summary>
-        /// <remarks>
-        /// Used in conjunction with the option to cache null values on the repository caches, so we
-        /// can distinguish a true null "not found" value and a cached null value.</remarks>
-        public const string NullRepresentationInCache = "*NULL*";
-    }
-}
@@ -61,7 +61,6 @@ public static partial class Constants
        public const string ConfigDataTypes = ConfigPrefix + "DataTypes";
        public const string ConfigPackageManifests = ConfigPrefix + "PackageManifests";
        public const string ConfigWebhook = ConfigPrefix + "Webhook";
-        public const string ConfigWebhookPayloadType = ConfigWebhook + ":PayloadType";
        public const string ConfigCache = ConfigPrefix + "Cache";

        public static class NamedOptions
@@ -107,7 +107,6 @@ public static partial class Constants
            /// <summary>
            ///     Guid for List View - Members as string
            /// </summary>
-            [Obsolete("No longer used in Umbraco. Scheduled for removal in Umbraco 17.")]
            public const string ListViewMembers = "AA2C52A0-CE87-4E65-A47C-7DF09358585D";

            /// <summary>
@@ -1,18 +0,0 @@
-using Umbraco.Cms.Core.Webhooks;
-
-namespace Umbraco.Cms.Core;
-
-public static partial class Constants
-{
-    public static class Webhooks
-    {
-        /// <summary>
-        /// Gets the default webhook payload type.
-        /// </summary>
-        /// <remarks>
-        /// Currently, the default payload type is <see cref="WebhookPayloadType.Legacy"/> for backward compatibility until Umbraco 17.
-        /// From Umbraco 17 this will be changed to <see cref="WebhookPayloadType.Minimal"/>.
-        /// </remarks>
-        public const WebhookPayloadType DefaultPayloadType = WebhookPayloadType.Legacy;
-    }
-}
@@ -1,35 +1,15 @@
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Extensions;

 namespace Umbraco.Cms.Core.DeliveryApi;

 public sealed class ApiContentBuilder : ApiContentBuilderBase<IApiContent>, IApiContentBuilder
 {
-    private readonly IVariationContextAccessor _variationContextAccessor;
-
-    [Obsolete("Please use the constructor that takes an IVariationContextAccessor instead. Scheduled for removal in V17.")]
-    public ApiContentBuilder(
-        IApiContentNameProvider apiContentNameProvider,
-        IApiContentRouteBuilder apiContentRouteBuilder,
-        IOutputExpansionStrategyAccessor outputExpansionStrategyAccessor)
-        : this(
-            apiContentNameProvider,
-            apiContentRouteBuilder,
-            outputExpansionStrategyAccessor,
-            StaticServiceProvider.Instance.CreateInstance<IVariationContextAccessor>())
+    public ApiContentBuilder(IApiContentNameProvider apiContentNameProvider, IApiContentRouteBuilder apiContentRouteBuilder, IOutputExpansionStrategyAccessor outputExpansionStrategyAccessor)
+        : base(apiContentNameProvider, apiContentRouteBuilder, outputExpansionStrategyAccessor)
    {
    }

-    public ApiContentBuilder(
-        IApiContentNameProvider apiContentNameProvider,
-        IApiContentRouteBuilder apiContentRouteBuilder,
-        IOutputExpansionStrategyAccessor outputExpansionStrategyAccessor,
-        IVariationContextAccessor variationContextAccessor)
-        : base(apiContentNameProvider, apiContentRouteBuilder, outputExpansionStrategyAccessor)
-        => _variationContextAccessor = variationContextAccessor;
-
    protected override IApiContent Create(IPublishedContent content, string name, IApiContentRoute route, IDictionary<string, object?> properties)
-        => new ApiContent(content.Key, name, content.ContentType.Alias, content.CreateDate, content.CultureDate(_variationContextAccessor), route, properties);
+        => new ApiContent(content.Key, name, content.ContentType.Alias, content.CreateDate, content.UpdateDate, route, properties);
 }
@@ -1,5 +1,4 @@
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Models.DeliveryApi;
+using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Extensions;

@@ -8,36 +7,15 @@ namespace Umbraco.Cms.Core.DeliveryApi;
 public class ApiContentResponseBuilder : ApiContentBuilderBase<IApiContentResponse>, IApiContentResponseBuilder
 {
    private readonly IApiContentRouteBuilder _apiContentRouteBuilder;
-    private readonly IVariationContextAccessor _variationContextAccessor;

-    [Obsolete("Please use the constructor that takes an IVariationContextAccessor instead. Scheduled for removal in V17.")]
-    public ApiContentResponseBuilder(
-        IApiContentNameProvider apiContentNameProvider,
-        IApiContentRouteBuilder apiContentRouteBuilder,
-        IOutputExpansionStrategyAccessor outputExpansionStrategyAccessor)
-        : this(
-            apiContentNameProvider,
-            apiContentRouteBuilder,
-            outputExpansionStrategyAccessor,
-            StaticServiceProvider.Instance.CreateInstance<IVariationContextAccessor>())
-    {
-    }
-
-    public ApiContentResponseBuilder(
-        IApiContentNameProvider apiContentNameProvider,
-        IApiContentRouteBuilder apiContentRouteBuilder,
-        IOutputExpansionStrategyAccessor outputExpansionStrategyAccessor,
-        IVariationContextAccessor variationContextAccessor)
+    public ApiContentResponseBuilder(IApiContentNameProvider apiContentNameProvider, IApiContentRouteBuilder apiContentRouteBuilder, IOutputExpansionStrategyAccessor outputExpansionStrategyAccessor)
        : base(apiContentNameProvider, apiContentRouteBuilder, outputExpansionStrategyAccessor)
-    {
-        _apiContentRouteBuilder = apiContentRouteBuilder;
-        _variationContextAccessor = variationContextAccessor;
-    }
+        => _apiContentRouteBuilder = apiContentRouteBuilder;

    protected override IApiContentResponse Create(IPublishedContent content, string name, IApiContentRoute route, IDictionary<string, object?> properties)
    {
        IDictionary<string, IApiContentRoute> cultures = GetCultures(content);
-        return new ApiContentResponse(content.Key, name, content.ContentType.Alias, content.CreateDate, content.CultureDate(_variationContextAccessor), route, properties, cultures);
+        return new ApiContentResponse(content.Key, name, content.ContentType.Alias, content.CreateDate, content.UpdateDate, route, properties, cultures);
    }

    protected virtual IDictionary<string, IApiContentRoute> GetCultures(IPublishedContent content)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Niels Lyngsø	011634e9ba	Merge branch 'v16/dev' into v16/bugfix/nested-document-types # Conflicts: # src/Umbraco.Core/Services/PublicAccessService.cs # src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts	2025-04-14 20:22:37 +02:00
Niels Lyngsø	1afac0c247	Merge remote-tracking branch 'origin/v15/dev' into v16/bugfix/nested-document-types	2025-04-14 20:20:27 +02:00
Niels LyngsøandGitHub	2031298001	Merge branch 'v15/dev' into v15/bugfix/nested-document-types	2025-04-14 16:01:44 +02:00
kjac	04b44af3f9	Only return the direct compositions of a content type - not its ancestor compositions. Effectively a revert of #15800	2025-03-26 15:04:30 +01:00
kjac	74b1f42909	Do not reject existing compositions when updating content types	2025-03-26 14:46:38 +01:00
Kenn JacobsenandGitHub	064c85f47a	Merge branch 'v15/dev' into v15/bugfix/nested-document-types	2025-03-26 09:00:31 +01:00
Niels LyngsøandGitHub	5ccbf08365	Merge branch 'v15/dev' into v15/bugfix/nested-document-types	2025-03-11 12:25:01 +01:00
Niels Lyngsø	85b3df6672	without UMB_	2025-03-11 11:14:46 +01:00
Niels Lyngsø	d8b5006b30	Merge branch 'v15/dev' into v15/bugfix/nested-document-types # Conflicts: # src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts # src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts	2025-03-11 11:06:12 +01:00
leekelleher	1504b5c0d3	Implements "inheritance" composition	2024-11-27 14:19:09 +00:00
kjac	d482d9161c	Accept parent key equal to inheritance composition key when creating document and media types	2024-11-27 12:39:36 +01:00
leekelleher	57d6bd75e3	[WIP] Temp fix for circular reference	2024-11-27 11:22:19 +00:00
leekelleher	e5168dee4a	Merge branch 'v15/dev' into v15/bugfix/nested-document-types	2024-11-27 11:20:05 +00:00
leekelleher	254e81823f	Nested document types (client)	2024-11-26 10:35:22 +00:00