Skip to content

Commit ef39647

Browse files
cnblogs-duducnblogs-dudu
authored
Merge pull request #205 from cnblogs/support-net8
chore: support .NET 8
2 parents a8cf1ac + 3eda724 commit ef39647

File tree

8 files changed

+37
-53
lines changed

8 files changed

+37
-53
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
12-
container: mcr.microsoft.com/dotnet/sdk:7.0
12+
container: mcr.microsoft.com/dotnet/sdk:8.0
1313

1414
services:
1515
memcached:

‎sample/SampleWebApp/SampleWebApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace>Enyim.Caching.SampleWebApp</RootNamespace>
66
<AssemblyName>Enyim.Caching.SampleWebApp</AssemblyName>
77
</PropertyGroup>

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

Lines changed: 6 additions & 22 deletions
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>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
6+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<AssemblyName>EnyimMemcachedCore</AssemblyName>
99
<PackageId>EnyimMemcachedCore</PackageId>
@@ -18,29 +18,13 @@
1818
<NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
1919
</PropertyGroup>
2020

21-
<Choose>
22-
<When Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">
23-
<ItemGroup>
24-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
25-
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
26-
</ItemGroup>
27-
</When>
28-
<Otherwise>
29-
<ItemGroup>
30-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
35-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
36-
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
37-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
38-
</ItemGroup>
39-
</Otherwise>
40-
</Choose>
21+
<ItemGroup>
22+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
23+
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
24+
</ItemGroup>
4125

4226
<ItemGroup>
43-
<PackageReference Include="MessagePack" Version="2.4.59" />
27+
<PackageReference Include="MessagePack" Version="2.5.140" />
4428
</ItemGroup>
4529

4630
<ItemGroup>

‎test/DistributedCacheTests/DistributedCacheTests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.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.4.1" />
13-
<PackageReference Include="xunit" Version="2.4.2" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13+
<PackageReference Include="xunit" Version="2.6.2" />
1414
<PackageReference Include="Xunit.Priority" Version="1.1.6" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="3.2.0">
19+
<PackageReference Include="coverlet.collector" Version="6.0.0">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
11-
<PackageReference Include="xunit" Version="2.4.2" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
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.8.0" />
11+
<PackageReference Include="xunit" Version="2.6.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

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

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
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" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<ProjectReference Include="..\..\src\Enyim.Caching\Enyim.Caching.csproj" />

‎test/MemcachedTest/MemcachedTest.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
11-
<PackageReference Include="xunit" Version="2.4.2" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
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.8.0" />
11+
<PackageReference Include="xunit" Version="2.6.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

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

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

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

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.2" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
11-
<PackageReference Include="xunit" Version="2.4.2" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11+
<PackageReference Include="xunit" Version="2.6.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

0 commit comments

Comments
 (0)