Update Examine to 3.8.0.

* Fix: prevent open redirect in public surface controllers by validating RedirectUrl with Url.IsLocalUrl

* Fixed spacing in comment.

---------

Co-authored-by: Lan Nguyen Thuy <lnt@umbraco.dk>
Co-authored-by: Andy Butland <abutland73@gmail.com>

Directory.Packages.props

@@ -12,24 +12,24 @@
   </ItemGroup>
   <!-- Microsoft packages -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.11" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.22" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.22" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.11" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.22" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.22" />
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.11" />
-    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.22" />
+    <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="8.0.22" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
@@ -46,9 +46,9 @@
     <PackageVersion Include="Asp.Versioning.Mvc" Version="7.1.1" />
     <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.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.11.71" />
+    <PackageVersion Include="Examine" Version="3.8.0" />
+    <PackageVersion Include="Examine.Core" Version="3.8.0" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.11.74" />
     <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
     <PackageVersion Include="MailKit" Version="4.8.0" />
     <PackageVersion Include="Markdown" Version="2.2.1" />
@@ -56,7 +56,7 @@
     <PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
     <PackageVersion Include="MiniProfiler.Shared" Version="4.3.8" />
     <PackageVersion Include="ncrontab" Version="3.3.3" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="NPoco" Version="5.7.1" />
     <PackageVersion Include="NPoco.SqlServer" Version="5.7.1" />
     <PackageVersion Include="OpenIddict.Abstractions" Version="4.10.1" />
@@ -74,7 +74,7 @@
     <PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageVersion Include="Serilog.Sinks.Map" Version="1.0.2" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
     <PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.5" />
     <PackageVersion Include="Smidge.InMemory" Version="4.6.0" />
     <PackageVersion Include="Smidge.Nuglify" Version="4.6.0" />
@@ -83,11 +83,11 @@
   <!-- Transitive pinned versions (only required because our direct dependencies have vulnerable versions of transitive dependencies) -->
   <ItemGroup>
     <!-- Both Microsoft.EntityFrameworkCore.SqlServer and NPoco.SqlServer bring in a vulnerable version of Azure.Identity -->
-    <PackageVersion Include="Azure.Identity" Version="1.13.1" />
+    <PackageVersion Include="Azure.Identity" Version="1.13.2" />
     <!-- 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="8.0.2" />
+    <PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.3" />
     <!-- Both Dazinator.Extensions.FileProviders and MiniProfiler.AspNetCore.Mvc bring in a vulnerable version of System.Text.RegularExpressions -->
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <!-- Both OpenIddict.AspNetCore, Npoco.SqlServer and Microsoft.EntityFrameworkCore.SqlServer bring in a vulnerable version of Microsoft.IdentityModel.JsonWebTokens -->
@@ -97,8 +97,8 @@
     <!-- Both OpenIddict.AspNetCore, Microsoft.EntityFrameworkCore.* bring in a vulnerable version of Microsoft.Extensions.Caching.Memory -->
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <!-- Both Azure.Identity, Microsoft.EntityFrameworkCore.SqlServer,NPoco.SqlServer, and more bring in a vulnerable version of System.Text.Json -->
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.6" />
     <!-- Both Microsoft.EntityFrameworkCore.SqlServer and NPoco.SqlServer bring in a vulnerable version of Microsoft.Data.SqlClient -->
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.3" />
   </ItemGroup>
 </Project>

src/Umbraco.Core/IO/PhysicalFileSystem.cs

@@ -346,13 +346,6 @@ namespace Umbraco.Cms.Core.IO
             // our root path, due to relative segments, so better check
             if (_ioHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
             {
-                // this says that 4.7.2 supports long paths - but Windows does not
-                // https://docs.microsoft.com/en-us/dotnet/api/system.io.pathtoolongexception?view=netframework-4.7.2
-                if (path.Length > 260)
-                {
-                    throw new PathTooLongException($"Path {path} is too long.");
-                }
-
                 return path;
             }
 

src/Umbraco.Core/Models/ContentTypeBase.cs

@@ -132,6 +132,30 @@ public abstract class ContentTypeBase : TreeEntityBase, IContentTypeBase
         }
     }
 
+    /// <summary>
+    ///     Detects if any persisted property types have been removed by comparing old and new collections,
+    ///     and sets <see cref="HasPropertyTypeBeenRemoved"/> accordingly.
+    /// </summary>
+    private void DetectPropertyTypeRemovals(IEnumerable<IPropertyType> oldPropertyTypes, IEnumerable<IPropertyType> newPropertyTypes)
+    {
+        if (HasPropertyTypeBeenRemoved)
+        {
+            return;
+        }
+
+        var oldIds = new HashSet<int>(oldPropertyTypes.Select(pt => pt.Id).Where(id => id > 0));
+        if (oldIds.Count == 0)
+        {
+            return;
+        }
+
+        var newIds = new HashSet<int>(newPropertyTypes.Select(pt => pt.Id).Where(id => id > 0));
+        if (oldIds.Any(id => !newIds.Contains(id)))
+        {
+            HasPropertyTypeBeenRemoved = true;
+        }
+    }
+
     /// <summary>
     ///     PropertyTypes that are not part of a PropertyGroup
     /// </summary>
@@ -273,6 +297,7 @@ public abstract class ContentTypeBase : TreeEntityBase, IContentTypeBase
         {
             if (PropertyTypeCollection != null)
             {
+                DetectPropertyTypeRemovals(PropertyTypeCollection, value);
                 PropertyTypeCollection.ClearCollectionChangedEvents();
             }
 
@@ -443,21 +468,21 @@ public abstract class ContentTypeBase : TreeEntityBase, IContentTypeBase
     ///     Please note that resetting the dirty properties could potentially
     ///     obstruct the saving of a new or updated entity.
     /// </remarks>
-    public override void ResetDirtyProperties()
+    public override void ResetDirtyProperties(bool rememberDirty)
     {
-        base.ResetDirtyProperties();
+        base.ResetDirtyProperties(rememberDirty);
 
         // loop through each property group to reset the property types
         var propertiesReset = new List<int>();
 
         foreach (PropertyGroup propertyGroup in PropertyGroups)
         {
-            propertyGroup.ResetDirtyProperties();
+            propertyGroup.ResetDirtyProperties(rememberDirty);
             if (propertyGroup.PropertyTypes is not null)
             {
                 foreach (IPropertyType propertyType in propertyGroup.PropertyTypes)
                 {
-                    propertyType.ResetDirtyProperties();
+                    propertyType.ResetDirtyProperties(rememberDirty);
                     propertiesReset.Add(propertyType.Id);
                 }
             }
@@ -467,7 +492,7 @@ public abstract class ContentTypeBase : TreeEntityBase, IContentTypeBase
         // but don't re-reset ones we've already done.
         foreach (IPropertyType propertyType in PropertyTypes.Where(x => propertiesReset.Contains(x.Id) == false))
         {
-            propertyType.ResetDirtyProperties();
+            propertyType.ResetDirtyProperties(rememberDirty);
         }
     }
 

src/Umbraco.Core/Models/ContentTypeCompositionBase.cs

@@ -13,6 +13,7 @@ public abstract class ContentTypeCompositionBase : ContentTypeBase, IContentType
 {
     private List<IContentTypeComposition> _contentTypeComposition = new();
     private List<int> _removedContentTypeKeyTracker = new();
+    private bool _hasCompositionBeenRemoved;
 
     protected ContentTypeCompositionBase(IShortStringHelper shortStringHelper, int parentId)
         : base(shortStringHelper, parentId)
@@ -104,6 +105,24 @@ public abstract class ContentTypeCompositionBase : ContentTypeBase, IContentType
         }
     }
 
+    /// <summary>
+    ///     A boolean flag indicating if a composition has been removed from this instance.
+    /// </summary>
+    /// <remarks>
+    ///     This is currently (specifically) used in order to know that we need to refresh the content cache which
+    ///     needs to occur when a composition has been removed from a content type
+    /// </remarks>
+    [IgnoreDataMember]
+    internal bool HasCompositionTypeBeenRemoved
+    {
+        get => _hasCompositionBeenRemoved;
+        private set
+        {
+            _hasCompositionBeenRemoved = value;
+            OnPropertyChanged(nameof(HasCompositionTypeBeenRemoved));
+        }
+    }
+
     /// <inheritdoc />
     public IEnumerable<IPropertyType> GetOriginalComposedPropertyTypes() => GetRawComposedPropertyTypes();
 
@@ -179,6 +198,8 @@ public abstract class ContentTypeCompositionBase : ContentTypeBase, IContentType
                 _removedContentTypeKeyTracker.AddRange(compositionIdsToRemove);
             }
 
+            HasCompositionTypeBeenRemoved = true;
+
             OnPropertyChanged(nameof(ContentTypeComposition));
 
             return _contentTypeComposition.Remove(contentTypeComposition);

src/Umbraco.Core/Models/PropertyGroup.cs

@@ -20,6 +20,7 @@ public class PropertyGroup : EntityBase, IEquatable<PropertyGroup>
 
     private string _alias;
     private string? _name;
+    private bool _hasPropertyTypeBeenRemoved;
     private PropertyTypeCollection? _propertyTypes;
     private int _sortOrder;
 
@@ -94,6 +95,20 @@ public class PropertyGroup : EntityBase, IEquatable<PropertyGroup>
         set => SetPropertyValueAndDetectChanges(value, ref _sortOrder, nameof(SortOrder));
     }
 
+    /// <summary>
+    ///     A boolean flag indicating if a property type has been removed from this group.
+    /// </summary>
+    [IgnoreDataMember]
+    internal bool HasPropertyTypeBeenRemoved
+    {
+        get => _hasPropertyTypeBeenRemoved;
+        private set
+        {
+            _hasPropertyTypeBeenRemoved = value;
+            OnPropertyChanged(nameof(HasPropertyTypeBeenRemoved));
+        }
+    }
+
     /// <summary>
     ///     Gets or sets a collection of property types for the group.
     /// </summary>
@@ -112,6 +127,7 @@ public class PropertyGroup : EntityBase, IEquatable<PropertyGroup>
         {
             if (_propertyTypes != null)
             {
+                DetectPropertyTypeRemovals(_propertyTypes, value);
                 _propertyTypes.ClearCollectionChangedEvents();
             }
 
@@ -155,4 +171,27 @@ public class PropertyGroup : EntityBase, IEquatable<PropertyGroup>
 
     private void PropertyTypesChanged(object? sender, NotifyCollectionChangedEventArgs e) =>
         OnPropertyChanged(nameof(PropertyTypes));
+
+    private void DetectPropertyTypeRemovals(PropertyTypeCollection oldPropertyTypes, PropertyTypeCollection? newPropertyTypes)
+    {
+        if (HasPropertyTypeBeenRemoved)
+        {
+            return;
+        }
+
+        var oldIds = new HashSet<int>(oldPropertyTypes.Select(pt => pt.Id).Where(id => id > 0));
+        if (oldIds.Count == 0)
+        {
+            return;
+        }
+
+        var newIds = newPropertyTypes != null
+            ? new HashSet<int>(newPropertyTypes.Select(pt => pt.Id).Where(id => id > 0))
+            : new HashSet<int>();
+
+        if (oldIds.Any(id => !newIds.Contains(id)))
+        {
+            HasPropertyTypeBeenRemoved = true;
+        }
+    }
 }

src/Umbraco.Core/Services/Changes/ContentTypeChangeExtensions.cs

@@ -18,4 +18,20 @@ public static class ContentTypeChangeExtensions
 
     public static bool HasTypesNone(this ContentTypeChangeTypes change, ContentTypeChangeTypes types) =>
         (change & types) == ContentTypeChangeTypes.None;
+
+    /// <summary>
+    ///     Determines whether the change has structural change impact.
+    /// </summary>
+    /// <param name="change">The change to check.</param>
+    /// <returns><c>true</c> if the change has structural impact; otherwise, <c>false</c>.</returns>
+    public static bool IsStructuralChange(this ContentTypeChangeTypes change) =>
+        change.HasType(ContentTypeChangeTypes.RefreshMain);
+
+    /// <summary>
+    ///     Determines whether the change has non-structural change impact.
+    /// </summary>
+    /// <param name="change">The change to check.</param>
+    /// <returns><c>true</c> if the change has non-structural impact; otherwise, <c>false</c>.</returns>
+    public static bool IsNonStructuralChange(this ContentTypeChangeTypes change) =>
+        change.HasType(ContentTypeChangeTypes.RefreshOther) && !change.HasType(ContentTypeChangeTypes.RefreshMain);
 }

src/Umbraco.Core/Services/Changes/ContentTypeChangeTypes.cs

@@ -11,14 +11,29 @@ public enum ContentTypeChangeTypes : byte
     Create = 1,
 
     /// <summary>
-    ///     Content type changes impact only the Content type being saved
+    ///     Content type changes directly impact existing content of this content type.
     /// </summary>
+    /// <remarks>
+    ///     These changes are "destructive" of nature. They include:
+    ///     - Changing the content type alias.
+    ///     - Removing a property type or a composition.
+    ///     - Changing the alias of a property type (this effectively corresponds to removing a property type).
+    ///     - Changing variance, either at property or content type level.
+    /// </remarks>
     RefreshMain = 2,
 
     /// <summary>
-    ///     Content type changes impacts the content type being saved and others used that are composed of it
+    ///     Content type changes that do not directly impact existing content of this content type.
     /// </summary>
-    RefreshOther = 4, // changed, other change
+    /// <remarks>
+    ///     These changes are "constructive" of nature, and include all changes not included in
+    ///     <see cref="RefreshMain"/> - for example:
+    ///     - Adding a property type or a composition.
+    ///     - Rearranging property types or groups.
+    ///     - Changes to name, description, icon etc.
+    ///     - Changes to other content type settings, i.e. allowed child types and version cleanup.
+    /// </remarks>
+    RefreshOther = 4,
 
     /// <summary>
     ///     Content type was removed

src/Umbraco.Core/Services/ContentTypeServiceBaseOfTRepositoryTItemTService.cs

@@ -226,7 +226,10 @@ public abstract class ContentTypeServiceBase<TRepository, TItem> : ContentTypeSe
             });
 
             // removed properties?
-            var hasAnyPropertyBeenRemoved = dirty.WasPropertyDirty("HasPropertyTypeBeenRemoved");
+            // check both the content type level flag (set by RemovePropertyType) and
+            // individual property group flags (set when PropertyTypes collection is replaced, e.g. by the mapper)
+            var hasAnyPropertyBeenRemoved = dirty.WasPropertyDirty("HasPropertyTypeBeenRemoved")
+                || contentType.PropertyGroups.Any(g => g.WasPropertyDirty("HasPropertyTypeBeenRemoved"));
 
             // removed compositions?
             var hasAnyCompositionBeenRemoved = dirty.WasPropertyDirty("HasCompositionTypeBeenRemoved");

src/Umbraco.Infrastructure/Search/IndexingNotificationHandler.ContentType.cs

@@ -52,16 +52,16 @@ public sealed class ContentTypeIndexingNotificationHandler : INotificationHandle
             throw new NotSupportedException();
         }
 
-        var changedIds = new Dictionary<string, (List<int> removedIds, List<int> refreshedIds, List<int> otherIds)>();
+        var changedIds = new Dictionary<string, (List<int> removedIds, List<int> refreshedIds)>();
 
         foreach (ContentTypeCacheRefresher.JsonPayload payload in (ContentTypeCacheRefresher.JsonPayload[])args
                      .MessageObject)
         {
             if (!changedIds.TryGetValue(
                 payload.ItemType,
-                out (List<int> removedIds, List<int> refreshedIds, List<int> otherIds) idLists))
+                out (List<int> removedIds, List<int> refreshedIds) idLists))
             {
-                idLists = (removedIds: new List<int>(), refreshedIds: new List<int>(), otherIds: new List<int>());
+                idLists = (removedIds: new List<int>(), refreshedIds: new List<int>());
                 changedIds.Add(payload.ItemType, idLists);
             }
 
@@ -73,28 +73,24 @@ public sealed class ContentTypeIndexingNotificationHandler : INotificationHandle
             {
                 idLists.refreshedIds.Add(payload.Id);
             }
-            else if (payload.ChangeTypes.HasType(ContentTypeChangeTypes.RefreshOther))
-            {
-                idLists.otherIds.Add(payload.Id);
-            }
         }
 
-        foreach (KeyValuePair<string, (List<int> removedIds, List<int> refreshedIds, List<int> otherIds)> ci in
+        foreach (KeyValuePair<string, (List<int> removedIds, List<int> refreshedIds)> ci in
                  changedIds)
         {
-            if (ci.Value.refreshedIds.Count > 0 || ci.Value.otherIds.Count > 0)
+            if (ci.Value.refreshedIds.Count > 0)
             {
                 switch (ci.Key)
                 {
                     case var itemType when itemType == typeof(IContentType).Name:
-                        RefreshContentOfContentTypes(ci.Value.refreshedIds.Concat(ci.Value.otherIds).Distinct()
+                        RefreshContentOfContentTypes(ci.Value.refreshedIds.Distinct()
                             .ToArray());
                         break;
                     case var itemType when itemType == typeof(IMediaType).Name:
-                        RefreshMediaOfMediaTypes(ci.Value.refreshedIds.Concat(ci.Value.otherIds).Distinct().ToArray());
+                        RefreshMediaOfMediaTypes(ci.Value.refreshedIds.Distinct().ToArray());
                         break;
                     case var itemType when itemType == typeof(IMemberType).Name:
-                        RefreshMemberOfMemberTypes(ci.Value.refreshedIds.Concat(ci.Value.otherIds).Distinct()
+                        RefreshMemberOfMemberTypes(ci.Value.refreshedIds.Distinct()
                             .ToArray());
                         break;
                 }
@@ -154,6 +150,10 @@ public sealed class ContentTypeIndexingNotificationHandler : INotificationHandle
         const int pageSize = 500;
         var page = 0;
         var total = long.MaxValue;
+
+        // track which Ids have their paths are published
+        var publishChecked = new Dictionary<int, bool>();
+
         while (page * pageSize < total)
         {
             IEnumerable<IContent> contentToRefresh = _contentService.GetPagedOfTypes(
@@ -165,20 +165,20 @@ public sealed class ContentTypeIndexingNotificationHandler : INotificationHandle
                 // order by shallowest to deepest, this allows us to check it's published state without checking every item
                 Ordering.By("Path"));
 
-            // track which Ids have their paths are published
-            var publishChecked = new Dictionary<int, bool>();
-
             foreach (IContent c in contentToRefresh)
             {
                 var isPublished = false;
                 if (c.Published)
                 {
-                    if (!publishChecked.TryGetValue(c.ParentId, out isPublished))
+                    if (publishChecked.TryGetValue(c.ParentId, out isPublished) is false)
                     {
-                        // nothing by parent id, so query the service and cache the result for the next child to check against
                         isPublished = _contentService.IsPathPublished(c);
-                        publishChecked[c.Id] = isPublished;
+
+                        // the parent *must* be published if the entire path is published
+                        publishChecked[c.ParentId] = isPublished;
                     }
+
+                    publishChecked[c.Id] = isPublished;
                 }
 
                 _umbracoIndexingHandler.ReIndexForContent(c, isPublished);

src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs

@@ -167,7 +167,7 @@ public class IdentityMapDefinition : IMapDefinition
         DateTime? lockedOutUntil = source.LastLockoutDate?.AddMinutes(_securitySettings.MemberDefaultLockoutTimeInMinutes);
         if (lockedOutUntil.HasValue is false)
         {
-            return DateTime.MaxValue;
+            return DateTimeOffset.MaxValue;
         }
 
         return EnsureUtcWithServerTime(lockedOutUntil.Value);

src/Umbraco.PublishedCache.NuCache/PublishedSnapshotServiceEventHandler.cs

@@ -53,9 +53,7 @@ public class PublishedSnapshotServiceEventHandler :
 
     public void Handle(ContentTypeRefreshedNotification notification)
     {
-        const ContentTypeChangeTypes types // only for those that have been refreshed
-            = ContentTypeChangeTypes.RefreshMain | ContentTypeChangeTypes.RefreshOther;
-        var contentTypeIds = notification.Changes.Where(x => x.ChangeTypes.HasTypesAny(types)).Select(x => x.Item.Id)
+        var contentTypeIds = notification.Changes.Where(x => x.ChangeTypes.IsStructuralChange()).Select(x => x.Item.Id)
             .ToArray();
         if (contentTypeIds.Any())
         {

src/Umbraco.Web.BackOffice/Controllers/EntityController.cs

@@ -1138,7 +1138,7 @@ public class EntityController : UmbracoAuthorizedJsonController
                 .Select(s => int.Parse(s, CultureInfo.InvariantCulture)).Distinct().ToArray();
 
             var ignoreUserStartNodes =
-                IsDataTypeIgnoringUserStartNodes(queryStrings?.GetValue<Guid?>("dataTypeId"));
+                IsDataTypeIgnoringUserStartNodes(queryStrings?.GetValue<Guid?>("dataTypeKey"));
             if (ignoreUserStartNodes == false)
             {
                 int[]? aids = null;

src/Umbraco.Web.UI.Client/package-lock.json

@@ -24,9 +24,9 @@
         "angular-sanitize": "1.8.3",
         "angular-touch": "1.8.3",
         "angular-ui-sortable": "0.19.0",
-        "animejs": "3.2.1",
+        "animejs": "3.2.2",
         "bootstrap-social": "5.1.1",
-        "chart.js": "^2.9.3",
+        "chart.js": "^2.9.4",
         "clipboard": "2.0.11",
         "diff": "5.1.0",
         "flatpickr": "4.6.13",
@@ -37,12 +37,12 @@
         "lazyload-js": "1.0.0",
         "moment": "2.29.4",
         "ng-file-upload": "12.2.13",
-        "nouislider": "15.7.1",
+        "nouislider": "15.7.2",
         "spectrum-colorpicker2": "2.0.10",
-        "tinymce": "6.8.2",
+        "tinymce": "6.8.6",
         "typeahead.js": "0.11.1",
-        "underscore": "1.13.6",
-        "wicg-inert": "3.1.2"
+        "underscore": "1.13.7",
+        "wicg-inert": "3.1.3"
       },
       "devDependencies": {
         "@babel/core": "7.21.8",
@@ -3360,9 +3360,10 @@
       }
     },
     "node_modules/animejs": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/animejs/-/animejs-3.2.1.tgz",
-      "integrity": "sha512-sWno3ugFryK5nhiDm/2BKeFCpZv7vzerWUcUPyAZLDhMek3+S/p418ldZJbJXo5ZUOpfm2kP2XRO4NJcULMy9A=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/animejs/-/animejs-3.2.2.tgz",
+      "integrity": "sha512-Ao95qWLpDPXXM+WrmwcKbl6uNlC5tjnowlaRYtuVDHHoygjtIPfDUoK9NthrlZsQSKjZXlmji2TrBUAVbiH0LQ==",
+      "license": "MIT"
     },
     "node_modules/ansi-colors": {
       "version": "1.1.0",
@@ -12971,9 +12972,10 @@
       }
     },
     "node_modules/nouislider": {
-      "version": "15.7.1",
-      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-15.7.1.tgz",
-      "integrity": "sha512-5N7C1ru/i8y3dg9+Z6ilj6+m1EfabvOoaRa7ztpxBSKKRZso4vA52DGSbBJjw5XLtFr/LZ9SgGAXqyVtlVHO5w=="
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/nouislider/-/nouislider-15.7.2.tgz",
+      "integrity": "sha512-Jn1xuJZk0cs7XdzFD2tKucedlvi5/eEAsyewPS70Qqba3a1vcyEey2VZFmp7JiS06QfgkD0kEFk8oMnJrLDWXQ==",
+      "license": "MIT"
     },
     "node_modules/now-and-later": {
       "version": "2.0.1",
@@ -16694,9 +16696,10 @@
       "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
     },
     "node_modules/tinymce": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.8.2.tgz",
-      "integrity": "sha512-Lho79o2Y1Yn+XdlTEkHTEkEmzwYWTXz7IUsvPwxJF3VTtgHUIAAuBab29kik+f2KED3rZvQavr9D7sHVMJ9x4A=="
+      "version": "6.8.6",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.8.6.tgz",
+      "integrity": "sha512-++XYEs8lKWvZxDCjrr8Baiw7KiikraZ5JkLMg6EdnUVNKJui0IsrAADj5MsyUeFkcEryfn2jd3p09H7REvewyg==",
+      "license": "MIT"
     },
     "node_modules/to-absolute-glob": {
       "version": "2.0.2",
@@ -17026,9 +17029,10 @@
       }
     },
     "node_modules/underscore": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
+      "version": "1.13.7",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
+      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
+      "license": "MIT"
     },
     "node_modules/undertaker": {
       "version": "1.3.0",
@@ -17738,9 +17742,10 @@
       "dev": true
     },
     "node_modules/wicg-inert": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.2.tgz",
-      "integrity": "sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.3.tgz",
+      "integrity": "sha512-5L0PKK7iP+0Q/jv2ccgmkz/pfXbumZtlEyWS/xnX+L+Og3f7WjL4+iEs18k4IuldOX3PgGpza3qGndL9xUBjCQ==",
+      "license": "W3C-20150513"
     },
     "node_modules/word-wrap": {
       "version": "1.2.4",

src/Umbraco.Web.UI.Client/package.json

@@ -36,9 +36,9 @@
     "angular-sanitize": "1.8.3",
     "angular-touch": "1.8.3",
     "angular-ui-sortable": "0.19.0",
-    "animejs": "3.2.1",
+    "animejs": "3.2.2",
     "bootstrap-social": "5.1.1",
-    "chart.js": "^2.9.3",
+    "chart.js": "^2.9.4",
     "clipboard": "2.0.11",
     "diff": "5.1.0",
     "flatpickr": "4.6.13",
@@ -49,12 +49,12 @@
     "lazyload-js": "1.0.0",
     "moment": "2.29.4",
     "ng-file-upload": "12.2.13",
-    "nouislider": "15.7.1",
+    "nouislider": "15.7.2",
     "spectrum-colorpicker2": "2.0.10",
-    "tinymce": "6.8.2",
+    "tinymce": "6.8.6",
     "typeahead.js": "0.11.1",
-    "underscore": "1.13.6",
-    "wicg-inert": "3.1.2"
+    "underscore": "1.13.7",
+    "wicg-inert": "3.1.3"
   },
   "devDependencies": {
     "@babel/core": "7.21.8",

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js

@@ -261,7 +261,9 @@ angular.module("umbraco")
                           $scope.path = _.filter(anc, function (f) {
                               return f.path.indexOf($scope.startNodeId) !== -1;
                           });
-                          folder.path = $scope.path[0].path;
+                          if ($scope.path.length > 0) {
+                              folder.path = $scope.path[0].path;
+                          }
                       })
                   : Promise.resolve().then(function () {
                         $scope.path = [];
@@ -368,7 +370,20 @@ angular.module("umbraco")
             }
 
             function onUploadComplete(files) {
+
+                // Refresh the current folder to get updated pagination info.
                 gotoFolder($scope.currentFolder).then(function () {
+
+                    // If there are multiple pages, navigate to the last page where new uploads appear.
+                    if (vm.searchOptions.totalPages > 1) {
+                        vm.searchOptions.pageNumber = vm.searchOptions.totalPages;
+                        return getChildren($scope.currentFolder.id);
+                    } else {
+                        return Promise.resolve();
+                    }
+                }).then(function () {
+
+                    // Select the newly uploaded items.
                     $timeout(function () {
                         if ($scope.multiPicker) {
                             var images = _.rest(_.sortBy($scope.images, 'id'), $scope.images.length - files.length);
@@ -378,6 +393,7 @@ angular.module("umbraco")
                             clickHandler(image);
                         }
                     });
+
                 });
             }
 

src/Umbraco.Web.Website/Controllers/UmbLoginStatusController.cs

@@ -51,8 +51,8 @@ public class UmbLoginStatusController : SurfaceController
 
         TempData["LogoutSuccess"] = true;
 
-        // If there is a specified path to redirect to then use it.
-        if (model.RedirectUrl.IsNullOrWhiteSpace() == false)
+        // If there is a specified path to redirect to and it is validated as a local URL, then use it.
+        if (model.RedirectUrl.IsNullOrWhiteSpace() is false && Url.IsLocalUrl(model.RedirectUrl!))
         {
             return Redirect(model.RedirectUrl!);
         }

src/Umbraco.Web.Website/Controllers/UmbProfileController.cs

@@ -70,8 +70,8 @@ public class UmbProfileController : SurfaceController
 
         TempData["FormSuccess"] = true;
 
-        // If there is a specified path to redirect to then use it.
-        if (model.RedirectUrl.IsNullOrWhiteSpace() == false)
+        // If there is a specified path to redirect to and it is validated as a local URL, then use it.
+        if (model.RedirectUrl.IsNullOrWhiteSpace() is false && Url.IsLocalUrl(model.RedirectUrl!))
         {
             return Redirect(model.RedirectUrl!);
         }

src/Umbraco.Web.Website/Controllers/UmbRegisterController.cs

@@ -59,8 +59,8 @@ public class UmbRegisterController : SurfaceController
         {
             TempData["FormSuccess"] = true;
 
-            // If there is a specified path to redirect to then use it.
-            if (model.RedirectUrl.IsNullOrWhiteSpace() == false)
+            // If there is a specified path to redirect to and it is validated as a local URL, then use it.
+            if (model.RedirectUrl.IsNullOrWhiteSpace() is false && Url.IsLocalUrl(model.RedirectUrl!))
             {
                 return Redirect(model.RedirectUrl!);
             }

tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs

@@ -5,12 +5,16 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Exceptions;
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Services.Changes;
+using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Tests.Common.Attributes;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
@@ -35,6 +39,10 @@ public class ContentTypeServiceTests : UmbracoIntegrationTest
     {
         builder.AddNotificationHandler<ContentMovedToRecycleBinNotification, ContentNotificationHandler>();
         builder.AddNotificationHandler<ContentTypeDeletedNotification, ContentTypeNotificationHandler>();
+
+        builder.AddNotificationHandler<ContentTypeChangedNotification, ContentTypeChangedDistributedCacheNotificationHandler>();
+        builder.AddNotificationHandler<ContentTypeCacheRefresherNotification, ContentTypeCacheRefreshedNotificationHandler>();
+        builder.Services.AddUnique<IServerMessenger, ContentEventsTests.LocalServerMessenger>();
     }
 
     [Test]
@@ -2026,6 +2034,328 @@ public class ContentTypeServiceTests : UmbracoIntegrationTest
         Assert.That(ctBase.PropertyTypes.First().PropertyEditorAlias, Is.EqualTo(dtdYesNo.EditorAlias));
     }
 
+    [Test]
+    public void Adding_ContentType_Composition_Yields_RefreshOther()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType component = CreateComponent();
+        cts.Save(component);
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        Assert.IsTrue(site.AddContentType(component));
+        Assert.IsTrue(site.ContentTypeCompositionExists(component.Alias));
+        cts.Save(site);
+
+        // Assert; expect RefreshOther when adding a compostion
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshOther);
+    }
+
+    [Test]
+    public void Adding_PropertyType_Yields_RefreshOther()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        var propertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
+            {
+                Name = "Title",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        Assert.IsTrue(site.AddPropertyType(propertyType));
+        cts.Save(site);
+
+        // Assert; expect RefreshOther when adding a property
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshOther);
+    }
+
+    [Test]
+    public void Removing_ContentType_Composition_Yields_RefreshMain()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType component = CreateComponent();
+        cts.Save(component);
+        IContentType site = CreateSite();
+        Assert.IsTrue(site.AddContentType(component));
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+        Assert.IsTrue(site.ContentTypeCompositionExists(component.Alias));
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        Assert.IsTrue(site.RemoveContentType(component.Alias));
+        cts.Save(site);
+
+        // Assert; expect RefreshMain when removing a composition
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshMain);
+    }
+
+    [Test]
+    public void Removing_PropertyType_Yields_RefreshMain()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        site.RemovePropertyType(site.PropertyTypes.First().Alias);
+        cts.Save(site);
+
+        // Assert; expect RefreshMain when removing a property
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshMain);
+    }
+
+    [Test]
+    public void Removing_PropertyType_By_Replacing_Collection_Yields_RefreshMain()
+    {
+        // This test simulates how the backoffice mapper removes a property: rather than calling
+        // RemovePropertyType(), it rebuilds the property collection without the removed property
+        // and assigns it to the group. This is the code path in ContentTypeMapDefinition.MapSaveToTypeBase().
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        // Simulate the mapper path: replace the group's PropertyTypes with an empty collection
+        // (as if the property was removed via the backoffice UI)
+        PropertyGroup group = site.PropertyGroups.First();
+        group.PropertyTypes = new PropertyTypeCollection(true);
+        cts.Save(site);
+
+        // Assert; expect RefreshMain when removing a property, regardless of how it was removed
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshMain);
+    }
+
+    [Test]
+    public void Removing_PropertyTypeGroup_Yields_RefreshOther()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        site.RemovePropertyGroup(site.PropertyTypes.First().Alias);
+        cts.Save(site);
+
+        // Assert; removing a group does not cause the contained properties to be removed, so expect RefreshOther
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshOther);
+    }
+
+    [Test]
+    public void Changing_PropertyType_Alias_Yields_RefreshMain()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        site.PropertyTypes.First().Alias += "_updated";
+        cts.Save(site);
+
+        // Assert; expect RefreshMain when changing the alias of a property (it corresponds to removing the property)
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshMain);
+    }
+
+    [Test]
+    public void Changing_ContentType_Alias_Yields_RefreshMain()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        site.Alias += "_updated";
+        cts.Save(site);
+
+        // Assert; expect RefreshMain when changing the alias of a content type
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshMain);
+    }
+
+    [Test]
+    public void Changing_PropertyType_Variance_Yields_RefreshMain()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        site.Variations = ContentVariation.Culture;
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        site.PropertyTypes.First().Variations = ContentVariation.Culture;
+        cts.Save(site);
+
+        // Assert; expect RefreshMain when changing the variance of a property
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshMain);
+    }
+
+    [Test]
+    public void Changing_ContentType_Variance_Yields_RefreshMain()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        site.Variations = ContentVariation.Culture;
+        cts.Save(site);
+
+        // Assert; expect RefreshMain when changing the variance of a content type
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshMain);
+    }
+
+    [Test]
+    public void Changing_User_Interface_Settings_Yields_RefreshMain()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        site.Name += "_updated";
+        site.Description += "_updated";
+        site.Icon += "_updated";
+        site.PropertyTypes.First().Name += "_updated";
+        cts.Save(site);
+
+        // Assert; expect RefreshOther when making UI changes only (names, icon, description etc.)
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshOther);
+    }
+
+    [Test]
+    public void Changing_History_Cleanup_And_Basic_Structure_Settings_Yields_RefreshMain()
+    {
+        var cts = ContentTypeService;
+
+        // Arrange
+        IContentType site = CreateSite();
+        cts.Save(site);
+
+        // re-fetch before acting
+        site = cts.Get(site.Id)!;
+
+        // Act
+        ContentTypeCacheRefresher.JsonPayload[] refreshedPayloads = null;
+        ContentTypeCacheRefreshedNotificationHandler.ContentTypeCacheRefreshed = payloads
+            => refreshedPayloads = payloads;
+
+        site.HistoryCleanup = new HistoryCleanup
+        {
+            KeepAllVersionsNewerThanDays = 12,
+            KeepLatestVersionPerDayForDays = 32,
+            PreventCleanup = false,
+        };
+        site.AllowedAsRoot = !site.AllowedAsRoot;
+        site.AllowedContentTypes = [new ContentTypeSort(site.Id, 1)];
+        cts.Save(site);
+
+        // Assert; expect RefreshOther when making UI changes only (names, icon, description etc.)
+        AssertContentTypeRefreshPayload(refreshedPayloads, site.Id, ContentTypeChangeTypes.RefreshOther);
+    }
+
     private ContentType CreateComponent()
     {
         var component = new ContentType(ShortStringHelper, -1)
@@ -2169,4 +2499,32 @@ public class ContentTypeServiceTests : UmbracoIntegrationTest
         public static Action<ContentTypeDeletedNotification> Deleted { get; set; }
         public void Handle(ContentTypeDeletedNotification notification) => Deleted?.Invoke(notification);
     }
+
+    public class ContentTypeCacheRefreshedNotificationHandler : INotificationHandler<ContentTypeCacheRefresherNotification>
+    {
+        public static Action<ContentTypeCacheRefresher.JsonPayload[]>? ContentTypeCacheRefreshed { get; set; }
+
+        public void Handle(ContentTypeCacheRefresherNotification notification)
+        {
+            if (notification.MessageType != MessageType.RefreshByPayload || notification.MessageObject is not ContentTypeCacheRefresher.JsonPayload[] payloads)
+            {
+                throw new NotSupportedException();
+            }
+
+            ContentTypeCacheRefreshed?.Invoke(payloads);
+        }
+    }
+
+    private static void AssertContentTypeRefreshPayload(ContentTypeCacheRefresher.JsonPayload[]? refreshedPayloads, int expectedContentTypeId, ContentTypeChangeTypes expectedChangeTypes)
+    {
+        Assert.IsNotNull(refreshedPayloads);
+        Assert.AreEqual(1, refreshedPayloads.Length);
+        Assert.Multiple(() =>
+        {
+            var payload = refreshedPayloads.First();
+            Assert.AreEqual(expectedContentTypeId, payload.Id);
+            Assert.AreEqual(expectedChangeTypes, payload.ChangeTypes);
+            Assert.AreEqual(nameof(IContentType), payload.ItemType);
+        });
+    }
 }

tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ContentTypeChangeExtensionsTests.cs

@@ -0,0 +1,31 @@
+using NUnit.Framework;
+using Umbraco.Cms.Core.Services.Changes;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions;
+
+[TestFixture]
+public class ContentTypeChangeExtensionsTests
+{
+    [TestCase(ContentTypeChangeTypes.RefreshMain, true)]
+    [TestCase(ContentTypeChangeTypes.RefreshMain | ContentTypeChangeTypes.RefreshOther, true)]
+    [TestCase(ContentTypeChangeTypes.RefreshMain | ContentTypeChangeTypes.Create, true)]
+    [TestCase(ContentTypeChangeTypes.RefreshOther, false)]
+    [TestCase(ContentTypeChangeTypes.None, false)]
+    [TestCase(ContentTypeChangeTypes.Create, false)]
+    [TestCase(ContentTypeChangeTypes.Remove, false)]
+    [TestCase(ContentTypeChangeTypes.RefreshOther | ContentTypeChangeTypes.Remove, false)]
+    public void IsStructuralChange(ContentTypeChangeTypes change, bool expected) =>
+        Assert.AreEqual(expected, change.IsStructuralChange());
+
+    [TestCase(ContentTypeChangeTypes.RefreshOther, true)]
+    [TestCase(ContentTypeChangeTypes.RefreshOther | ContentTypeChangeTypes.Create, true)]
+    [TestCase(ContentTypeChangeTypes.RefreshOther | ContentTypeChangeTypes.Remove, true)]
+    [TestCase(ContentTypeChangeTypes.RefreshMain, false)]
+    [TestCase(ContentTypeChangeTypes.RefreshMain | ContentTypeChangeTypes.RefreshOther, false)]
+    [TestCase(ContentTypeChangeTypes.None, false)]
+    [TestCase(ContentTypeChangeTypes.Create, false)]
+    [TestCase(ContentTypeChangeTypes.Remove, false)]
+    public void IsNonStructuralChange(ContentTypeChangeTypes change, bool expected) =>
+        Assert.AreEqual(expected, change.IsNonStructuralChange());
+}

tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.IO;
 using System.Text;
 using Microsoft.Extensions.Logging;
 using Moq;
@@ -14,11 +13,6 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.IO;
 [TestFixture]
 public class PhysicalFileSystemTests : AbstractFileSystemTests
 {
-    [SetUp]
-    public void Setup()
-    {
-    }
-
     [TearDown]
     public void TearDown()
     {
@@ -44,22 +38,10 @@ public class PhysicalFileSystemTests : AbstractFileSystemTests
             Mock.Of<ILogger<PhysicalFileSystem>>(),
             Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests"),
             "/Media/"))
-    {
-    }
+    { }
 
     protected override string ConstructUrl(string path) => "/Media/" + path;
 
-    private string Repeat(string pattern, int count)
-    {
-        var text = new StringBuilder();
-        for (var i = 0; i < count; i++)
-        {
-            text.Append(pattern);
-        }
-
-        return text.ToString();
-    }
-
     [Test]
     public void SaveFileTest()
     {
@@ -70,16 +52,7 @@ public class PhysicalFileSystemTests : AbstractFileSystemTests
             _fileSystem.AddFile("sub/f3.txt", ms);
         }
 
-        Assert.IsTrue(File.Exists(Path.Combine(basePath, "sub/f3.txt")));
-
-        var path = Repeat("bah/bah/", 50);
-        Assert.Less(260, path.Length);
-
-        Assert.Throws<PathTooLongException>(() =>
-        {
-            using var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo"));
-            _fileSystem.AddFile(path + "f3.txt", ms);
-        });
+        Assert.IsTrue(File.Exists(Path.Combine(basePath, "sub", "f3.txt")));
     }
 
     [Test]
@@ -98,28 +71,18 @@ public class PhysicalFileSystemTests : AbstractFileSystemTests
         // - does throw on invalid paths
         // works
         var path = _fileSystem.GetFullPath("foo.tmp");
-        Assert.AreEqual(Path.Combine(basePath, @"foo.tmp"), path);
+        Assert.AreEqual(Path.Combine(basePath, "foo.tmp"), path);
 
-        // a very long relative path, which ends up being a short path, works
-        path = Repeat("bah/../", 50);
-        Assert.Less(260, path.Length);
+        // normalize path with parent directory references
+        path = "foo/../bar/../bah/../";
         path = _fileSystem.GetFullPath(path + "foo.tmp");
-        Assert.AreEqual(Path.Combine(basePath, @"foo.tmp"), path);
+        Assert.AreEqual(Path.Combine(basePath, "foo.tmp"), path);
 
         // works too
         path = _fileSystem.GetFullPath("foo/bar.tmp");
-        Assert.AreEqual(Path.Combine(basePath, @$"foo{Path.DirectorySeparatorChar}bar.tmp"), path);
+        Assert.AreEqual(Path.Combine(basePath, "foo", "bar.tmp"), path);
 
         // that path is invalid as it would be outside the root directory
         Assert.Throws<UnauthorizedAccessException>(() => _fileSystem.GetFullPath("../../foo.tmp"));
-
-        // a very long path, which ends up being very long, works
-        path = Repeat("bah/bah/", 50);
-        Assert.Less(260, path.Length);
-        Assert.Throws<PathTooLongException>(() =>
-        {
-            path = _fileSystem.GetFullPath(path + "foo.tmp");
-            Assert.Less(260, path.Length); // gets a >260 path and it's fine (but Windows will not like it)
-        });
     }
 }

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "13.13.0-rc2",
+  "version": "13.15.0-rc",
   "assemblyVersion": {
     "precision": "build"
   },