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

Merge branch 'v9/dev' into v9/feature/update-imagesharp-web

Browse Source 
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/users.ts
#	src/Umbraco.Web.UI/umbraco/config/lang/cy.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	tests/Umbraco.Tests.AcceptanceTest/cypress/integration/DataTypes/dataTypes.ts
This commit is contained in:
Nikolaj Geisle
2021-11-24 09:11:52 +01:00
parent 83db6f5c5d 351c37abc0
commit e0701ccd48
1145 changed files with 39283 additions and 30835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web.Common/DependencyInjection/ScopedServiceProvider.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using Microsoft.AspNetCore.Http;
using Umbraco.Cms.Core.DependencyInjection;
namespace Umbraco.Cms.Web.Common.DependencyInjection
{
/// <inheritdoc />
internal class ScopedServiceProvider : IScopedServiceProvider
{
private readonly IHttpContextAccessor _accessor;
public ScopedServiceProvider(IHttpContextAccessor accessor) => _accessor = accessor;
/// <inheritdoc />
public IServiceProvider ServiceProvider => _accessor.HttpContext?.RequestServices;
}
}

2
src/Umbraco.Web.Common/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -176,6 +176,7 @@ namespace Umbraco.Extensions
builder.Services.AddHostedService<HealthCheckNotifier>();
builder.Services.AddHostedService<KeepAlive>();
builder.Services.AddHostedService<LogScrubber>();
builder.Services.AddHostedService<ContentVersionCleanup>();
builder.Services.AddHostedService<ScheduledPublishing>();
builder.Services.AddHostedService<TempFileCleanup>();
builder.Services.AddHostedService<InstructionProcessTask>();
@@ -348,6 +349,7 @@ namespace Umbraco.Extensions
builder.Services.AddSingleton<ContentModelBinder>();
builder.Services.AddSingleton<IUmbracoHelperAccessor, UmbracoHelperAccessor>();
builder.Services.AddSingleton<IScopedServiceProvider, ScopedServiceProvider>();
builder.Services.AddScoped<UmbracoHelper>();
builder.Services.AddScoped<IBackOfficeSecurity, BackOfficeSecurity>();