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

Merge remote-tracking branch 'origin/v9/dev' into netcore/feature/get_rid_of_ICoreComposer

Browse Source 
# Conflicts:
#	src/Umbraco.Examine.Lucene/ExamineLuceneComposer.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneConfigureIndexes.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneFinalComposer.cs
#	src/Umbraco.Examine.Lucene/ExamineLuceneStarting.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComposer.cs
#	src/Umbraco.PublishedCache.NuCache/Compose/NotificationsComposer.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
This commit is contained in:
Bjarke Berg
2021-06-15 19:10:30 +02:00
parent 2afa7201ce 067395b0ff
commit 575e66b8eb
969 changed files with 28924 additions and 24595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs
View File

@@ -9,6 +9,7 @@ using Umbraco.Cms.Web.BackOffice.Security;
using Umbraco.Cms.Web.Common.Authorization;
using Umbraco.Cms.Web.Common.Security;
using Umbraco.Cms.Core.Actions;
using Umbraco.Cms.Core.Notifications;
using Umbraco.Cms.Web.BackOffice.Authorization;

16
src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -5,11 +5,14 @@ using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Notifications;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Infrastructure.DependencyInjection;
using Umbraco.Cms.Infrastructure.Examine.DependencyInjection;
using Umbraco.Cms.Infrastructure.WebAssets;
using Umbraco.Cms.Web.BackOffice.Controllers;
using Umbraco.Cms.Web.BackOffice.Filters;
using Umbraco.Cms.Web.BackOffice.Install;
using Umbraco.Cms.Web.BackOffice.Middleware;
using Umbraco.Cms.Web.BackOffice.ModelsBuilder;
using Umbraco.Cms.Web.BackOffice.Routing;
@@ -43,12 +46,20 @@ namespace Umbraco.Extensions
.AddWebServer()
.AddPreviewSupport()
.AddHostedServices()
.AddNuCache()
.AddDistributedCache()
.AddModelsBuilderDashboard()
.AddUnattedInstallCreateUser()
.AddUnattendedInstallInstallCreateUser()
.AddCoreNotifications()
.AddLogViewer()
.AddExamine();
.AddExamine()
.AddExamineIndexes();
public static IUmbracoBuilder AddUnattendedInstallInstallCreateUser(this IUmbracoBuilder builder)
{
builder.AddNotificationAsyncHandler<UnattendedInstallNotification, CreateUnattendedUserNotificationHandler>();
return builder;
}
/// <summary>
/// Adds Umbraco preview support
@@ -71,6 +82,7 @@ namespace Umbraco.Extensions
builder.Services.AddSingleton<KeepAliveMiddleware>();
builder.Services.ConfigureOptions<ConfigureGlobalOptionsForKeepAliveMiddlware>();
builder.Services.AddUnique<ServerVariablesParser>();
builder.Services.AddUnique<InstallAreaRoutes>();
builder.Services.AddUnique<BackOfficeAreaRoutes>();
builder.Services.AddUnique<PreviewRoutes>();
builder.AddNotificationAsyncHandler<ContentCacheRefresherNotification, PreviewHubUpdater>();