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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
This commit is contained in:
Shannon
2020-11-18 16:02:51 +11:00
parent 7e36bf55b5 dd5f400cf3
commit 99247d7fbe
153 changed files with 1147 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
View File

@@ -1,9 +1,7 @@
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Core.Configuration;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Composing;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.ModelsBuilder.Embedded.Building;
@@ -13,7 +11,6 @@ using Microsoft.Extensions.Options;
namespace Umbraco.ModelsBuilder.Embedded.Compose
{
[ComposeBefore(typeof(IPublishedCacheComposer))]
[RuntimeLevel(MinLevel = RuntimeLevel.Run)]
public sealed class ModelsBuilderComposer : ICoreComposer
{
public void Compose(Composition composition)