From d5b1f5875b295e3b5df2e610cfa8cb9a3b4d8594 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 9 Nov 2023 13:38:13 +0100 Subject: [PATCH 1/4] Bump version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index d733b40e8f..364e6e8834 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "10.8.0", + "version": "10.9.0-rc", "assemblyVersion": { "precision": "build" }, From d0be4ab263d3996da9ee68456012b6c70c5dba92 Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 9 Nov 2023 13:51:05 +0100 Subject: [PATCH 2/4] Publish ContentTreeChangeNotification after saving/deleting blueprints (#14898) --- src/Umbraco.Core/Services/ContentService.cs | 3 +++ .../Cache/DistributedCacheBinder_Handlers.cs | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index 262598451a..f324384a3d 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -3568,6 +3568,7 @@ public class ContentService : RepositoryService, IContentService Audit(AuditType.Save, Constants.Security.SuperUserId, content.Id, $"Saved content template: {content.Name}"); scope.Notifications.Publish(new ContentSavedBlueprintNotification(content, evtMsgs)); + scope.Notifications.Publish(new ContentTreeChangeNotification(content, TreeChangeTypes.RefreshNode, evtMsgs)); scope.Complete(); } @@ -3582,6 +3583,7 @@ public class ContentService : RepositoryService, IContentService scope.WriteLock(Constants.Locks.ContentTree); _documentBlueprintRepository.Delete(content); scope.Notifications.Publish(new ContentDeletedBlueprintNotification(content, evtMsgs)); + scope.Notifications.Publish(new ContentTreeChangeNotification(content, TreeChangeTypes.Remove, evtMsgs)); scope.Complete(); } } @@ -3682,6 +3684,7 @@ public class ContentService : RepositoryService, IContentService } scope.Notifications.Publish(new ContentDeletedBlueprintNotification(blueprints, evtMsgs)); + scope.Notifications.Publish(new ContentTreeChangeNotification(blueprints, TreeChangeTypes.Remove, evtMsgs)); scope.Complete(); } } diff --git a/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs index 11119aaf66..0e84c747ac 100644 --- a/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs +++ b/src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs @@ -67,15 +67,6 @@ public class DistributedCacheBinder : _distributedCache.RefreshContentCache(notification.Changes.ToArray()); } - // private void ContentService_SavedBlueprint(IContentService sender, SaveEventArgs e) - // { - // _distributedCache.RefreshUnpublishedPageCache(e.SavedEntities.ToArray()); - // } - - // private void ContentService_DeletedBlueprint(IContentService sender, DeleteEventArgs e) - // { - // _distributedCache.RemoveUnpublishedPageCache(e.DeletedEntities.ToArray()); - // } #endregion #region LocalizationService / Dictionary From ed65645a33ed884ca4fecb419205d9a243f7da3c Mon Sep 17 00:00:00 2001 From: Ronald Barendse Date: Thu, 9 Nov 2023 13:52:21 +0100 Subject: [PATCH 3/4] Add global.json and cleanup UI project file (#14900) * Add global.json with minimum .NET 6.0.5 SDK version and roll forward policy * Clean up UI project file --- global.json | 6 ++++++ src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 0000000000..49d225529c --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "6.0.300", + "rollForward": "latestFeature" + } +} diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index a205bd0efb..b7be2ba90f 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -11,14 +11,6 @@ - - - - - - - - From 919138c299b69e46af19828209fc1062e3dbf4bb Mon Sep 17 00:00:00 2001 From: Rasmus Berntsen Date: Thu, 9 Nov 2023 13:53:18 +0100 Subject: [PATCH 4/4] #14835 Update link on permissionsreport.html (#14872) * #14835 Update link on permissionsreport.html Updated link to permissions page to point to 10-LTS documentation * retrigger checks --------- Co-authored-by: Rasmus Berntsen --- .../src/installer/steps/permissionsreport.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html index f3067e8fb6..ae3d4ed49a 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html @@ -3,7 +3,7 @@

In order to run Umbraco, you'll need to update your permission settings. Detailed information about the correct file and folder permissions for Umbraco can be found - here. + here.

The following report list the permissions that are currently failing. Once the permissions are fixed press the 'Go back' button to restart the installation.