Skip to content

Commit bbfe81d

Browse files
authored
Merge pull request #55 from cnblogs/upgrade-to-dotnetcore2.1
Upgrade to .net core 2.1
2 parents 60d7c8a + 2f6722b commit bbfe81d

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ mono: none
33
sudo: required
44
dist: trusty
55
before_install:
6-
- sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
7-
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
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
89
- sudo apt-get update
9-
- sudo apt-get install dotnet-sdk-2.0.0
10+
- sudo apt-get install dotnet-sdk-2.1
1011
services:
1112
- memcached
1213
addons:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.2" />
7+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
8+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
1010
<PackageReference Include="xunit" Version="2.3.1" />
1111
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

Enyim.Caching/Enyim.Caching.csproj

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

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>
5-
<VersionPrefix>2.1.4</VersionPrefix>
5+
<VersionPrefix>2.1.5</VersionPrefix>
66
<Authors>cnblogs.com</Authors>
77
<TargetFramework>netstandard2.0</TargetFramework>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -16,13 +16,13 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.2" />
20-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.2" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.2" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
20+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
2222
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
23-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.2" />
24-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.2" />
25-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.3" />
23+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0" />
24+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.1.0" />
25+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
2626
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.1" />
2727
</ItemGroup>
2828
</Project>

MemcachedTest/MemcachedTest.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.0</TargetFramework>
3+
<TargetFramework>netcoreapp2.1</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
8-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.2" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.2" />
7+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
8+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.0" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
1111
<PackageReference Include="xunit" Version="2.3.1" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

SampleWebApp/SampleWebApp.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
5-
<OutputType>Exe</OutputType>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
65
</PropertyGroup>
76

87
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.8" />
8+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />
109
</ItemGroup>
1110

1211
<ItemGroup>

0 commit comments

Comments
 (0)