Add NetStandard2.0 support, see samcook#35

Upgrade dependencies
cd21h · Mar 30, 2018 · e99a7ec · e99a7ec
1 parent 9c1897c
commit e99a7ec
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -154,3 +154,4 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
+.vs/
diff --git a/RedLock.StrongName.nuspec b/RedLock.StrongName.nuspec
@@ -15,22 +15,28 @@
 		<copyright>Copyright 2018 Sam Cook</copyright>
 		<tags>RedLock Redis Distributed Lock</tags>
 		<dependencies>
+			<group targetFramework=".NETStandard2.0">
+				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="2.0.1" exclude="Build,Analyzers" />
+				<dependency id="StackExchange.Redis.StrongName" version="1.2.6" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging" version="2.0.1" exclude="Build,Analyzers" />
+				<dependency id="System.Threading.Tasks.Parallel" version="4.3.0" exclude="Build,Analyzers" />
+			</group>
 			<group targetFramework=".NETStandard1.5">
-				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.1" exclude="Build,Analyzers" />
-				<dependency id="StackExchange.Redis.StrongName" version="1.1.608" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" exclude="Build,Analyzers" />
+				<dependency id="StackExchange.Redis.StrongName" version="1.2.6" exclude="Build,Analyzers" />
 				<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
-				<dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging" version="1.1.2" exclude="Build,Analyzers" />
 				<dependency id="System.Threading.Tasks.Parallel" version="4.3.0" exclude="Build,Analyzers" />
 			</group>
 			<group targetFramework=".NETFramework4.6">
-				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.1" exclude="Build,Analyzers" />
-				<dependency id="StackExchange.Redis.StrongName" version="1.1.608" exclude="Build,Analyzers" />
-				<dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" exclude="Build,Analyzers" />
+				<dependency id="StackExchange.Redis.StrongName" version="1.2.6" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging" version="1.1.2" exclude="Build,Analyzers" />
 			</group>
 			<group targetFramework=".NETFramework4.5">
-				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.1" exclude="Build,Analyzers" />
-				<dependency id="StackExchange.Redis.StrongName" version="1.1.608" exclude="Build,Analyzers" />
-				<dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" exclude="Build,Analyzers" />
+				<dependency id="StackExchange.Redis.StrongName" version="1.2.6" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging" version="1.1.2" exclude="Build,Analyzers" />
 			</group>
 		</dependencies>
 	</metadata>
@@ -41,5 +47,7 @@
 		<file src="RedLockNet.Abstractions.StrongName\bin\Release\netstandard1.1\RedLockNet.Abstractions.StrongName.dll" target="lib\net46" />
 		<file src="RedLockNet.SERedis.StrongName\bin\Release\netstandard1.5\RedLockNet.SERedis.StrongName.dll" target="lib\netstandard1.5" />
 		<file src="RedLockNet.Abstractions.StrongName\bin\Release\netstandard1.1\RedLockNet.Abstractions.StrongName.dll" target="lib\netstandard1.5" />
+		<file src="RedLockNet.SERedis.StrongName\bin\Release\netstandard2.0\RedLockNet.SERedis.StrongName.dll" target="lib\netstandard2.0" />
+		<file src="RedLockNet.Abstractions.StrongName\bin\Release\netstandard2.0\RedLockNet.Abstractions.StrongName.dll" target="lib\netstandard2.0" />
 	</files>
 </package>
diff --git a/RedLock.nuspec b/RedLock.nuspec
@@ -15,22 +15,28 @@
 		<copyright>Copyright 2018 Sam Cook</copyright>
 		<tags>RedLock Redis Distributed Lock</tags>
 		<dependencies>
+			<group targetFramework=".NETStandard2.0">
+				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="2.0.1" exclude="Build,Analyzers" />
+				<dependency id="StackExchange.Redis.StrongName" version="1.2.6" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging" version="2.0.1" exclude="Build,Analyzers" />
+				<dependency id="System.Threading.Tasks.Parallel" version="4.3.0" exclude="Build,Analyzers" />
+			</group>
 			<group targetFramework=".NETStandard1.5">
-				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.1" exclude="Build,Analyzers" />
-				<dependency id="StackExchange.Redis" version="1.1.608" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" exclude="Build,Analyzers" />
+				<dependency id="StackExchange.Redis.StrongName" version="1.2.6" exclude="Build,Analyzers" />
 				<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
-				<dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging" version="1.1.2" exclude="Build,Analyzers" />
 				<dependency id="System.Threading.Tasks.Parallel" version="4.3.0" exclude="Build,Analyzers" />
 			</group>
 			<group targetFramework=".NETFramework4.6">
-				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.1" exclude="Build,Analyzers" />
-				<dependency id="StackExchange.Redis" version="1.1.608" exclude="Build,Analyzers" />
-				<dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" exclude="Build,Analyzers" />
+				<dependency id="StackExchange.Redis.StrongName" version="1.2.6" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging" version="1.1.2" exclude="Build,Analyzers" />
 			</group>
 			<group targetFramework=".NETFramework4.5">
-				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.1" exclude="Build,Analyzers" />
-				<dependency id="StackExchange.Redis" version="1.1.608" exclude="Build,Analyzers" />
-				<dependency id="Microsoft.Extensions.Logging" version="1.1.1" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging.Abstractions" version="1.1.2" exclude="Build,Analyzers" />
+				<dependency id="StackExchange.Redis.StrongName" version="1.2.6" exclude="Build,Analyzers" />
+				<dependency id="Microsoft.Extensions.Logging" version="1.1.2" exclude="Build,Analyzers" />
 			</group>
 		</dependencies>
 	</metadata>
@@ -41,5 +47,7 @@
 		<file src="RedLockNet.Abstractions\bin\Release\netstandard1.1\RedLockNet.Abstractions.dll" target="lib\net46" />
 		<file src="RedLockNet.SERedis\bin\Release\netstandard1.5\RedLockNet.SERedis.dll" target="lib\netstandard1.5" />
 		<file src="RedLockNet.Abstractions\bin\Release\netstandard1.1\RedLockNet.Abstractions.dll" target="lib\netstandard1.5" />
+   		<file src="RedLockNet.SERedis\bin\Release\netstandard2.0\RedLockNet.SERedis.dll" target="lib\netstandard2.0" />
+		<file src="RedLockNet.Abstractions\bin\Release\netstandard2.0\RedLockNet.Abstractions.dll" target="lib\netstandard2.0" />
 	</files>
 </package>
diff --git a/RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj b/RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
     <RootNamespace>RedLockNet</RootNamespace>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <Version>2.0.0</Version>

diff --git a/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj b/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
     <RootNamespace>RedLockNet</RootNamespace>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <Version>2.0.0</Version>

diff --git a/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj b/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;netstandard1.5</TargetFrameworks>
+    <TargetFrameworks>net45;net46;netstandard1.5;netstandard2.0</TargetFrameworks>
     <AssemblyName>RedLockNet.SERedis.StrongName</AssemblyName>
     <PackageId>RedLock.net</PackageId>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
     <RootNamespace>RedLockNet.SERedis</RootNamespace>
     <Version>2.0.0</Version>
     <Description>An implementation of the Redlock distributed lock algorithm</Description>
@@ -26,23 +25,33 @@
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis.StrongName" Version="1.1.608" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
+    <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RedLockNet.SERedis/RedLockNet.SERedis.csproj b/RedLockNet.SERedis/RedLockNet.SERedis.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;netstandard1.5</TargetFrameworks>
+    <TargetFrameworks>net45;net46;netstandard1.5;netstandard2.0</TargetFrameworks>
     <AssemblyName>RedLockNet.SERedis</AssemblyName>
     <PackageId>RedLock.net</PackageId>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
     <RootNamespace>RedLockNet.SERedis</RootNamespace>
     <Version>2.0.0</Version>
     <Description>An implementation of the Redlock distributed lock algorithm</Description>
@@ -23,23 +22,33 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="1.1.608" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
+    <PackageReference Include="StackExchange.Redis" Version="1.2.6" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RedLockNet.Tests/RedLockNet.Tests.csproj b/RedLockNet.Tests/RedLockNet.Tests.csproj
@@ -1,20 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net451;net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net451;net46;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
     <AssemblyName>RedLockNet.Tests</AssemblyName>
     <RootNamespace>RedLockNet.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="NUnit" Version="3.7.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
+    <PackageReference Include="JetBrains.Annotations" Version="11.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.2" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
     <PackageReference Include="Redis-64" Version="3.0.503" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.1" />
+  </ItemGroup>
+
+
   <ItemGroup>
     <ProjectReference Include="..\RedLockNet.SERedis\RedLockNet.SERedis.csproj" />
   </ItemGroup>