Skip to content

Commit 7db2932

Browse files
committed
Some dependencies changed for more flexibility
1 parent ebd6b85 commit 7db2932

File tree

4 files changed

+15
-24
lines changed

4 files changed

+15
-24
lines changed

src/Calabonga.AspNetCore.AppDefinitions/AppDefinition.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using Microsoft.AspNetCore.Builder;
2-
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.Extensions.Configuration;
42
using Microsoft.Extensions.DependencyInjection;
53

64
namespace Calabonga.AspNetCore.AppDefinitions;
@@ -13,16 +11,15 @@ public abstract class AppDefinition : IAppDefinition
1311
/// <summary>
1412
/// Configure services for current application
1513
/// </summary>
16-
/// <param name="services"></param>
17-
/// <param name="configuration"></param>
18-
public virtual void ConfigureServices(IServiceCollection services, IConfiguration configuration) { }
14+
/// <param name="services">instance of <see cref="IServiceCollection"/></param>
15+
/// <param name="builder">instance of <see cref="WebApplicationBuilder"/></param>
16+
public virtual void ConfigureServices(IServiceCollection services, WebApplicationBuilder builder) { }
1917

2018
/// <summary>
2119
/// Configure application for current application
2220
/// </summary>
2321
/// <param name="app"></param>
24-
/// <param name="env"></param>
25-
public virtual void ConfigureApplication(WebApplication app, IWebHostEnvironment env) { }
22+
public virtual void ConfigureApplication(WebApplication app) { }
2623

2724
/// <summary>
2825
/// Order index for including into pipeline. Default value is 0 for, that's why order index can be undefined.

src/Calabonga.AspNetCore.AppDefinitions/AppDefinitionExtensions.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static void AddDefinitions(this IServiceCollection source, WebApplication
3636
definitions.AddRange(instancesOrdered);
3737
}
3838

39-
definitions.ForEach(app => app.ConfigureServices(source, builder.Configuration));
39+
definitions.ForEach(app => app.ConfigureServices(source, builder));
4040
source.AddSingleton(definitions as IReadOnlyCollection<IAppDefinition>);
4141

4242
}
@@ -53,17 +53,14 @@ public static void UseDefinitions(this WebApplication source)
5353
{
5454
var logger = source.Services.GetRequiredService<ILogger<AppDefinition>>();
5555
var environment = source.Services.GetRequiredService<IWebHostEnvironment>();
56-
5756
var definitions = source.Services.GetRequiredService<IReadOnlyCollection<IAppDefinition>>();
5857
var instancesOrdered = definitions.Where(x => x.Enabled).OrderBy(x => x.OrderIndex).ToList();
59-
foreach (var endpoint in instancesOrdered)
60-
{
61-
endpoint.ConfigureApplication(source, environment);
62-
}
58+
59+
instancesOrdered.ForEach(x => x.ConfigureApplication(source));
6360

6461
if (environment.IsDevelopment())
6562
{
66-
logger.LogDebug("Total application definitions configured {0}", instancesOrdered.Count());
63+
logger.LogDebug("Total application definitions configured {0}", instancesOrdered.Count);
6764
}
6865
}
6966

src/Calabonga.AspNetCore.AppDefinitions/Calabonga.AspNetCore.AppDefinitions.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
88
<Title>Calabonga.AspNetCore.AppDefinitions</Title>
9-
<Version>1.0.0</Version>
9+
<Version>1.1.0</Version>
1010
<Authors>Calabonga</Authors>
1111
<Company>Calabonga Soft</Company>
1212
<Product>Calabonga.AspNetCore.AppDefinitions</Product>
1313
<Description>Application Definitions base classes. The small but very helpful packege that can help you to organize your ASP.NET Core application.</Description>
14-
<Copyright>Calabonga</Copyright>
14+
<Copyright>Calabonga SOFT 2001-2022</Copyright>
1515
<PackageProjectUrl>https://github.com/Calabonga/Calabonga.AspNetCore.AppDefinitions</PackageProjectUrl>
1616
<PackageIcon>logo.png</PackageIcon>
1717
<PackageReadmeFile>README.md</PackageReadmeFile>
1818
<RepositoryUrl>https://github.com/Calabonga/Calabonga.AspNetCore.AppDefinitions</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<PackageTags>calabonga;architecture;definitions;minimal-api;nimble-framework</PackageTags>
21-
<PackageReleaseNotes>First release</PackageReleaseNotes>
21+
<PackageReleaseNotes>Some dependencies changed for more flexibility.</PackageReleaseNotes>
2222
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2323
</PropertyGroup>
2424

src/Calabonga.AspNetCore.AppDefinitions/IAppDefinition.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using Microsoft.AspNetCore.Builder;
2-
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.Extensions.Configuration;
42
using Microsoft.Extensions.DependencyInjection;
53

64
namespace Calabonga.AspNetCore.AppDefinitions;
@@ -13,16 +11,15 @@ internal interface IAppDefinition
1311
/// <summary>
1412
/// Configure services for current application
1513
/// </summary>
16-
/// <param name="services"></param>
17-
/// <param name="configuration"></param>
18-
void ConfigureServices(IServiceCollection services, IConfiguration configuration);
14+
/// <param name="services">instance of <see cref="IServiceCollection"/></param>
15+
/// <param name="builder">instance of <see cref="WebApplicationBuilder"/></param>
16+
void ConfigureServices(IServiceCollection services, WebApplicationBuilder builder);
1917

2018
/// <summary>
2119
/// Configure application for current application
2220
/// </summary>
2321
/// <param name="app"></param>
24-
/// <param name="env"></param>
25-
void ConfigureApplication(WebApplication app, IWebHostEnvironment env);
22+
void ConfigureApplication(WebApplication app);
2623

2724
/// <summary>
2825
/// Order index for including into pipeline. Default value is 0 for, that's why order index can be undefined.

0 commit comments

Comments
 (0)