* Rename Umbraco.Core namespace to Umbraco.Cms.Core * Move extension methods in core project to Umbraco.Extensions * Move extension methods in core project to Umbraco.Extensions * Rename Umbraco.Examine namespace to Umbraco.Cms.Examine * Move examine extensions to Umbraco.Extensions namespace * Reflect changed namespaces in Builder and fix unit tests * Adjust namespace in Umbraco.ModelsBuilder.Embedded * Adjust namespace in Umbraco.Persistence.SqlCe * Adjust namespace in Umbraco.PublishedCache.NuCache * Align namespaces in Umbraco.Web.BackOffice * Align namespaces in Umbraco.Web.Common * Ensure that SqlCeSupport is still enabled after changing the namespace * Align namespaces in Umbraco.Web.Website * Align namespaces in Umbraco.Web.UI.NetCore * Align namespaces in Umbraco.Tests.Common * Align namespaces in Umbraco.Tests.UnitTests * Align namespaces in Umbraco.Tests.Integration * Fix errors caused by changed namespaces * Fix integration tests * Undo the Umbraco.Examine.Lucene namespace change This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows. * Fix merge * Fix Merge
38 lines
1.9 KiB
C#
38 lines
1.9 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using Umbraco.Cms.Core.Composing;
|
|
using Umbraco.Cms.Core.IO;
|
|
using Umbraco.Cms.Core.Manifest;
|
|
using Umbraco.Cms.Core.Models.ContentEditing;
|
|
using Umbraco.Cms.Core.Security;
|
|
|
|
namespace Umbraco.Cms.Core.ContentApps
|
|
{
|
|
public class ContentAppFactoryCollectionBuilder : OrderedCollectionBuilderBase<ContentAppFactoryCollectionBuilder, ContentAppFactoryCollection, IContentAppFactory>
|
|
{
|
|
protected override ContentAppFactoryCollectionBuilder This => this;
|
|
|
|
// need to inject dependencies in the collection, so override creation
|
|
public override ContentAppFactoryCollection CreateCollection(IServiceProvider factory)
|
|
{
|
|
// get the logger factory just-in-time - see note below for manifest parser
|
|
var loggerFactory = factory.GetRequiredService<ILoggerFactory>();
|
|
var backOfficeSecurityAccessor = factory.GetRequiredService<IBackOfficeSecurityAccessor>();
|
|
return new ContentAppFactoryCollection(CreateItems(factory), loggerFactory.CreateLogger<ContentAppFactoryCollection>(), backOfficeSecurityAccessor);
|
|
}
|
|
|
|
protected override IEnumerable<IContentAppFactory> CreateItems(IServiceProvider factory)
|
|
{
|
|
// get the manifest parser just-in-time - injecting it in the ctor would mean that
|
|
// simply getting the builder in order to configure the collection, would require
|
|
// its dependencies too, and that can create cycles or other oddities
|
|
var manifestParser = factory.GetRequiredService<IManifestParser>();
|
|
var ioHelper = factory.GetRequiredService<IIOHelper>();
|
|
return base.CreateItems(factory).Concat(manifestParser.Manifest.ContentApps.Select(x => new ManifestContentAppFactory(x, ioHelper)));
|
|
}
|
|
}
|
|
}
|