Skip to content

Commit 17283c5

Browse files
authored
fix: compatibility issues (#345)
* fix: use null redactor if not injected * chore: upgrade packages
1 parent e73c351 commit 17283c5

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.2" />
14+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" />
1515
</ItemGroup>
1616

1717
</Project>

src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@
1111
<SupportedPlatform Include="browser"/>
1212
</ItemGroup>
1313

14-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
15-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
16-
</ItemGroup>
17-
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
19-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
20-
</ItemGroup>
21-
2214
<ItemGroup>
2315
<Compile Include="..\Cnblogs.Architecture.Ddd.Cqrs.AspNetCore\CqrsHeaderNames.cs">
2416
<Link>CqrsHeaderNames.cs</Link>
@@ -29,6 +21,7 @@
2921
</ItemGroup>
3022

3123
<ItemGroup>
24+
<PackageReference Include="Microsoft.Extensions.Compliance.Redaction" Version="10.0.0" />
3225
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
3326
</ItemGroup>
3427
</Project>

src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/InjectExtensions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System.Net.Http.Headers;
22
using Cnblogs.Architecture.Ddd.Cqrs.AspNetCore;
3+
using Microsoft.Extensions.Compliance.Redaction;
34
using Microsoft.Extensions.DependencyInjection;
5+
using Microsoft.Extensions.DependencyInjection.Extensions;
46
using Microsoft.Extensions.Http.Logging;
57
using Microsoft.Extensions.Http.Resilience;
68

@@ -27,6 +29,7 @@ public static IHttpClientBuilder AddServiceAgent<TClient>(
2729
Action<HttpStandardResilienceOptions>? pollyConfigure = null)
2830
where TClient : class
2931
{
32+
services.TryAddSingleton<IRedactorProvider, NullRedactorProvider>();
3033
var builder = services.AddHttpClient<TClient>(h =>
3134
{
3235
h.BaseAddress = new Uri(baseUri);
@@ -55,6 +58,7 @@ public static IHttpClientBuilder AddServiceAgent<TClient, TImplementation>(
5558
where TClient : class
5659
where TImplementation : class, TClient
5760
{
61+
services.TryAddSingleton<IRedactorProvider, NullRedactorProvider>();
5862
var builder = services.AddHttpClient<TClient, TImplementation>(h =>
5963
{
6064
h.BaseAddress = new Uri(baseUri);

src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="StackExchange.Redis" Version="2.9.32" />
15+
<PackageReference Include="StackExchange.Redis" Version="2.10.1" />
1616
</ItemGroup>
1717

1818
</Project>

src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj

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

1212
<ItemGroup>
13-
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
13+
<PackageReference Include="MongoDB.Driver" Version="3.5.1" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

0 commit comments

Comments
 (0)