Skip to content

Commit 609d34c

Browse files
authored
Upgrade to .NET 7 (#174)
Upgrade to .NET 7
1 parent e921d35 commit 609d34c

File tree

7 files changed

+34
-21
lines changed

7 files changed

+34
-21
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v2
1818
with:
19-
dotnet-version: 6.0.x
19+
dotnet-version: 7.0.x
2020
- name: Install dependencies
2121
run: |
2222
sudo apt-get update

Enyim.Caching.Tests/Enyim.Caching.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>

Enyim.Caching/Enyim.Caching.csproj

Lines changed: 28 additions & 15 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 Core. Usage: Add services.AddEnyimMemcached(...) and app.UseEnyimMemcached() in Startup. Add IMemcachedClient into constructor.</Description>
55
<Authors>cnblogs.com</Authors>
6-
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<AssemblyName>EnyimMemcachedCore</AssemblyName>
99
<PackageId>EnyimMemcachedCore</PackageId>
@@ -13,20 +13,33 @@
1313
<RepositoryUrl>https://github.com/cnblogs/EnyimMemcachedCore</RepositoryUrl>
1414
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1515
<LangVersion>latest</LangVersion>
16+
<NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
1617
</PropertyGroup>
1718

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

Enyim.StressTest/Enyim.StressTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

88
<ItemGroup>

MemcachedTest/MemcachedTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>

SampleWebApp.IntegrationTests/SampleWebApp.IntegrationTests.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>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

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>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<RootNamespace>Enyim.Caching.SampleWebApp</RootNamespace>
66
<AssemblyName>Enyim.Caching.SampleWebApp</AssemblyName>
77
</PropertyGroup>

0 commit comments

Comments
 (0)