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 v10/dev

Browse Source 
# Conflicts:
#	build/build.ps1
#	build/templates/UmbracoPackage/.template.config/template.json
#	build/templates/UmbracoProject/.template.config/dotnetcli.host.json
#	build/templates/UmbracoProject/.template.config/ide.host.json
#	build/templates/UmbracoProject/.template.config/template.json
#	src/Umbraco.Core/Constants-System.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	umbraco-netcore-only.sln
This commit is contained in:
Bjarke Berg
2022-04-20 11:09:28 +02:00
parent d036c6a118 7becf76a02
commit 23a49161d6
171 changed files with 4661 additions and 1695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
View File

@@ -55,6 +55,7 @@ using Umbraco.Cms.Infrastructure.Runtime;
using Umbraco.Cms.Infrastructure.Scoping;
using Umbraco.Cms.Infrastructure.Search;
using Umbraco.Cms.Infrastructure.Serialization;
using Umbraco.Cms.Infrastructure.Services.Implement;
using Umbraco.Extensions;
namespace Umbraco.Cms.Infrastructure.DependencyInjection
@@ -201,6 +202,7 @@ namespace Umbraco.Cms.Infrastructure.DependencyInjection
builder.Services.AddSingleton<PackageDataInstallation>();
builder.Services.AddTransient<INodeCountService, NodeCountService>();
builder.AddInstaller();
// Services required to run background jobs (with out the handler)

3
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
View File

@@ -47,6 +47,9 @@ namespace Umbraco.Cms.Infrastructure.DependencyInjection
builder.Services.AddSingleton<PackageDataInstallation>();
builder.Services.AddUnique<IPackageInstallation, PackageInstallation>();
builder.Services.AddUnique<IHtmlMacroParameterParser, HtmlMacroParameterParser>();
builder.Services.AddTransient<IExamineIndexCountService, ExamineIndexCountService>();
builder.Services.AddUnique<IUserDataService, SystemInformationTelemetryProvider>();
builder.Services.AddTransient<IUsageInformationService, UsageInformationService>();
return builder;
}

25
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.TelemetryProviders.cs Normal file
View File

@@ -0,0 +1,25 @@
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Infrastructure.Telemetry.Interfaces;
using Umbraco.Cms.Infrastructure.Telemetry.Providers;
namespace Umbraco.Cms.Infrastructure.DependencyInjection
{
public static class UmbracoBuilder_TelemetryProviders
{
public static IUmbracoBuilder AddTelemetryProviders(this IUmbracoBuilder builder)
{
builder.Services.AddTransient<IDetailedTelemetryProvider, ContentTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, DomainTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, ExamineTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, LanguagesTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, MacroTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, MediaTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, NodeCountTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, PropertyEditorTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, UserTelemetryProvider>();
builder.Services.AddTransient<IDetailedTelemetryProvider, SystemInformationTelemetryProvider>();
return builder;
}
}
}