Skip to content

chore: upgrade m.s.e. to 9.0.4 #321

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 1 commit into from
Apr 19, 2025
Merged

chore: upgrade m.s.e. to 9.0.4 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/CacheableRequestBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public async Task<TResponse> Handle(
})
{
// cache disabled
return await next();
return await next(cancellationToken);
}

CacheEntry<TResponse>? result = null;
Expand All @@ -92,7 +92,7 @@ public async Task<TResponse> Handle(
return result.Value;
}

result = new CacheEntry<TResponse>(await next(), _dateTimeProvider.Now().ToUnixTimeSeconds());
result = new CacheEntry<TResponse>(await next(cancellationToken), _dateTimeProvider.Now().ToUnixTimeSeconds());

if (request.LocalCacheBehavior is CacheBehavior.UpdateCacheIfMiss)
{
Expand Down Expand Up @@ -197,4 +197,4 @@ private async Task UpdateCacheEntryAsync(
}
}
}
}
}
4 changes: 2 additions & 2 deletions ...logs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.4" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -16,7 +16,7 @@
</ItemGroup>

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ....Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="MediatR" Version="12.5.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.EventBus.Abstractions\Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapr.AspNetCore" Version="1.15.2" />
<PackageReference Include="Dapr.AspNetCore" Version="1.15.3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...Providers.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.3"/>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4"/>
</ItemGroup>


Expand Down
2 changes: 1 addition & 1 deletion ...ucture.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ClickHouse.Client" Version="7.13.0" />
<PackageReference Include="ClickHouse.Client" Version="7.13.2" />
</ItemGroup>

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

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
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.2.1" />
<PackageReference Include="MongoDB.Driver" Version="3.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.3"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.4" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
38 changes: 19 additions & 19 deletions test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/CacheBehaviorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public async Task CacheBehavior_DisableCache_NotCacheAsync()
local.AddCacheValue("cacheKey", "cacheValue");
var remote = Substitute.For<IRemoteCacheProvider>();
remote.AddCacheValue("cacheKey", "cacheValue");
var behavior = GetBehavior<FakeQuery<string>, string>(new List<ICacheProvider> { local, remote });
var behavior = GetBehavior<FakeQuery<string>, string>([local, remote]);

// Act
var result = await behavior.Handle(
Expand All @@ -33,7 +33,7 @@ public async Task CacheBehavior_DisableCache_NotCacheAsync()
LocalCacheBehavior = CacheBehavior.DisabledCache,
RemoteCacheBehavior = CacheBehavior.DisabledCache
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -45,7 +45,7 @@ public async Task CacheBehavior_EnableLocal_NoCache_UpdateAsync()
{
// Arrange
var local = Substitute.For<ILocalCacheProvider>();
var behavior = GetBehavior<FakeQuery<string>, string>(new List<ICacheProvider> { local });
var behavior = GetBehavior<FakeQuery<string>, string>([local]);

// Act
var result = await behavior.Handle(
Expand All @@ -55,7 +55,7 @@ public async Task CacheBehavior_EnableLocal_NoCache_UpdateAsync()
LocalExpires = TimeSpan.FromSeconds(1),
RemoteCacheBehavior = CacheBehavior.DisabledCache
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -70,7 +70,7 @@ public async Task CacheBehavior_EnableLocal_HasCache_UseCacheAsync()
var local = Substitute.For<ILocalCacheProvider>();
local.AddCacheValue("cacheKey", "cacheValue");
var remote = Substitute.For<IRemoteCacheProvider>();
var behavior = GetBehavior<FakeQuery<string>, string>(new List<ICacheProvider> { local, remote });
var behavior = GetBehavior<FakeQuery<string>, string>([local, remote]);

// Act
var result = await behavior.Handle(
Expand All @@ -80,7 +80,7 @@ public async Task CacheBehavior_EnableLocal_HasCache_UseCacheAsync()
LocalExpires = TimeSpan.FromSeconds(1),
RemoteCacheBehavior = CacheBehavior.DisabledCache
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -95,7 +95,7 @@ public async Task CacheBehavior_EnableRemote_NoCache_UpdateAsync()
// Arrange
var remote = Substitute.For<IRemoteCacheProvider>();
var local = Substitute.For<ILocalCacheProvider>();
var behavior = GetBehavior<FakeQuery<string>, string>(new List<ICacheProvider> { local, remote });
var behavior = GetBehavior<FakeQuery<string>, string>([local, remote]);

// Act
var result = await behavior.Handle(
Expand All @@ -105,7 +105,7 @@ public async Task CacheBehavior_EnableRemote_NoCache_UpdateAsync()
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
RemoteExpires = TimeSpan.FromSeconds(1)
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -120,7 +120,7 @@ public async Task CacheBehavior_EnableRemote_HasCache_UseCacheAsync()
// Arrange
var remote = Substitute.For<IRemoteCacheProvider>().AddCacheValue("cacheKey", "cacheValue");
var local = Substitute.For<ILocalCacheProvider>();
var behavior = GetBehavior<FakeQuery<string>, string>(new List<ICacheProvider> { local, remote });
var behavior = GetBehavior<FakeQuery<string>, string>([local, remote]);

// Act
var result = await behavior.Handle(
Expand All @@ -130,7 +130,7 @@ public async Task CacheBehavior_EnableRemote_HasCache_UseCacheAsync()
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
RemoteExpires = TimeSpan.FromSeconds(1)
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -145,7 +145,7 @@ public async Task CacheBehavior_ThrowOnGet_ThrowAsync()
var remote = Substitute.For<IRemoteCacheProvider>();
remote.GetAsync<string>(Arg.Any<string>()).ThrowsAsync(new Exception("test"));
var behavior = GetBehavior<FakeQuery<string>, string>(
new List<ICacheProvider>() { remote },
[remote],
o => o.ThrowIfFailedOnGet = true);

// Act
Expand All @@ -156,7 +156,7 @@ public async Task CacheBehavior_ThrowOnGet_ThrowAsync()
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
RemoteExpires = TimeSpan.FromSeconds(1)
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -170,7 +170,7 @@ public async Task CacheBehavior_ThrowOnGet_NoThrowAsync()
var remote = Substitute.For<IRemoteCacheProvider>();
remote.GetAsync<string>(Arg.Any<string>()).ThrowsAsync(new Exception("test"));
var behavior = GetBehavior<FakeQuery<string>, string>(
new List<ICacheProvider>() { remote },
[remote],
o => o.ThrowIfFailedOnGet = false);

// Act
Expand All @@ -181,7 +181,7 @@ public async Task CacheBehavior_ThrowOnGet_NoThrowAsync()
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
RemoteExpires = TimeSpan.FromSeconds(1)
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -196,7 +196,7 @@ public async Task CacheBehavior_ThrowOnUpdate_ThrowAsync()
remote.UpdateAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<TimeSpan>())
.ThrowsAsync(new Exception("test"));
var behavior = GetBehavior<FakeQuery<string>, string>(
new List<ICacheProvider> { remote },
[remote],
o => o.ThrowIfFailedOnUpdate = true);

// Act
Expand All @@ -207,7 +207,7 @@ public async Task CacheBehavior_ThrowOnUpdate_ThrowAsync()
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
RemoteExpires = TimeSpan.FromSeconds(1)
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -222,7 +222,7 @@ public async Task CacheBehavior_NotThrowOnUpdate_NotThrowAsync()
remote.UpdateAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<TimeSpan>())
.ThrowsAsync(new Exception("test"));
var behavior = GetBehavior<FakeQuery<string>, string>(
new List<ICacheProvider> { remote },
[remote],
o => o.ThrowIfFailedOnUpdate = false);

// Act
Expand All @@ -233,7 +233,7 @@ public async Task CacheBehavior_NotThrowOnUpdate_NotThrowAsync()
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
RemoteExpires = TimeSpan.FromSeconds(1)
},
() => Task.FromResult("noCache"),
_ => Task.FromResult("noCache"),
CancellationToken.None);

// Assert
Expand All @@ -244,7 +244,7 @@ public async Task CacheBehavior_NotThrowOnUpdate_NotThrowAsync()
public void CacheBehavior_NoProvider_Throw()
{
// Act
var act = () => GetBehavior<FakeQuery<string>, string>(new List<ICacheProvider>());
var act = () => GetBehavior<FakeQuery<string>, string>([]);

// Assert
act.Should().Throw<InvalidOperationException>();
Expand Down
2 changes: 1 addition & 1 deletion test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/LoggerBehaviorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public async Task LoggerBehavior_ShouldLogDebugAsync()
var request = new FakeQuery<string>(null, "test");

// Act
await behavior.Handle(request, () => Task.FromResult("done"), default);
await behavior.Handle(request, _ => Task.FromResult("done"), CancellationToken.None);

// Assert
logger.Received(2).Log(
Expand Down
4 changes: 2 additions & 2 deletions test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/ValidationBehaviorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public async Task ValidationBehavior_ValidationFailed_ReturnObjectAsync()
NullLogger<ValidationBehavior<FakeQuery<FakeResponse>, FakeResponse>>.Instance);

// Act
var result = await behavior.Handle(request, () => Task.FromResult(new FakeResponse()), default);
var result = await behavior.Handle(request, _ => Task.FromResult(new FakeResponse()), CancellationToken.None);

// Assert
var errors = new ValidationErrors { error };
Expand All @@ -33,7 +33,7 @@ public async Task ValidationBehavior_ValidationSuccess_ReturnNextAsync()
NullLogger<ValidationBehavior<FakeQuery<FakeResponse>, FakeResponse>>.Instance);

// Act
var result = await behavior.Handle(request, () => Task.FromResult(new FakeResponse()), default);
var result = await behavior.Handle(request, _ => Task.FromResult(new FakeResponse()), CancellationToken.None);

// Assert
result.Should().BeEquivalentTo(new { IsValidationError = false, ValidationErrors = new ValidationErrors() });
Expand Down