8000 Merge pull request #89 from cnblogs/update-to-.netcore-2.2 · cnblogs/EnyimMemcachedCore@a225a4e · GitHub
[go: up one dir, main page]
Skip to content

Commit a225a4e

Browse files
cnblogs-duducnblogs-dudu
authored
Merge pull request #89 from cnblogs/update-to-.netcore-2.2
Update to .net core 2.2
2 parents 6cf942c + 03c688c commit a225a4e

File tree

6 files changed

+29
-39
lines changed

6 files changed

+29
-39
lines changed

‎.travis.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
language: csharp
22
mono: none
33
sudo: required
4-
dist: trusty
5-
before_install:
6-
- curl -O https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
7-
- sudo dpkg -i packages-microsoft-prod.deb
8-
- sudo apt-get install apt-transport-https
9-
- sudo apt-get update
10-
- sudo apt-get install dotnet-sdk-2.1
4+
dist: xenial
5+
dotnet: 2.2
116
services:
127
- memcached
138
addons:
@@ -19,11 +14,6 @@ env:
1914
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
2015
os:
2116
- linux
22-
branches:
23-
only:
24-
- master
25-
- dotnetcore
26-
- dotnetcore2-preview2
2717
script:
2818
- ./build.sh
2919
- ./test.sh

‎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>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>netcoreapp2.2</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
11-
<PackageReference Include="xunit" Version="2.4.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
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="15.9.0" />
11+
<PackageReference Include="xunit" Version="2.4.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
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
@@ -17,13 +17,13 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
21-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
23-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
24-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.1.2" />
25-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
26-
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.1" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
21+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
23+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
24+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.2.0" />
25+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
26+
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
2727
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
2828
</ItemGroup>
2929
</Project>

‎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>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>netcoreapp2.2</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
11-
<PackageReference Include="xunit" Version="2.4.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
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="15.9.0" />
11+
<PackageReference Include="xunit" Version="2.4.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

‎SampleWebApp.IntegrationTests/SampleWebApp.IntegrationTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
1010 17A6
<PackageReference Include="Microsoft.AspNetCore.App" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.2" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
13-
<PackageReference Include="xunit" Version="2.4.0" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
13+
<PackageReference Include="xunit" Version="2.4.1" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1717
</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>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<RootNamespace>Enyim.Caching.SampleWebApp</RootNamespace>
66
<AssemblyName>Enyim.Caching.SampleWebApp</AssemblyName>
77
</PropertyGroup>

0 commit comments

Comments
 (0)
0