From cda3fb6f1b05e10d8008d64c85526fc125aa1b81 Mon Sep 17 00:00:00 2001 From: Sam Cook Date: Wed, 10 Oct 2018 23:36:56 +0100 Subject: [PATCH] Update to StackExchange.Redis 2.0. Switch to a single strong named assembly and package, rather than two separate packages (to match StackExchange.Redis). Update platform versions to match StackExchange.Redis. Update packaging process to use dotnet pack. --- ...StrongName.csproj => Directory.Build.props | 22 ++---- LICENSE | 2 +- README.md | 2 +- RedLock.StrongName.nuspec | 64 ------------------ RedLock.net.sln | 28 ++------ RedLock.nuspec | 64 ------------------ RedLock.StrongName.snk => RedLock.snk | Bin .../RedLockNet.Abstractions.Shared.projitems | 17 ----- .../RedLockNet.Abstractions.Shared.shproj | 13 ---- .../IDistributedLockFactory.cs | 0 .../IRedLock.cs | 0 .../RedLockInstanceSummary.cs | 0 .../RedLockNet.Abstractions.csproj | 28 ++------ .../RedLockStatus.cs | 0 RedLockNet.SERedis.Shared/AssemblyInfo.cs | 5 -- .../RedLockNet.SERedis.Shared.projitems | 33 --------- .../RedLockNet.SERedis.Shared.shproj | 13 ---- .../RedLockNet.SERedis.StrongName.csproj | 62 ----------------- RedLockNet.SERedis/AssemblyInfo.cs | 3 + ...ngMultiplexersRedLockConnectionProvider.cs | 0 ...ernallyManagedRedLockConnectionProvider.cs | 0 .../Configuration/RedLockConfiguration.cs | 0 .../RedLockConnectionProvider.cs | 0 .../Configuration/RedLockEndPoint.cs | 0 .../Configuration/RedLockMultiplexer.cs | 0 .../RedLockConfigurationChangedEventArgs.cs | 0 .../Internal/RedLockInstanceResult.cs | 0 .../Internal/RedisConnection.cs | 0 .../Lua/Extend.lua | 0 .../Lua/Unlock.lua | 0 .../RedLock.cs | 0 .../RedLockFactory.cs | 0 RedLockNet.SERedis/RedLockNet.SERedis.csproj | 59 ++++++---------- .../Util/EmbeddedResourceLoader.cs | 0 .../Util/EndPointExtensions.cs | 0 .../Util/TaskUtils.cs | 0 .../Util/ThreadSafeRandom.cs | 0 RedLockNet.Tests/RedLockNet.Tests.csproj | 17 ++--- appveyor.yml | 9 +-- 39 files changed, 53 insertions(+), 388 deletions(-) rename RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj => Directory.Build.props (53%) delete mode 100644 RedLock.StrongName.nuspec delete mode 100644 RedLock.nuspec rename RedLock.StrongName.snk => RedLock.snk (100%) delete mode 100644 RedLockNet.Abstractions.Shared/RedLockNet.Abstractions.Shared.projitems delete mode 100644 RedLockNet.Abstractions.Shared/RedLockNet.Abstractions.Shared.shproj rename {RedLockNet.Abstractions.Shared => RedLockNet.Abstractions}/IDistributedLockFactory.cs (100%) rename {RedLockNet.Abstractions.Shared => RedLockNet.Abstractions}/IRedLock.cs (100%) rename {RedLockNet.Abstractions.Shared => RedLockNet.Abstractions}/RedLockInstanceSummary.cs (100%) rename {RedLockNet.Abstractions.Shared => RedLockNet.Abstractions}/RedLockStatus.cs (100%) delete mode 100644 RedLockNet.SERedis.Shared/AssemblyInfo.cs delete mode 100644 RedLockNet.SERedis.Shared/RedLockNet.SERedis.Shared.projitems delete mode 100644 RedLockNet.SERedis.Shared/RedLockNet.SERedis.Shared.shproj delete mode 100644 RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj create mode 100644 RedLockNet.SERedis/AssemblyInfo.cs rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Configuration/ExistingMultiplexersRedLockConnectionProvider.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Configuration/InternallyManagedRedLockConnectionProvider.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Configuration/RedLockConfiguration.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Configuration/RedLockConnectionProvider.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Configuration/RedLockEndPoint.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Configuration/RedLockMultiplexer.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Events/RedLockConfigurationChangedEventArgs.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Internal/RedLockInstanceResult.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Internal/RedisConnection.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Lua/Extend.lua (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Lua/Unlock.lua (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/RedLock.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/RedLockFactory.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Util/EmbeddedResourceLoader.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Util/EndPointExtensions.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Util/TaskUtils.cs (100%) rename {RedLockNet.SERedis.Shared => RedLockNet.SERedis}/Util/ThreadSafeRandom.cs (100%) diff --git a/RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj b/Directory.Build.props similarity index 53% rename from RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj rename to Directory.Build.props index 88cd286..97041a6 100644 --- a/RedLockNet.Abstractions.StrongName/RedLockNet.Abstractions.StrongName.csproj +++ b/Directory.Build.props @@ -1,15 +1,11 @@ - - + - netstandard1.1;netstandard2.0 - RedLockNet - False - 2.1.0 + 2.2.0.0 + 2.2.0-pre1 + $(Version) Sam Cook RedLock.net - Abstractions for the RedLock.net package - RedLock.net.Abstractions Copyright 2018 Sam Cook https://github.com/samcook/RedLock.net/blob/master/LICENSE https://github.com/samcook/RedLock.net @@ -18,15 +14,11 @@ git RedLock Redis Distributed Lock + 2.2.0 - Update to StackExchange.Redis 2.0. Switch to a single strong named package and adjust platform targets to match StackExchange.Redis 2.0. 2.1.0 - Add connection change events and more detailed lock status information 2.0.0 - .NET Core release - RedLockNet.Abstractions.StrongName - True - ..\RedLock.StrongName.snk - STRONG_NAME - - - + CS7035 + \ No newline at end of file diff --git a/LICENSE b/LICENSE index 7658865..a2b2a5b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 Sam Cook +Copyright (c) 2018 Sam Cook Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index a3dbc84..0eec1a4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Makes use of the excellent [StackExchange.Redis](https://github.com/StackExchang Distributed locks are useful for ensuring only one process is using a particular resource at any given time (even if the processes are running on different machines). -RedLock.net is available using NuGet - search for [RedLock.net](https://www.nuget.org/packages/RedLock.net) (or [RedLock.net.StrongName](https://www.nuget.org/packages/RedLock.net.StrongName) if you need a strong named version). +RedLock.net is available using NuGet - search for [RedLock.net](https://www.nuget.org/packages/RedLock.net). ## Usage diff --git a/RedLock.StrongName.nuspec b/RedLock.StrongName.nuspec deleted file mode 100644 index 6713069..0000000 --- a/RedLock.StrongName.nuspec +++ /dev/null @@ -1,64 +0,0 @@ - - - - RedLock.net.StrongName - 2.1.0 - RedLock.net (Strong Named) - Sam Cook - Sam Cook - https://github.com/samcook/RedLock.net/blob/master/LICENSE - https://github.com/samcook/RedLock.net - https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png - false - An implementation of the Redlock distributed lock algorithm - - 2.1.0 - Add connection change events and more detailed lock status information - 2.0.0 - .NET Core release - - Copyright 2018 Sam Cook - RedLock Redis Distributed Lock - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RedLock.net.sln b/RedLock.net.sln index abb9dec..1f3472a 100644 --- a/RedLock.net.sln +++ b/RedLock.net.sln @@ -6,12 +6,11 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1DF05864-1C9B-442D-A425-0A14C0D5765B}" ProjectSection(SolutionItems) = preProject appveyor.yml = appveyor.yml + Directory.Build.props = Directory.Build.props LICENSE = LICENSE README.md = README.md redlock-icon.png = redlock-icon.png - RedLock.nuspec = RedLock.nuspec - RedLock.StrongName.nuspec = RedLock.StrongName.nuspec - RedLock.StrongName.snk = RedLock.StrongName.snk + RedLock.snk = RedLock.snk EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedLockNet.SERedis", "RedLockNet.SERedis\RedLockNet.SERedis.csproj", "{024849E0-03AF-4A6E-8CD5-D51EBB10ECB1}" @@ -20,19 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedLockNet.Abstractions", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedLockNet.Tests", "RedLockNet.Tests\RedLockNet.Tests.csproj", "{4F9D3DBD-28D0-45FB-8A83-DCB0EECB00CC}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RedLockNet.SERedis.Shared", "RedLockNet.SERedis.Shared\RedLockNet.SERedis.Shared.shproj", "{D6475C82-F51B-4DB6-8F13-B9BF449E52CF}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RedLockNet.Abstractions.Shared", "RedLockNet.Abstractions.Shared\RedLockNet.Abstractions.Shared.shproj", "{C26C6723-06C4-4B2F-B35A-8FF514A9DB69}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedLockNet.Abstractions.StrongName", "RedLockNet.Abstractions.StrongName\RedLockNet.Abstractions.StrongName.csproj", "{C21C9AAC-A2FF-40C3-A22C-CEBAFD0D03C6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedLockNet.SERedis.StrongName", "RedLockNet.SERedis.StrongName\RedLockNet.SERedis.StrongName.csproj", "{D348355C-446F-4DB9-9973-CDCCF504417F}" -EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - RedLockNet.Abstractions.Shared\RedLockNet.Abstractions.Shared.projitems*{c26c6723-06c4-4b2f-b35a-8ff514a9db69}*SharedItemsImports = 13 - RedLockNet.SERedis.Shared\RedLockNet.SERedis.Shared.projitems*{d6475c82-f51b-4db6-8f13-b9bf449e52cf}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -50,16 +37,11 @@ Global {4F9D3DBD-28D0-45FB-8A83-DCB0EECB00CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {4F9D3DBD-28D0-45FB-8A83-DCB0EECB00CC}.Release|Any CPU.ActiveCfg = Release|Any CPU {4F9D3DBD-28D0-45FB-8A83-DCB0EECB00CC}.Release|Any CPU.Build.0 = Release|Any CPU - {C21C9AAC-A2FF-40C3-A22C-CEBAFD0D03C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C21C9AAC-A2FF-40C3-A22C-CEBAFD0D03C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C21C9AAC-A2FF-40C3-A22C-CEBAFD0D03C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C21C9AAC-A2FF-40C3-A22C-CEBAFD0D03C6}.Release|Any CPU.Build.0 = Release|Any CPU - {D348355C-446F-4DB9-9973-CDCCF504417F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D348355C-446F-4DB9-9973-CDCCF504417F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D348355C-446F-4DB9-9973-CDCCF504417F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D348355C-446F-4DB9-9973-CDCCF504417F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6627A230-06E7-47D1-8471-7B295ADFDB96} + EndGlobalSection EndGlobal diff --git a/RedLock.nuspec b/RedLock.nuspec deleted file mode 100644 index 518415e..0000000 --- a/RedLock.nuspec +++ /dev/null @@ -1,64 +0,0 @@ - - - - RedLock.net - 2.1.0 - RedLock.net - Sam Cook - Sam Cook - https://github.com/samcook/RedLock.net/blob/master/LICENSE - https://github.com/samcook/RedLock.net - https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png - false - An implementation of the Redlock distributed lock algorithm - - 2.1.0 - Add connection change events and more detailed lock status information - 2.0.0 - .NET Core release - - Copyright 2018 Sam Cook - RedLock Redis Distributed Lock - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RedLock.StrongName.snk b/RedLock.snk similarity index 100% rename from RedLock.StrongName.snk rename to RedLock.snk diff --git a/RedLockNet.Abstractions.Shared/RedLockNet.Abstractions.Shared.projitems b/RedLockNet.Abstractions.Shared/RedLockNet.Abstractions.Shared.projitems deleted file mode 100644 index 443dc0c..0000000 --- a/RedLockNet.Abstractions.Shared/RedLockNet.Abstractions.Shared.projitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - c26c6723-06c4-4b2f-b35a-8ff514a9db69 - - - RedLockNet - - - - - - - - \ No newline at end of file diff --git a/RedLockNet.Abstractions.Shared/RedLockNet.Abstractions.Shared.shproj b/RedLockNet.Abstractions.Shared/RedLockNet.Abstractions.Shared.shproj deleted file mode 100644 index 5bc9094..0000000 --- a/RedLockNet.Abstractions.Shared/RedLockNet.Abstractions.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - c26c6723-06c4-4b2f-b35a-8ff514a9db69 - 14.0 - - - - - - - - diff --git a/RedLockNet.Abstractions.Shared/IDistributedLockFactory.cs b/RedLockNet.Abstractions/IDistributedLockFactory.cs similarity index 100% rename from RedLockNet.Abstractions.Shared/IDistributedLockFactory.cs rename to RedLockNet.Abstractions/IDistributedLockFactory.cs diff --git a/RedLockNet.Abstractions.Shared/IRedLock.cs b/RedLockNet.Abstractions/IRedLock.cs similarity index 100% rename from RedLockNet.Abstractions.Shared/IRedLock.cs rename to RedLockNet.Abstractions/IRedLock.cs diff --git a/RedLockNet.Abstractions.Shared/RedLockInstanceSummary.cs b/RedLockNet.Abstractions/RedLockInstanceSummary.cs similarity index 100% rename from RedLockNet.Abstractions.Shared/RedLockInstanceSummary.cs rename to RedLockNet.Abstractions/RedLockInstanceSummary.cs diff --git a/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj b/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj index 5c83ef0..a5f0eba 100644 --- a/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj +++ b/RedLockNet.Abstractions/RedLockNet.Abstractions.csproj @@ -1,29 +1,15 @@  - netstandard1.1;netstandard2.0 + net461;net472;netstandard2.0 + RedLockNet.Abstractions + RedLock.net.Abstractions RedLockNet - False - 2.1.0 - Sam Cook - - RedLock.net + RedLock.net Abstractions Abstractions for the RedLock.net package - RedLock.net.Abstractions - Copyright 2018 Sam Cook - https://github.com/samcook/RedLock.net/blob/master/LICENSE - https://github.com/samcook/RedLock.net - https://github.com/samcook/RedLock.net - https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png - git - RedLock Redis Distributed Lock - - 2.1.0 - Add connection change events and more detailed lock status information - 2.0.0 - .NET Core release - - RedLockNet.Abstractions + False + True + ..\RedLock.snk - - \ No newline at end of file diff --git a/RedLockNet.Abstractions.Shared/RedLockStatus.cs b/RedLockNet.Abstractions/RedLockStatus.cs similarity index 100% rename from RedLockNet.Abstractions.Shared/RedLockStatus.cs rename to RedLockNet.Abstractions/RedLockStatus.cs diff --git a/RedLockNet.SERedis.Shared/AssemblyInfo.cs b/RedLockNet.SERedis.Shared/AssemblyInfo.cs deleted file mode 100644 index afe36bd..0000000 --- a/RedLockNet.SERedis.Shared/AssemblyInfo.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System.Runtime.CompilerServices; - -#if !STRONG_NAME -[assembly:InternalsVisibleTo("RedLockNet.Tests")] -#endif \ No newline at end of file diff --git a/RedLockNet.SERedis.Shared/RedLockNet.SERedis.Shared.projitems b/RedLockNet.SERedis.Shared/RedLockNet.SERedis.Shared.projitems deleted file mode 100644 index 00ba79e..0000000 --- a/RedLockNet.SERedis.Shared/RedLockNet.SERedis.Shared.projitems +++ /dev/null @@ -1,33 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - d6475c82-f51b-4db6-8f13-b9bf449e52cf - - - RedLockNet.SERedis - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RedLockNet.SERedis.Shared/RedLockNet.SERedis.Shared.shproj b/RedLockNet.SERedis.Shared/RedLockNet.SERedis.Shared.shproj deleted file mode 100644 index f555768..0000000 --- a/RedLockNet.SERedis.Shared/RedLockNet.SERedis.Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - d6475c82-f51b-4db6-8f13-b9bf449e52cf - 14.0 - - - - - - - - diff --git a/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj b/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj deleted file mode 100644 index d3d0c6f..0000000 --- a/RedLockNet.SERedis.StrongName/RedLockNet.SERedis.StrongName.csproj +++ /dev/null @@ -1,62 +0,0 @@ - - - - net45;netstandard1.5;netstandard2.0 - RedLockNet.SERedis.StrongName - RedLock.net - RedLockNet.SERedis - 2.1.0 - An implementation of the Redlock distributed lock algorithm - Sam Cook - - RedLock.net - Copyright 2018 Sam Cook - https://github.com/samcook/RedLock.net/blob/master/LICENSE - https://github.com/samcook/RedLock.net - https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png - https://github.com/samcook/RedLock.net - git - RedLock Redis Distributed Lock - - 2.1.0 - Add connection change events and more detailed lock status information - 2.0.0 - .NET Core release - - False - True - ..\RedLock.StrongName.snk - STRONG_NAME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/RedLockNet.SERedis/AssemblyInfo.cs b/RedLockNet.SERedis/AssemblyInfo.cs new file mode 100644 index 0000000..0c7328c --- /dev/null +++ b/RedLockNet.SERedis/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly:InternalsVisibleTo("RedLockNet.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b3ed551c4bc06b26e981f2476ea24d9a11861b963c9954c0257c004125554ed72e28e3cb87588205064a03bd6589f277d0a57e965eaeca2165312384d02bcd41b096a3c28b09e4aa976acb3023d61a3866d182e8e4a9a066c56dc5c186ddfd1b93456f00377d03c22319a0ef4ef4f9b03b163ce4fcbc6a05fa80eec636653aac")] diff --git a/RedLockNet.SERedis.Shared/Configuration/ExistingMultiplexersRedLockConnectionProvider.cs b/RedLockNet.SERedis/Configuration/ExistingMultiplexersRedLockConnectionProvider.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Configuration/ExistingMultiplexersRedLockConnectionProvider.cs rename to RedLockNet.SERedis/Configuration/ExistingMultiplexersRedLockConnectionProvider.cs diff --git a/RedLockNet.SERedis.Shared/Configuration/InternallyManagedRedLockConnectionProvider.cs b/RedLockNet.SERedis/Configuration/InternallyManagedRedLockConnectionProvider.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Configuration/InternallyManagedRedLockConnectionProvider.cs rename to RedLockNet.SERedis/Configuration/InternallyManagedRedLockConnectionProvider.cs diff --git a/RedLockNet.SERedis.Shared/Configuration/RedLockConfiguration.cs b/RedLockNet.SERedis/Configuration/RedLockConfiguration.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Configuration/RedLockConfiguration.cs rename to RedLockNet.SERedis/Configuration/RedLockConfiguration.cs diff --git a/RedLockNet.SERedis.Shared/Configuration/RedLockConnectionProvider.cs b/RedLockNet.SERedis/Configuration/RedLockConnectionProvider.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Configuration/RedLockConnectionProvider.cs rename to RedLockNet.SERedis/Configuration/RedLockConnectionProvider.cs diff --git a/RedLockNet.SERedis.Shared/Configuration/RedLockEndPoint.cs b/RedLockNet.SERedis/Configuration/RedLockEndPoint.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Configuration/RedLockEndPoint.cs rename to RedLockNet.SERedis/Configuration/RedLockEndPoint.cs diff --git a/RedLockNet.SERedis.Shared/Configuration/RedLockMultiplexer.cs b/RedLockNet.SERedis/Configuration/RedLockMultiplexer.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Configuration/RedLockMultiplexer.cs rename to RedLockNet.SERedis/Configuration/RedLockMultiplexer.cs diff --git a/RedLockNet.SERedis.Shared/Events/RedLockConfigurationChangedEventArgs.cs b/RedLockNet.SERedis/Events/RedLockConfigurationChangedEventArgs.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Events/RedLockConfigurationChangedEventArgs.cs rename to RedLockNet.SERedis/Events/RedLockConfigurationChangedEventArgs.cs diff --git a/RedLockNet.SERedis.Shared/Internal/RedLockInstanceResult.cs b/RedLockNet.SERedis/Internal/RedLockInstanceResult.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Internal/RedLockInstanceResult.cs rename to RedLockNet.SERedis/Internal/RedLockInstanceResult.cs diff --git a/RedLockNet.SERedis.Shared/Internal/RedisConnection.cs b/RedLockNet.SERedis/Internal/RedisConnection.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Internal/RedisConnection.cs rename to RedLockNet.SERedis/Internal/RedisConnection.cs diff --git a/RedLockNet.SERedis.Shared/Lua/Extend.lua b/RedLockNet.SERedis/Lua/Extend.lua similarity index 100% rename from RedLockNet.SERedis.Shared/Lua/Extend.lua rename to RedLockNet.SERedis/Lua/Extend.lua diff --git a/RedLockNet.SERedis.Shared/Lua/Unlock.lua b/RedLockNet.SERedis/Lua/Unlock.lua similarity index 100% rename from RedLockNet.SERedis.Shared/Lua/Unlock.lua rename to RedLockNet.SERedis/Lua/Unlock.lua diff --git a/RedLockNet.SERedis.Shared/RedLock.cs b/RedLockNet.SERedis/RedLock.cs similarity index 100% rename from RedLockNet.SERedis.Shared/RedLock.cs rename to RedLockNet.SERedis/RedLock.cs diff --git a/RedLockNet.SERedis.Shared/RedLockFactory.cs b/RedLockNet.SERedis/RedLockFactory.cs similarity index 100% rename from RedLockNet.SERedis.Shared/RedLockFactory.cs rename to RedLockNet.SERedis/RedLockFactory.cs diff --git a/RedLockNet.SERedis/RedLockNet.SERedis.csproj b/RedLockNet.SERedis/RedLockNet.SERedis.csproj index da9243a..0ef6c23 100644 --- a/RedLockNet.SERedis/RedLockNet.SERedis.csproj +++ b/RedLockNet.SERedis/RedLockNet.SERedis.csproj @@ -1,59 +1,42 @@  - net45;netstandard1.5;netstandard2.0 + net461;net472;netstandard2.0 RedLockNet.SERedis RedLock.net RedLockNet.SERedis - 2.1.0 + RedLock.net An implementation of the Redlock distributed lock algorithm - Sam Cook - - RedLock.net - Copyright 2018 Sam Cook - https://github.com/samcook/RedLock.net/blob/master/LICENSE - https://github.com/samcook/RedLock.net - https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png - https://github.com/samcook/RedLock.net - git - RedLock Redis Distributed Lock - - 2.1.0 - Add connection change events and more detailed lock status information - 2.0.0 - .NET Core release - False + True + ..\RedLock.snk + $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - - - + + + + + - - - - - + + + - - - - - + + + - - - - - + + + + - + - - diff --git a/RedLockNet.SERedis.Shared/Util/EmbeddedResourceLoader.cs b/RedLockNet.SERedis/Util/EmbeddedResourceLoader.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Util/EmbeddedResourceLoader.cs rename to RedLockNet.SERedis/Util/EmbeddedResourceLoader.cs diff --git a/RedLockNet.SERedis.Shared/Util/EndPointExtensions.cs b/RedLockNet.SERedis/Util/EndPointExtensions.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Util/EndPointExtensions.cs rename to RedLockNet.SERedis/Util/EndPointExtensions.cs diff --git a/RedLockNet.SERedis.Shared/Util/TaskUtils.cs b/RedLockNet.SERedis/Util/TaskUtils.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Util/TaskUtils.cs rename to RedLockNet.SERedis/Util/TaskUtils.cs diff --git a/RedLockNet.SERedis.Shared/Util/ThreadSafeRandom.cs b/RedLockNet.SERedis/Util/ThreadSafeRandom.cs similarity index 100% rename from RedLockNet.SERedis.Shared/Util/ThreadSafeRandom.cs rename to RedLockNet.SERedis/Util/ThreadSafeRandom.cs diff --git a/RedLockNet.Tests/RedLockNet.Tests.csproj b/RedLockNet.Tests/RedLockNet.Tests.csproj index 11df03f..dbcd584 100644 --- a/RedLockNet.Tests/RedLockNet.Tests.csproj +++ b/RedLockNet.Tests/RedLockNet.Tests.csproj @@ -1,9 +1,11 @@  - net451;net46;netcoreapp2.0 + net461;net472;netcoreapp2.0 RedLockNet.Tests RedLockNet.Tests + True + ..\RedLock.snk @@ -12,22 +14,13 @@ - - - - - - - - - - - + + diff --git a/appveyor.yml b/appveyor.yml index 757222a..01dfd37 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,7 @@ -version: 2.0.{build} +version: 2.2.{build} skip_tags: true image: Visual Studio 2017 configuration: Release -cache: packages -> **\packages.config environment: REDIS_PATH: C:\Users\appveyor\.nuget\packages\redis-64\3.0.503\tools before_build: @@ -11,9 +10,7 @@ build: verbosity: normal after_build: - cmd: >- - nuget pack RedLock.nuspec - - nuget pack RedLock.StrongName.nuspec + dotnet pack --no-build -c Release RedLock.SERedis\RedLock.SERedis.csproj /p:PackageOutputPath=.nupkgs before_test: - ps: >- cd RedLockNet.Tests\RedisConfig @@ -22,4 +19,4 @@ before_test: Start-Sleep 5 artifacts: -- path: '*.nupkg' \ No newline at end of file +- path: '**\.nupkgs\*.nupkg' \ No newline at end of file