Skip to content

Commit 5afe0c6

Browse files
cnblogs-duducnblogs-dudu
authored
Merge pull request #240 from cnblogs/update-packages
chore: support .net 9.0 and update packages
2 parents 72a8038 + 0c18085 commit 5afe0c6

File tree

10 files changed

+68
-74
lines changed

10 files changed

+68
-74
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ on:
99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
12-
container: mcr.microsoft.com/dotnet/sdk:8.0
12+
container: mcr.microsoft.com/dotnet/sdk:9.0
1313

1414
services:
1515
memcached:
16-
image: memcached
16+
image: memcached:1.5.8
1717

1818
steps:
1919
- name: Checkout

‎sample/SampleWebApp/SampleWebApp.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<RootNamespace>Enyim.Caching.SampleWebApp</RootNamespace>
66
<AssemblyName>Enyim.Caching.SampleWebApp</AssemblyName>
77
</PropertyGroup>
@@ -16,4 +16,4 @@
1616
</Content>
1717
</ItemGroup>
1818

19-
</Project>
19+
</Project>

‎src/Enyim.Caching/Configuration/MemcachedClientConfiguration.cs

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public MemcachedClientConfiguration(
4343
_logger = loggerFactory.CreateLogger<MemcachedClientConfiguration>();
4444

4545
var options = optionsAccessor.Value;
46+
4647
#if NET5_0_OR_GREATER
4748
if ((options == null || options.Servers.Count == 0) && configuration != null)
4849
{

‎src/Enyim.Caching/Enyim.Caching.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>EnyimMemcachedCore is a Memcached client library for .NET. Add services.AddEnyimMemcached() in Startup. Inject IMemcachedClient into constructors.</Description>
55
<Authors>cnblogs.com</Authors>
6-
<TargetFrameworks>net6.0;net7.0;net8.0;net48;net481</TargetFrameworks>
6+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net48;net481</TargetFrameworks>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<AssemblyName>EnyimMemcachedCore</AssemblyName>
99
<PackageId>EnyimMemcachedCore</PackageId>
@@ -19,26 +19,26 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup Condition="'$(TargetFramework)'!='net48' And '$(TargetFramework)'!='net481'">
22-
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
22+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
2323
</ItemGroup>
2424

2525
<ItemGroup Condition="'$(TargetFramework)'=='net48' Or '$(TargetFramework)'=='net481'">
26-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
27-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
28-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0"/>
29-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2"/>
30-
<PackageReference Include="System.Net.Security" Version="4.3.2"/>
26+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
30+
<PackageReference Include="System.Net.Security" Version="4.3.2" />
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2"/>
34+
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="MessagePack" Version="2.5.187"/>
38+
<PackageReference Include="MessagePack" Version="2.5.192" />
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<None Include="../../README.md" Pack="true" PackagePath="\"/>
42+
<None Include="../../README.md" Pack="true" PackagePath="\" />
4343
</ItemGroup>
4444
</Project>

‎test/DistributedCacheTests/DistributedCacheTests.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
13-
<PackageReference Include="xunit" Version="2.7.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13+
<PackageReference Include="xunit" Version="2.9.2" />
1414
<PackageReference Include="Xunit.Priority" Version="1.1.6" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="6.0.1">
19+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>
@@ -32,4 +32,4 @@
3232
</None>
3333
</ItemGroup>
3434

35-
</Project>
35+
</Project>

‎test/Enyim.Caching.Tests/Enyim.Caching.Tests.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11-
<PackageReference Include="xunit" Version="2.7.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
7+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
11+
<PackageReference Include="xunit" Version="2.9.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

‎test/Enyim.StressTest/Enyim.StressTest.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -17,13 +17,13 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<ProjectReference Include="..\..\src\Enyim.Caching\Enyim.Caching.csproj" />
2727
</ItemGroup>
2828

29-
</Project>
29+
</Project>

‎test/MemcachedTest/MemcachedClientTest.cs

+22-29
Original file line numberDiff line numberDiff line change
@@ -295,44 +295,37 @@ public async Task MultiGetTest()
295295
[Fact]
296296
public virtual async Task MultiGetWithCasTest()
297297
{
298-
using (var client = GetClient())
299-
{
300-
var keys = new List<string>();
301-
var tasks = new List<Task<bool>>();
302-
303-
for (int i = 0; i < 10; i++)
304-
{
305-
string k = $"Hello_Multi_Get_{Guid.NewGuid()}_{new Random().Next()}" + i;
306-
keys.Add(k);
298+
using var client = GetClient();
299+
var keys = new List<string>();
300+
var tasks = new List<Task<bool>>();
307301

308-
tasks.Add(client.StoreAsync(StoreMode.Set, k, i, DateTime.Now.AddSeconds(300)));
309-
}
310-
311-
await Task.WhenAll(tasks);
302+
for (int i = 0; i < 10; i++)
303+
{
304+
string k = $"Hello_Multi_Get_{Guid.NewGuid()}_{new Random().Next()}" + i;
305+
keys.Add(k);
312306

313-
foreach (var task in tasks)
314-
{
315-
Assert.True(await task, "Store failed");
316-
}
307+
bool success = await client.StoreAsync(StoreMode.Set, k, i, DateTime.Now.AddSeconds(600));
308+
Assert.True(success, "Store failed");
309+
}
317310

318-
var retvals = await client.GetWithCasAsync(keys);
311+
var retvals = await client.GetWithCasAsync(keys);
319312

320-
Assert.Equal(keys.Count, retvals.Count);
313+
await Task.Delay(100);
321314

322-
tasks.Clear();
323-
for (int i = 0; i < keys.Count; i++)
324-
{
325-
string key = keys[i];
315+
Assert.Equal(keys.Count, retvals.Count);
326316

327-
Assert.True(retvals.TryGetValue(key, out var value), "missing key: " + key);
328-
Assert.Equal(value.Result, i);
329-
Assert.NotEqual(value.Cas, (ulong)0);
317+
for (int i = 0; i < keys.Count; i++)
318+
{
319+
string key = keys[i];
330320

331-
tasks.Add(client.RemoveAsync(key));
332-
}
321+
Assert.True(retvals.TryGetValue(key, out var value), "missing key: " + key);
322+
Assert.Equal(value.Result, i);
323+
Assert.NotEqual((ulong)0, value.Cas);
333324

334-
await Task.WhenAll(tasks);
325+
tasks.Add(client.RemoveAsync(key));
335326
}
327+
328+
await Task.WhenAll(tasks);
336329
}
337330

338331
[Fact]

‎test/MemcachedTest/MemcachedTest.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11-
<PackageReference Include="xunit" Version="2.7.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
7+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
11+
<PackageReference Include="xunit" Version="2.9.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

‎test/SampleWebApp.IntegrationTests/SampleWebApp.IntegrationTests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11-
<PackageReference Include="xunit" Version="2.7.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
11+
<PackageReference Include="xunit" Version="2.9.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

0 commit comments

Comments
 (0)