Skip to content

Commit b3dac1c

Browse files
authored
Merge pull request #151 from cnblogs/target-net5
Target .NET 5.0 and improve
2 parents 856948f + 1abc3ea commit b3dac1c

File tree

6 files changed

+29
-30
lines changed

6 files changed

+29
-30
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.0</TargetFramework>
3+
<TargetFramework>net5.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
7+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

Enyim.Caching/Enyim.Caching.csproj

Lines changed: 7 additions & 7 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-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<AssemblyName>EnyimMemcachedCore</AssemblyName>
99
<PackageId>EnyimMemcachedCore</PackageId>
@@ -16,13 +16,13 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
2424
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
2525
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
26-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
26+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
2727
</ItemGroup>
2828
</Project>

Enyim.StressTest/Enyim.StressTest.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
6-
<LangVersion>latest</LangVersion>
5+
<TargetFramework>net5.0</TargetFramework>
76
</PropertyGroup>
87

98
<ItemGroup>
@@ -18,10 +17,10 @@
1817
</ItemGroup>
1918

2019
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
2524
</ItemGroup>
2625
<ItemGroup>
2726
<ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />

MemcachedTest/MemcachedTest.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.0</TargetFramework>
3+
<TargetFramework>net5.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
7+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
8+
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

SampleWebApp.IntegrationTests/SampleWebApp.IntegrationTests.csproj

Lines changed: 4 additions & 4 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>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

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

0 commit comments

Comments
 (0)