From a85293e295c56484f8b1661abf7f1d39041d9b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 23 Jun 2023 14:31:57 +0300 Subject: [PATCH] Fix: AbpAspNetCoreApplicationBuilderExtensions Always should configure endpoints if additionalConfigurationAction is not null. --- ...AbpAspNetCoreApplicationBuilderExtensions.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpAspNetCoreApplicationBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpAspNetCoreApplicationBuilderExtensions.cs index 23a73c74c7..684c948975 100644 --- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpAspNetCoreApplicationBuilderExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpAspNetCoreApplicationBuilderExtensions.cs @@ -23,7 +23,7 @@ public static class AbpAspNetCoreApplicationBuilderExtensions .GetRequiredService>() .Value; - if (!options.EndpointConfigureActions.Any()) + if (!options.EndpointConfigureActions.Any() && additionalConfigurationAction == null) { return app; } @@ -32,15 +32,18 @@ public static class AbpAspNetCoreApplicationBuilderExtensions { using (var scope = app.ApplicationServices.CreateScope()) { - var context = new EndpointRouteBuilderContext(endpoints, scope.ServiceProvider); - - foreach (var configureAction in options.EndpointConfigureActions) + if (options.EndpointConfigureActions.Any()) { - configureAction(context); - } + var context = new EndpointRouteBuilderContext(endpoints, scope.ServiceProvider); - additionalConfigurationAction?.Invoke(endpoints); + foreach (var configureAction in options.EndpointConfigureActions) + { + configureAction(context); + } + } } + + additionalConfigurationAction?.Invoke(endpoints); }); } }