Skip to content

Commit 97b5dc3

Browse files
cnblogs-duducnblogs-dudu
authored
Merge pull request #137 from cnblogs/update-to-netcore3.0
Update to .net core 3.0
2 parents 460fe29 + 904a69d commit 97b5dc3

File tree

8 files changed

+32
-33
lines changed

8 files changed

+32
-33
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: csharp
22
mono: none
33
sudo: required
44
dist: xenial
5-
dotnet: 2.2
5+
dotnet: 3.0
66
services:
77
- memcached
88
addons:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.2</TargetFramework>
3+
<TargetFramework>netcoreapp3.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
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" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1313
<PrivateAssets>all</PrivateAssets>

‎Enyim.Caching/Enyim.Caching.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
20-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
22-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
23-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.2.0" />
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" />
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.2" />
26+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
2727
</ItemGroup>
2828
</Project>

‎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>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.0</TargetFramework>
66
<LangVersion>latest</LangVersion>
77
</PropertyGroup>
88

@@ -18,10 +18,10 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
22-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
23-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
24-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
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" />
2525
</ItemGroup>
2626
<ItemGroup>
2727
<ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />

‎MemcachedTest/MemcachedTest.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.2</TargetFramework>
3+
<TargetFramework>netcoreapp3.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
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" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1313
<PrivateAssets>all</PrivateAssets>

‎SampleWebApp.IntegrationTests/SampleWebApp.IntegrationTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
65
<IsPackable>false</IsPackable>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.App" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
1311
<PackageReference Include="xunit" Version="2.4.1" />
1412
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1513
<PrivateAssets>all</PrivateAssets>

‎SampleWebApp/SampleWebApp.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
<RootNamespace>Enyim.Caching.SampleWebApp</RootNamespace>
66
<AssemblyName>Enyim.Caching.SampleWebApp</AssemblyName>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.App" />
11-
</ItemGroup>
12-
139
<ItemGroup>
1410
<ProjectReference Include="..\Enyim.Caching\Enyim.Caching.csproj" />
1511
</ItemGroup>

‎SampleWebApp/Startup.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ public void ConfigureServices(IServiceCollection services)
3838
public void Configure(IApplicationBuilder app)
3939
{
4040
app.UseEnyimMemcached();
41-
app.UseMvcWithDefaultRoute();
41+
42+
app.UseRouting();
43+
app.UseEndpoints(endpoints =>
44+
{
45+
endpoints.MapDefaultControllerRoute();
46+
});
4247
}
4348
}
4449
}

0 commit comments

Comments
 (0)