Upgrade to dotnet core 2.0

Author: Kleber Bernardo

ServiceStackRedisCache.sln

@@ -1,10 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5A04042D-438D-407B-B239-0CAD6A2BD8C2}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Caching.ServiceStackRedis", "src\Microsoft.Extensions.Caching.ServiceStackRedis\Microsoft.Extensions.Caching.ServiceStackRedis.xproj", "{5694BC38-B266-447E-A743-DA1139FCB257}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.ServiceStackRedis", "src\Microsoft.Extensions.Caching.ServiceStackRedis\Microsoft.Extensions.Caching.ServiceStackRedis.csproj", "{5694BC38-B266-447E-A743-DA1139FCB257}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,4 +23,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{5694BC38-B266-447E-A743-DA1139FCB257} = {5A04042D-438D-407B-B239-0CAD6A2BD8C2}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {101BFF2A-6CDA-4ED7-A483-7186847DF520}
+	EndGlobalSection
 EndGlobal

src/Microsoft.Extensions.Caching.ServiceStackRedis/Microsoft.Extensions.Caching.ServiceStackRedis.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Distributed cache implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache using ServiceStack.Redis.Core</Description>
+    <VersionPrefix>2.0.0.0</VersionPrefix>
+    <Authors>cnblogs.com</Authors>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>ServiceStackRedisCache</AssemblyName>
+    <PackageId>Microsoft.Extensions.Caching.ServiceStackRedis</PackageId>
+    <PackageTags>cache;redis;distributedcache</PackageTags>
+    <PackageProjectUrl>https://github.com/cnblogs/ServiceStackRedisCache</PackageProjectUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/cnblogs/ServiceStackRedisCache</RepositoryUrl>    
+    <GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <Version>2.0.0.0</Version>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
+    <FileVersion>2.0.0.0</FileVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
+    <PackageReference Include="ServiceStack.Redis.Core" Version="1.0.44" />
+  </ItemGroup>
+
+</Project>

src/Microsoft.Extensions.Caching.ServiceStackRedis/Microsoft.Extensions.Caching.ServiceStackRedis.xproj

@@ -1,11 +1,10 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 using ServiceStack.Redis;
-using ServiceStack.Redis.Generic;
-using System.IO;
+using System;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Microsoft.Extensions.Caching.ServiceStackRedis
 {
@@ -45,9 +44,9 @@ public byte[] Get(string key)
             return null;
         }
 
-        public async Task<byte[]> GetAsync(string key)
+        public Task<byte[]> GetAsync(string key, CancellationToken token = default(CancellationToken))
         {
-            return Get(key);
+            return Task.FromResult(Get(key));
         }
 
         public void Set(string key, byte[] value, DistributedCacheEntryOptions options)
@@ -82,9 +81,9 @@ public void Set(string key, byte[] value, DistributedCacheEntryOptions options)
             }
         }
 
-        public async Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options)
+        public Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options, CancellationToken token = default(CancellationToken))
         {
-            Set(key, value, options);
+            return Task.Run(() => Set(key, value, options));
         }
 
         public void Refresh(string key)
@@ -111,14 +110,14 @@ public void Refresh(string key)
             }
         }
 
-        public async Task RefreshAsync(string key)
+        public Task RefreshAsync(string key, CancellationToken token = default(CancellationToken))
         {
             if (key == null)
             {
                 throw new ArgumentNullException(nameof(key));
             }
 
-            Refresh(key);
+            return Task.Run(() => Refresh(key));
         }
 
         public void Remove(string key)
@@ -134,10 +133,10 @@ public void Remove(string key)
             }
         }
 
-        public async Task RemoveAsync(string key)
+        public Task RemoveAsync(string key, CancellationToken token = default(CancellationToken))
         {
-            Remove(key);
-        }  
+            return Task.Run(() => Remove(key));
+        }
 
         private int GetExpireInSeconds(DistributedCacheEntryOptions options)
         {