Skip to content

Commit 21779b1

Browse files
committed
Update dependencies and refactor service extensions
- Bump TinyHelpers and EF Core package versions in project files. - Refactor ServiceCollectionExtensions: ensure all methods are public static extensions, improve method signatures, and clean up code for clarity.
1 parent e09bbaa commit 21779b1

File tree

4 files changed

+48
-51
lines changed

4 files changed

+48
-51
lines changed

samples/TinyHelpers.EntityFrameworkCore.Sample/TinyHelpers.EntityFrameworkCore.Sample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.2" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

src/TinyHelpers.AspNetCore/Extensions/ServiceCollectionExtensions.cs

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -13,62 +13,59 @@ namespace TinyHelpers.AspNetCore.Extensions;
1313

1414
public static class ServiceCollectionExtensions
1515
{
16-
extension(IServiceCollection services)
16+
public static T? ConfigureAndGet<T>(this IServiceCollection services, IConfiguration configuration, string sectionName) where T : class
1717
{
18-
public T? ConfigureAndGet<T>(IConfiguration configuration, string sectionName) where T : class
19-
{
20-
var section = configuration.GetSection(sectionName);
21-
var settings = section.Get<T>();
22-
services.Configure<T>(section);
18+
var section = configuration.GetSection(sectionName);
19+
var settings = section.Get<T>();
20+
services.Configure<T>(section);
2321

24-
return settings;
25-
}
22+
return settings;
23+
}
2624

27-
public IServiceCollection AddRequestLocalization(params string[] cultures)
28-
=> services.AddRequestLocalization(cultures, null);
25+
public static IServiceCollection AddRequestLocalization(this IServiceCollection services, params string[] cultures)
26+
=> services.AddRequestLocalization(cultures, null);
2927

30-
public IServiceCollection AddRequestLocalization(IEnumerable<string> cultures, Action<IList<IRequestCultureProvider>>? providersConfiguration)
31-
{
32-
var supportedCultures = cultures.Select(c => new CultureInfo(c)).ToList();
33-
34-
services.Configure<RequestLocalizationOptions>(options =>
35-
{
36-
options.SupportedCultures = supportedCultures;
37-
options.SupportedUICultures = supportedCultures;
38-
options.DefaultRequestCulture = new RequestCulture(supportedCultures.First());
39-
providersConfiguration?.Invoke(options.RequestCultureProviders);
40-
});
41-
42-
return services;
43-
}
44-
45-
public IServiceCollection Replace<TService, TImplementation>(ServiceLifetime lifetime = ServiceLifetime.Scoped)
46-
where TService : class
47-
where TImplementation : class, TService
28+
public static IServiceCollection AddRequestLocalization(this IServiceCollection services, IEnumerable<string> cultures, Action<IList<IRequestCultureProvider>>? providersConfiguration)
29+
{
30+
var supportedCultures = cultures.Select(c => new CultureInfo(c)).ToList();
31+
32+
services.Configure<RequestLocalizationOptions>(options =>
4833
{
49-
services.Replace(new ServiceDescriptor(serviceType: typeof(TService), implementationType: typeof(TImplementation), lifetime));
34+
options.SupportedCultures = supportedCultures;
35+
options.SupportedUICultures = supportedCultures;
36+
options.DefaultRequestCulture = new RequestCulture(supportedCultures.First());
37+
providersConfiguration?.Invoke(options.RequestCultureProviders);
38+
});
5039

51-
return services;
52-
}
40+
return services;
41+
}
5342

54-
public IServiceCollection AddDefaultProblemDetails()
55-
{
56-
services.AddProblemDetails(options =>
57-
{
58-
options.CustomizeProblemDetails = context => context.UseDefaults();
59-
});
43+
public static IServiceCollection Replace<TService, TImplementation>(this IServiceCollection services, ServiceLifetime lifetime = ServiceLifetime.Scoped)
44+
where TService : class
45+
where TImplementation : class, TService
46+
{
47+
services.Replace(new ServiceDescriptor(serviceType: typeof(TService), implementationType: typeof(TImplementation), lifetime));
6048

61-
return services;
62-
}
49+
return services;
50+
}
6351

64-
public IServiceCollection AddDefaultExceptionHandler()
52+
public static IServiceCollection AddDefaultProblemDetails(this IServiceCollection services)
53+
{
54+
services.AddProblemDetails(options =>
6555
{
66-
// Ensures that the ProblemDetails service is registered.
67-
services.AddProblemDetails();
56+
options.CustomizeProblemDetails = context => context.UseDefaults();
57+
});
58+
59+
return services;
60+
}
61+
62+
public static IServiceCollection AddDefaultExceptionHandler(this IServiceCollection services)
63+
{
64+
// Ensures that the ProblemDetails service is registered.
65+
services.AddProblemDetails();
6866

69-
services.AddExceptionHandler<DefaultExceptionHandler>();
70-
return services;
71-
}
67+
services.AddExceptionHandler<DefaultExceptionHandler>();
68+
return services;
7269
}
7370

7471
public static void UseDefaults(this ProblemDetailsContext context)

src/TinyHelpers.Dapper/TinyHelpers.Dapper.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Dapper" Version="2.1.66" />
25-
<PackageReference Include="TinyHelpers" Version="3.3.14" />
25+
<PackageReference Include="TinyHelpers" Version="3.3.15" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

src/TinyHelpers.EntityFrameworkCore/TinyHelpers.EntityFrameworkCore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="TinyHelpers" Version="3.3.14" />
24+
<PackageReference Include="TinyHelpers" Version="3.3.15" />
2525
</ItemGroup>
2626

2727
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.22" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.23" />
2929
</ItemGroup>
3030

3131
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.11" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.12" />
3333
</ItemGroup>
3434

3535
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.2" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

0 commit comments

Comments
 (0)