Skip to content

Commit 6c585fd

Browse files
ikesnowyikesnowy
authored
chore: upgrade m.s.e. to 9.0.4 (#321)
1 parent 38e8fc0 commit 6c585fd

File tree

16 files changed

+38
-38
lines changed

16 files changed

+38
-38
lines changed

Diff for: ‎src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/CacheableRequestBehavior.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public async Task<TResponse> Handle(
7171
})
7272
{
7373
// cache disabled
74-
return await next();
74+
return await next(cancellationToken);
7575
}
7676

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

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

9797
if (request.LocalCacheBehavior is CacheBehavior.UpdateCacheIfMiss)
9898
{
@@ -197,4 +197,4 @@ private async Task UpdateCacheEntryAsync(
197197
}
198198
}
199199
}
200-
}
200+
}

Diff for: ‎src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
29-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.3" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
29+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.4" />
3030
</ItemGroup>
3131

3232
</Project>

Diff for: ‎src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
19-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
19+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

Diff for: ‎src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

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

2222
<ItemGroup>

Diff for: ‎src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="MediatR" Version="12.4.1" />
17+
<PackageReference Include="MediatR" Version="12.5.0" />
1818
</ItemGroup>
1919

2020
</Project>

Diff for: ‎src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.EventBus.Abstractions\Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Dapr.AspNetCore" Version="1.15.2" />
12+
<PackageReference Include="Dapr.AspNetCore" Version="1.15.3" />
1313
</ItemGroup>
1414
</Project>

Diff for: ‎src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

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

2222

Diff for: ‎src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="ClickHouse.Client" Version="7.13.0" />
16+
<PackageReference Include="ClickHouse.Client" Version="7.13.2" />
1717
</ItemGroup>
1818

1919
</Project>

Diff for: ‎src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
20-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.3" />
20+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.4" />
2121
</ItemGroup>
2222

2323
</Project>

Diff for: ‎src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.3" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

Diff for: ‎src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

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

1616
<ItemGroup>

Diff for: ‎test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
1111
</ItemGroup>
1212
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.3"/>
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4"/>
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
1515
</ItemGroup>
1616
</Project>

Diff for: ‎test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
66
<PrivateAssets>all</PrivateAssets>
77
</PackageReference>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.3" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.4" />
99
<PackageReference Include="coverlet.collector" Version="6.0.4">
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
<PrivateAssets>all</PrivateAssets>

Diff for: ‎test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/CacheBehaviorTests.cs

+19-19
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public async Task CacheBehavior_DisableCache_NotCacheAsync()
2424
local.AddCacheValue("cacheKey", "cacheValue");
2525
var remote = Substitute.For<IRemoteCacheProvider>();
2626
remote.AddCacheValue("cacheKey", "cacheValue");
27-
var behavior = GetBehavior<FakeQuery<string>, string>(new List<ICacheProvider> { local, remote });
27+
var behavior = GetBehavior<FakeQuery<string>, string>([local, remote]);
2828

2929
// Act
3030
var result = await behavior.Handle(
@@ -33,7 +33,7 @@ public async Task CacheBehavior_DisableCache_NotCacheAsync()
3333
LocalCacheBehavior = CacheBehavior.DisabledCache,
3434
RemoteCacheBehavior = CacheBehavior.DisabledCache
3535
},
36-
() => Task.FromResult("noCache"),
36+
_ => Task.FromResult("noCache"),
3737
CancellationToken.None);
3838

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

5050
// Act
5151
var result = await behavior.Handle(
@@ -55,7 +55,7 @@ public async Task CacheBehavior_EnableLocal_NoCache_UpdateAsync()
5555
LocalExpires = TimeSpan.FromSeconds(1),
5656
RemoteCacheBehavior = CacheBehavior.DisabledCache
5757
},
58-
() => Task.FromResult("noCache"),
58+
_ => Task.FromResult("noCache"),
5959
CancellationToken.None);
6060

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

7575
// Act
7676
var result = await behavior.Handle(
@@ -80,7 +80,7 @@ public async Task CacheBehavior_EnableLocal_HasCache_UseCacheAsync()
8080
LocalExpires = TimeSpan.FromSeconds(1),
8181
RemoteCacheBehavior = CacheBehavior.DisabledCache
8282
},
83-
() => Task.FromResult("noCache"),
83+
_ => Task.FromResult("noCache"),
8484
CancellationToken.None);
8585

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

100100
// Act
101101
var result = await behavior.Handle(
@@ -105,7 +105,7 @@ public async Task CacheBehavior_EnableRemote_NoCache_UpdateAsync()
105105
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
106106
RemoteExpires = TimeSpan.FromSeconds(1)
107107
},
108-
() => Task.FromResult("noCache"),
108+
_ => Task.FromResult("noCache"),
109109
CancellationToken.None);
110110

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

125125
// Act
126126
var result = await behavior.Handle(
@@ -130,7 +130,7 @@ public async Task CacheBehavior_EnableRemote_HasCache_UseCacheAsync()
130130
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
131131
RemoteExpires = TimeSpan.FromSeconds(1)
132132
},
133-
() => Task.FromResult("noCache"),
133+
_ => Task.FromResult("noCache"),
134134
CancellationToken.None);
135135

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

151151
// Act
@@ -156,7 +156,7 @@ public async Task CacheBehavior_ThrowOnGet_ThrowAsync()
156156
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
157157
RemoteExpires = TimeSpan.FromSeconds(1)
158158
},
159-
() => Task.FromResult("noCache"),
159+
_ => Task.FromResult("noCache"),
160160
CancellationToken.None);
161161

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

176176
// Act
@@ -181,7 +181,7 @@ public async Task CacheBehavior_ThrowOnGet_NoThrowAsync()
181181
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
182182
RemoteExpires = TimeSpan.FromSeconds(1)
183183
},
184-
() => Task.FromResult("noCache"),
184+
_ => Task.FromResult("noCache"),
185185
CancellationToken.None);
186186

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

202202
// Act
@@ -207,7 +207,7 @@ public async Task CacheBehavior_ThrowOnUpdate_ThrowAsync()
207207
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
208208
RemoteExpires = TimeSpan.FromSeconds(1)
209209
},
210-
() => Task.FromResult("noCache"),
210+
_ => Task.FromResult("noCache"),
211211
CancellationToken.None);
212212

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

228228
// Act
@@ -233,7 +233,7 @@ public async Task CacheBehavior_NotThrowOnUpdate_NotThrowAsync()
233233
RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss,
234234
RemoteExpires = TimeSpan.FromSeconds(1)
235235
},
236-
() => Task.FromResult("noCache"),
236+
_ => Task.FromResult("noCache"),
237237
CancellationToken.None);
238238

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

249249
// Assert
250250
act.Should().Throw<InvalidOperationException>();

Diff for: ‎test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/LoggerBehaviorTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public async Task LoggerBehavior_ShouldLogDebugAsync()
1818
var request = new FakeQuery<string>(null, "test");
1919

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

2323
// Assert
2424
logger.Received(2).Log(

Diff for: ‎test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/ValidationBehaviorTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public async Task ValidationBehavior_ValidationFailed_ReturnObjectAsync()
1717
NullLogger<ValidationBehavior<FakeQuery<FakeResponse>, FakeResponse>>.Instance);
1818

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

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

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

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

0 commit comments

Comments
 (0)