Merge branch 'refs/heads/master' into v15/feature/api-users-and-external-access

# Conflicts:
#	15/umbraco-cms/SUMMARY.md

Author: kjac

13/umbraco-engage/developers/headless/README.md

@@ -42,27 +42,24 @@ To install the Umbraco Engage Headless API, follow these steps:
 dotnet add package Umbraco.Engage.Headless
 ```
 
-## Updating Startup.cs
+## Updating Program.cs
 
-To update the Startup.cs file, follow these steps:
+To update the Program.cs file, follow these steps:
 
-1. Open your `Startup.cs` file.
-2. Locate the **ConfigureServices** method.
-3. Add the line `.AddMarketingApiDocumentation()` after `.AddDeliveryApi()`. Your ConfigureServices method should look like this:
+1. Open your `Program.cs` file.
+2. Add the line `.AddEngageApiDocumentation()` after `.AddDeliveryApi()`. Your `CreateUmbracoBuilder` method should look like this:
 
 ```cs
-public void ConfigureServices(IServiceCollection services)
-{
-    services.AddUmbraco(_env, _config)
-        .AddBackOffice()
-        .AddWebsite()
-        .AddDeliveryApi()
-        .AddMarketingApiDocumentation()
-        .AddComposers()
-        .Build();
-}
+builder.CreateUmbracoBuilder()
+    .AddBackOffice()
+    .AddWebsite()
+    .AddDeliveryApi()
+    .AddEngageApiDocumentation()
+    .AddComposers()
+    .Build();
+
 ```
 
-4. Rebuild and run your site.
-5. Navigate to **/umbraco/swagger** in your browser.
-6. From the top right definition dropdown, check for the **Umbraco Engage Marketing API.**
+3. Rebuild and run your site.
+4. Navigate to **/umbraco/swagger** in your browser.
+5. From the top right definition dropdown, check for the **Umbraco Engage Marketing API.**

13/umbraco-engage/upgrading/migrate-from-umarketingsuite.md

@@ -261,7 +261,10 @@ Run this script to migrate all the Umbraco data.
 
 1. Delete any `obj`/`bin` folders in your projects to ensure a clean build.
 2. Recompile all projects and ensure all dependencies are restored correctly.
-3. Add your new Umbraco Engage [license](../installation/licensing.md) key to the `appSettings.json` file:
+3. Contact Umbraco Support for a license key.
+   1. Look for the speech bubble in the bottom right corner of your screen at [umbraco.com](https://umbraco.com).
+   2. Click it, and you can open a new support request.
+4. Add your new Umbraco Engage [license](../installation/licensing.md) key to the `appSettings.json` file:
 
 ```json
 "Umbraco": {

14/umbraco-cms/tutorials/add-microsoft-entra-id-authentication.md

@@ -9,11 +9,12 @@ description: >-
 This tutorial takes you through configuring Microsoft Entra ID (Azure Active Directory/Azure AD) for the member login on your Umbraco CMS website.
 
 {% hint style="warning" %}
-Entra ID conflicts with Umbraco ID which is the main authentication method used on all Umbraco Cloud projects.
+Microsoft Entra ID conflicts with Umbraco ID when used for backoffice user logins on Umbraco Cloud projects. This does not affect member logins.
 
-Due to this, we **highly recommend not using Azure AD for backoffice authentication on your Umbraco Cloud projects**.
+**We strongly recommend against using Entra ID for backoffice authentication on Umbraco Cloud projects**.
+
+For member authentication, other [External Login Providers](../reference/security/external-login-providers.md), such as Google Auth and OpenIdConnect, are still supported and compatible with Umbraco Cloud.
 
-It is still possible to use other [External Login Providers](../reference/security/external-login-providers.md) like Google Auth and OpenIdConnect, with Umbraco Cloud.
 {% endhint %}
 
 ## Prerequisites

15/umbraco-cms/.gitbook.yaml

@@ -104,3 +104,5 @@ redirects:
     extending/backoffice-tours: extending/README.md
     tutorials/creating-a-backoffice-tour: tutorials/overview.md
     extending/packages/types-of-packages: extending/packages/README.md
+    reference/configuration/nucachesettings: reference/configuration/cache-settings.md
+    fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/listview: fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/collection.md

15/umbraco-cms/SUMMARY.md

@@ -30,6 +30,8 @@
   * [Property Editors](fundamentals/backoffice/property-editors/README.md)
     * [Built-in Property Editors](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/README.md)
       * [Image Cropper](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/image-cropper.md)
+      * [Block Editors](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/block-editor/README.md)
+        * [Block Grid](fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/block-editor/block-grid-editor.md)
 * [Data](fundamentals/data/README.md)
   * [Users](fundamentals/data/users/README.md)
     * [API Users](fundamentals/data/users/api-users.md)
@@ -50,6 +52,7 @@
   * [Health Check Guides](extending/health-check/guides/README.md)
     * [Content Content Security Policy (CSP)](extending/health-check/guides/contentsecuritypolicy.md)
 * [Creating a Custom Database Table](extending/database.md)
+* [Creating a Custom Seed Key Provider](extending/creating-custom-seed-key-provider.md)
 
 ## Reference
 
@@ -73,7 +76,7 @@
   * [Logging settings](reference/configuration/loggingsettings.md)
   * [Maximum Upload Size Settings](reference/configuration/maximumuploadsizesettings.md)
   * [Models builder settings](reference/configuration/modelsbuildersettings.md)
-  * [NuCache Settings](reference/configuration/nucachesettings.md)
+  * [Cache Settings](reference/configuration/cache-settings.md)
   * [Package Migration](reference/configuration/packagemigrationsettings.md)
   * [Plugins settings](reference/configuration/pluginssettings.md)
   * [Request handler settings](reference/configuration/requesthandlersettings.md)
@@ -85,6 +88,7 @@
   * [Web routing](reference/configuration/webroutingsettings.md)
 * [Querying & Models](reference/querying/README.md)
   * [ITagQuery](reference/querying/itagquery.md)
+  * [UmbracoContext helper](reference/querying/umbraco-context.md)
 * [Routing & Controllers](reference/routing/README.md)
   * [Routing in Umbraco](reference/routing/request-pipeline/README.md)
     * [IContentFinder](reference/routing/request-pipeline/icontentfinder.md)
@@ -97,6 +101,7 @@
 * [Management API](reference/management-api/README.md)
     * [External Access](reference/management-api/external-access.md)
 * [Cache & Distributed Cache](reference/cache/README.md)
+  * [Cache Seeding](reference/cache/cache-seeding.md)
   * [Examples](reference/cache/examples/README.md)
     * [Working with caching](reference/cache/examples/tags.md)
 

15/umbraco-cms/extending/creating-custom-seed-key-provider.md

@@ -0,0 +1,115 @@
+---
+description: A guide to creating a custom seed key provider for Umbraco
+---
+
+# Creating a Custom Seed Key Provider
+
+Umbraco uses a lazy loaded cache, which means that content is loaded into the cache on an as-needed basis. However, you may need specific content to always be in the cache. To achieve this you can implement your own custom seed key providers.
+
+There are two types of seed key providers: `IDocumentSeedKeyProvider` for documents and `IMediaSeedKeyProvider` for media. As these interfaces are identical only `IDocumentSeedKeyProvider` is demonstrated in this article.
+
+{% hint style="warning" %}
+Seed keys are cached and calculated once. Any documents created after the site has started will not be included in the seed keys until after a server restart.
+{% endhint %}
+
+## Implementation
+
+This example implements a `IDocumentSeedKeyProvider` which seeds all the children of a node, in this case blog posts.
+
+1. Create a new class called `BlogSeedKeyProvider` that implements `IDocumentSeedKeyProvider`.
+
+```csharp
+using Umbraco.Cms.Infrastructure.HybridCache;
+
+namespace MySite.SeedKeyProviders;
+
+public class BlogSeedKeyProvider : IDocumentSeedKeyProvider
+{
+    public ISet<Guid> GetSeedKeys()
+    {
+    }
+}
+```
+
+Next we'll inject the `IDocumentNavigationQueryService` in order to get the children of the blog node.
+
+```csharp
+using Umbraco.Cms.Core.Services.Navigation;
+using Umbraco.Cms.Infrastructure.HybridCache;
+
+namespace MySite.SeedKeyProviders;
+
+public class BlogSeedKeyProvider : IDocumentSeedKeyProvider
+{
+    private readonly IDocumentNavigationQueryService _documentNavigationQueryService;
+
+    public BlogSeedKeyProvider(IDocumentNavigationQueryService documentNavigationQueryService)
+        => _documentNavigationQueryService = documentNavigationQueryService;
+
+{...}
+```
+
+3. Parse a hardcoded string to a GUID.
+4. Use the `IDocumentNavigationQueryService` to get the children of the blog node.
+5. Return their keys as a `HashSet`.
+
+```csharp
+public ISet<Guid> GetSeedKeys()
+{
+    var blogRoot = Guid.Parse("a5fdb22d-b7f2-4a59-8c4e-46ed86bde56c");
+
+    if (_documentNavigationQueryService.TryGetChildrenKeys(blogRoot, out IEnumerable<Guid> blogPostKeys))
+    {
+        return new HashSet<Guid>(blogPostKeys);
+    }
+
+    return new HashSet<Guid>();
+}
+```
+Since this returns it as a set, and all the sets get unioned, we do not have to worry about duplicates.
+
+The final class looks like this:
+
+```csharp
+using Umbraco.Cms.Core.Services.Navigation;
+using Umbraco.Cms.Infrastructure.HybridCache;
+
+namespace MySite.SeedKeyProviders;
+
+public class BlogSeedKeyProvider : IDocumentSeedKeyProvider
+{
+    private readonly IDocumentNavigationQueryService _documentNavigationQueryService;
+
+    public BlogSeedKeyProvider(IDocumentNavigationQueryService documentNavigationQueryService)
+        => _documentNavigationQueryService = documentNavigationQueryService;
+
+    public ISet<Guid> GetSeedKeys()
+    {
+        var blogRoot = Guid.Parse("a5fdb22d-b7f2-4a59-8c4e-46ed86bde56c");
+
+        if (_documentNavigationQueryService.TryGetChildrenKeys(blogRoot, out IEnumerable<Guid> blogPostKeys))
+        {
+            return new HashSet<Guid>(blogPostKeys);
+        }
+
+        return new HashSet<Guid>();
+    }
+}
+```
+
+### Registering the Seed Key Provider
+
+Now that the `BlogSeedKeyProvider` is implemented, it must be registered in the `Startup` class.
+
+```csharp
+using MySite.SeedKeyProviders;
+using Umbraco.Cms.Infrastructure.DependencyInjection;
+using Umbraco.Cms.Infrastructure.HybridCache;
+
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddSingleton<IDocumentSeedKeyProvider, BlogSeedKeyProvider>();
+{...}
+```
+
+All blogpost will now be seeded into the cache on startup, and will always be present in the cache.

15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/block-editor/README.md

@@ -14,7 +14,7 @@ Umbraco CMS currently ships with two Block Editors: the Block List and the Block
 
 ## Customizing Block Editors
 
-### [Build custom views for blocks](build-custom-view-for-blocks.md)
+### [Creating custom views for blocks](../../../../../tutorials/creating-custom-views-for-blocklist.md)
 
 Learn how to create custom views for the blocks used in your Block Grid or Block List property editors.
 

15/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/collection.md

@@ -0,0 +1,110 @@
+# Collection
+
+`Alias: Umbraco.ListView`
+
+`Returns: IEnumerable<IPublishedContent>`
+
+**Collection** displays a collection of categories when it is enabled on a Document Type with children.
+
+![Collection example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview.png)
+
+## Enable collection
+
+If enabled, editors will be able to see multiple children from a collection on a content node that has children. When not enabled, no collection will be shown and all children will be shown in the Content Tree.
+
+![Enable Collection example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/enable-listview.png)
+
+## Settings
+
+![Collection settings example](/14/umbraco-cms/fundamentals/backoffice/property-editors/built-in-umbraco-property-editors/images/list-view-settings.png)
+
+
+### Page Size
+
+Defines how many child content nodes you want to see per page. This will limit how many content items you will see in your collection. If you set it to 5, then only 5 content items will be shown in the collection.
+
+### Order By
+
+Will sort your collection by the selection you choose in the dropdown. By default it selects "Last edited" and you get the following three columns:
+
+* **Last edited** - When the content node was last edited and saved.
+* **Name** - Name of the content node(s).
+* **Created by** - This is the user who the content node was created by.
+
+You can add more sorting to this collection by adding more datatypes to the columns in the "Columns Displayed" section.
+
+### Order Direction
+
+You can select order of the content nodes displayed, "Acsending" or "Descending". The order is affected by the "Order By" selection.
+
+### Columns Displayed
+
+It is possible to add more columns to the collection, via adding the properties through the dropdown. These properties are based on the Data Types which are used by the Document Type. It will show up in the dropdown by its alias and not the name on the property.
+
+![Collection property example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview-property.png) ![Collection property example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview-property-dropdown.png)
+
+Once you have selected a column you want to display, define what its name should be and what kind of value it should display. You can also move the headers around, re-ordering how they should look. This is done by the move icon on the left side of the alias.
+
+The template section is where you define what kind of value you want to display. The value of the column is in the `value` variable.
+
+### Layouts
+
+Collection comes with two layouts by default. A list and a grid view. These views can be disabled if you are not interested in any of them.
+
+{% hint style="info" %}
+A minimum of one layout needs to be enabled for Collection to work.
+{% endhint %}
+
+You can also make your own layout and add it to the settings. For example, if you wanted to change the width or length of the grid, you will be able to do so.
+
+### Bulk Action Permissions
+
+Select what kind of action is available on the collection.
+
+* **Allow bulk publish** - content only
+* **Allow bulk unpublish** - content only
+* **Allow bulk copy** - content only
+* **Allow bulk move**
+* **Allow bulk delete**
+
+### Workspace View icon
+
+Changes the icon in the backoffice of the collection. By default it will look like the image below.
+
+![Collection icon example](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/list-icon.png)
+
+### Workspace View name
+
+You can change the name of the collection itself. Default if empty: 'Child Items'.
+
+### Show Content Workspace View First
+
+Enable this to show the Content Workspace View by default instead of the collection's.
+
+## Content Example
+
+### Generic field value
+
+This example uses a generic field on a child item and displays it in the collection. ![Collection content example email](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview-content-example-email-settings.png)
+
+The `{{ value }}` will take the value of the Email property and display it in the collection, as shown on the image below.
+
+![Collection content example email](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/listview-content-example-email.png)
+
+### Member name
+
+First, a Member Picker property needs to be present on the content item. In this example, the `child item` has gotten a Member Picker Data Type with the alias of `isAuthor`.
+
+![Collection member picker](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/member-picker.png)
+
+The child item has a member and the value that should be displayed is the name of the picked value. The next step is to reconfigure the template value in the collection setting.
+
+![Collection member picker](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/member-picker-settings.png)
+
+This will take the value picked up by the member picker. ![Collection member picker](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/picked-member.png)
+
+And display it in the collection. Shown in the example below: ![Collection member picker](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/list-member-picked.png)
+
+### Other examples
+
+![Collection other examples](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/others.png) ![Collection other examples](../../../../../../10/umbraco-cms/fundamentals/backoffice/property-editors/built-in-property-editors/images/others-result.png)