Browse Source

Fix: AbpAspNetCoreApplicationBuilderExtensions

Always should configure endpoints if additionalConfigurationAction is not null.
pull/16958/head
Halil İbrahim Kalkan 3 years ago
parent
commit
a85293e295
  1. 17
      framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpAspNetCoreApplicationBuilderExtensions.cs

17
framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpAspNetCoreApplicationBuilderExtensions.cs

@ -23,7 +23,7 @@ public static class AbpAspNetCoreApplicationBuilderExtensions
.GetRequiredService<IOptions<AbpEndpointRouterOptions>>() .GetRequiredService<IOptions<AbpEndpointRouterOptions>>()
.Value; .Value;
if (!options.EndpointConfigureActions.Any()) if (!options.EndpointConfigureActions.Any() && additionalConfigurationAction == null)
{ {
return app; return app;
} }
@ -32,15 +32,18 @@ public static class AbpAspNetCoreApplicationBuilderExtensions
{ {
using (var scope = app.ApplicationServices.CreateScope()) using (var scope = app.ApplicationServices.CreateScope())
{ {
var context = new EndpointRouteBuilderContext(endpoints, scope.ServiceProvider); if (options.EndpointConfigureActions.Any())
foreach (var configureAction in options.EndpointConfigureActions)
{ {
configureAction(context); var context = new EndpointRouteBuilderContext(endpoints, scope.ServiceProvider);
}
additionalConfigurationAction?.Invoke(endpoints); foreach (var configureAction in options.EndpointConfigureActions)
{
configureAction(context);
}
}
} }
additionalConfigurationAction?.Invoke(endpoints);
}); });
} }
} }

Loading…
Cancel
Save