Skip to content

fix: compatibility issues #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2025
Merged

fix: compatibility issues #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50f05c7
fix: use null redactor if not injected
ikesnowy Nov 20, 2025
75f9e01
chore: upgrade packages
ikesnowy Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...hitecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.2" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" />
</ItemGroup>

</Project>
9 changes: 1 addition & 8 deletions ...logs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@
<SupportedPlatform Include="browser"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.9" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Cnblogs.Architecture.Ddd.Cqrs.AspNetCore\CqrsHeaderNames.cs">
<Link>CqrsHeaderNames.cs</Link>
Expand All @@ -29,6 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Compliance.Redaction" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.0.0" />
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/InjectExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System.Net.Http.Headers;
using Cnblogs.Architecture.Ddd.Cqrs.AspNetCore;
using Microsoft.Extensions.Compliance.Redaction;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Http.Logging;
using Microsoft.Extensions.Http.Resilience;

Expand All @@ -27,6 +29,7 @@ public static IHttpClientBuilder AddServiceAgent<TClient>(
Action<HttpStandardResilienceOptions>? pollyConfigure = null)
where TClient : class
{
services.TryAddSingleton<IRedactorProvider, NullRedactorProvider>();
var builder = services.AddHttpClient<TClient>(h =>
{
h.BaseAddress = new Uri(baseUri);
Expand Down Expand Up @@ -55,6 +58,7 @@ public static IHttpClientBuilder AddServiceAgent<TClient, TImplementation>(
where TClient : class
where TImplementation : class, TClient
{
services.TryAddSingleton<IRedactorProvider, NullRedactorProvider>();
var builder = services.AddHttpClient<TClient, TImplementation>(h =>
{
h.BaseAddress = new Uri(baseUri);
Expand Down
2 changes: 1 addition & 1 deletion ....CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="StackExchange.Redis" Version="2.9.32" />
<PackageReference Include="StackExchange.Redis" Version="2.10.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...tecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
<PackageReference Include="MongoDB.Driver" Version="3.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down