yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v10/dev' into release/10.8

Browse Source 
# Conflicts:
#	version.json
This commit is contained in:
Bjarke Berg
2023-11-09 13:53:46 +01:00
parent ddb26632f9 919138c299
commit 00bb5170a0
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
global.json Normal file
View File

@@ -0,0 +1,6 @@
{
"sdk": {
"version": "6.0.300",
"rollForward": "latestFeature"
}
}

3
src/Umbraco.Core/Services/ContentService.cs
View File

@@ -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();
}
}

9
src/Umbraco.Infrastructure/Cache/DistributedCacheBinder_Handlers.cs
View File

@@ -67,15 +67,6 @@ public class DistributedCacheBinder :
_distributedCache.RefreshContentCache(notification.Changes.ToArray());
}
// private void ContentService_SavedBlueprint(IContentService sender, SaveEventArgs<IContent> e)
// {
// _distributedCache.RefreshUnpublishedPageCache(e.SavedEntities.ToArray());
// }
// private void ContentService_DeletedBlueprint(IContentService sender, DeleteEventArgs<IContent> e)
// {
// _distributedCache.RemoveUnpublishedPageCache(e.DeletedEntities.ToArray());
// }
#endregion
#region LocalizationService / Dictionary

2
src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html
View File

@@ -3,7 +3,7 @@
<p>
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
<a href="https://docs.umbraco.com/umbraco-cms/fundamentals/setup/server-setup/permissions"><strong>here</strong></a>.
<a href="https://docs.umbraco.com/umbraco-cms/v/10.latest-lts/fundamentals/setup/server-setup/permissions"><strong>here</strong></a>.
</p>
<p>
The following report list the permissions that are currently failing. Once the permissions are fixed press the 'Go back' button to restart the installation.

8
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -11,14 +11,6 @@
<ProjectReference Include="..\Umbraco.Cms.ManagementApi\Umbraco.Cms.ManagementApi.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
<PackageReference Include="Umbraco.Code" Version="2.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
<RuntimeHostConfigurationOption Condition="$(RuntimeIdentifier.StartsWith('linux')) Or $(RuntimeIdentifier.StartsWith('win')) Or ('$(RuntimeIdentifier)' == '' And !$([MSBuild]::IsOSPlatform('osx')))" Include="System.Globalization.AppLocalIcu" Value="68.2.0.9" />
</ItemGroup>
<ItemGroup>
<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />