From 76716d254caf3a8cfecb03ac734a82c5d82085c3 Mon Sep 17 00:00:00 2001 From: dudu Date: Wed, 30 May 2018 18:00:38 +0800 Subject: [PATCH 1/2] Upgrade to .net core 2.1 --- Enyim.Caching.Tests/Enyim.Caching.Tests.csproj | 6 +++--- Enyim.Caching/Enyim.Caching.csproj | 14 +++++++------- MemcachedTest/MemcachedTest.csproj | 8 ++++---- SampleWebApp/SampleWebApp.csproj | 5 ++--- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Enyim.Caching.Tests/Enyim.Caching.Tests.csproj b/Enyim.Caching.Tests/Enyim.Caching.Tests.csproj index 77ce0f23..7f5c9d69 100644 --- a/Enyim.Caching.Tests/Enyim.Caching.Tests.csproj +++ b/Enyim.Caching.Tests/Enyim.Caching.Tests.csproj @@ -1,11 +1,11 @@  - netcoreapp2.0 + netcoreapp2.1 false - - + + diff --git a/Enyim.Caching/Enyim.Caching.csproj b/Enyim.Caching/Enyim.Caching.csproj index 45c2a1c6..28feb5ec 100755 --- a/Enyim.Caching/Enyim.Caching.csproj +++ b/Enyim.Caching/Enyim.Caching.csproj @@ -2,7 +2,7 @@ EnyimMemcachedCore is a Memcached client library for .NET Core. Usage: Add services.AddEnyimMemcached(...) and app.UseEnyimMemcached() in Startup. Add IMemcachedClient into constructor. - 2.1.4 + 2.1.5 cnblogs.com netstandard2.0 true @@ -16,13 +16,13 @@ - - - + + + - - - + + + diff --git a/MemcachedTest/MemcachedTest.csproj b/MemcachedTest/MemcachedTest.csproj index 1baa5e22..530ae806 100755 --- a/MemcachedTest/MemcachedTest.csproj +++ b/MemcachedTest/MemcachedTest.csproj @@ -1,12 +1,12 @@  - netcoreapp2.0 + netcoreapp2.1 false - - - + + + diff --git a/SampleWebApp/SampleWebApp.csproj b/SampleWebApp/SampleWebApp.csproj index 2f60b431..0e63aa2c 100644 --- a/SampleWebApp/SampleWebApp.csproj +++ b/SampleWebApp/SampleWebApp.csproj @@ -1,12 +1,11 @@  - netcoreapp2.0 - Exe + netcoreapp2.1 - + From 2f6722b6d4cc9f4a716e941c82c7a8abf284ce76 Mon Sep 17 00:00:00 2001 From: dudu Date: Thu, 31 May 2018 18:34:12 +0800 Subject: [PATCH 2/2] Change .net core sdk to 2.1 in .travis.yml --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e57d7085..3543c8cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,11 @@ mono: none sudo: required dist: trusty before_install: - - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' - - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 + - curl -O https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb + - sudo dpkg -i packages-microsoft-prod.deb + - sudo apt-get install apt-transport-https - sudo apt-get update - - sudo apt-get install dotnet-sdk-2.0.0 + - sudo apt-get install dotnet-sdk-2.1 services: - memcached addons: