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

Remove BuildServiceProvider call from UmbracoWebServiceCollectionExtensions (#9372)

Browse Source
This commit is contained in:
Paul Johnson
2020-11-10 19:04:29 +00:00
committed by GitHub
parent b4ce2873cc
commit 8775770d76
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ namespace Umbraco.Web.Common.Builder
=> builder.AddWith(nameof(WithRuntimeMinifier), () => builder.Services.AddUmbracoRuntimeMinifier(builder.Config));
public static IUmbracoBuilder WithWebComponents(this IUmbracoBuilder builder)
=> builder.AddWith(nameof(WithWebComponents), () => builder.Services.AddUmbracoWebComponents());
=> builder.AddWith(nameof(WithWebComponents), () => builder.Services.AddUmbracoWebComponents(builder.Config));
public static IUmbracoBuilder WithWebServer(this IUmbracoBuilder builder)
=> builder.AddWith(nameof(WithWebServer), () =>

17
src/Umbraco.Web.Common/Extensions/UmbracoWebServiceCollectionExtensions.cs
View File

@@ -25,17 +25,14 @@ namespace Umbraco.Extensions
/// Registers the web components needed for Umbraco
/// </summary>
/// <param name="services"></param>
/// <param name="configuration"></param>
/// <returns></returns>
public static IServiceCollection AddUmbracoWebComponents(this IServiceCollection services)
public static IServiceCollection AddUmbracoWebComponents(this IServiceCollection services, IConfiguration configuration)
{
services.ConfigureOptions<UmbracoMvcConfigureOptions>();
services.TryAddEnumerable(ServiceDescriptor.Transient<IApplicationModelProvider, UmbracoApiBehaviorApplicationModelProvider>());
services.TryAddEnumerable(ServiceDescriptor.Transient<IApplicationModelProvider, BackOfficeApplicationModelProvider>());
// TODO: We need to avoid this, surely there's a way? See ContainerTests.BuildServiceProvider_Before_Host_Is_Configured
var serviceProvider = services.BuildServiceProvider();
var imagingSettings = serviceProvider.GetService<IOptions<ImagingSettings>>().Value;
services.AddUmbracoImageSharp(imagingSettings);
services.AddUmbracoImageSharp(configuration);
return services;
}
@@ -44,10 +41,12 @@ namespace Umbraco.Extensions
/// Adds Image Sharp with Umbraco settings
/// </summary>
/// <param name="services"></param>
/// <param name="imagingSettings"></param>
/// <param name="configuration"></param>
/// <returns></returns>
public static IServiceCollection AddUmbracoImageSharp(this IServiceCollection services, ImagingSettings imagingSettings)
public static IServiceCollection AddUmbracoImageSharp(this IServiceCollection services, IConfiguration configuration)
{
var imagingSettings = configuration.GetSection(Core.Constants.Configuration.ConfigImaging)
.Get<ImagingSettings>() ?? new ImagingSettings();
services.AddImageSharp(options =>
{
@@ -62,7 +61,7 @@ namespace Umbraco.Extensions
return Task.CompletedTask;
};
options.OnBeforeSaveAsync = _ => Task.CompletedTask;
options.OnBeforeSaveAsync = _ => Task.CompletedTask;
options.OnProcessedAsync = _ => Task.CompletedTask;
options.OnPrepareResponseAsync = _ => Task.CompletedTask;
})