Skip to content

Commit

Permalink
Update to StackExchange.Redis 2.0.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
samcook committed Oct 10, 2018
1 parent 15fe473 commit cda3fb6
Show file tree
Hide file tree
Showing 39 changed files with 53 additions and 388 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<Project>
<PropertyGroup>
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
<RootNamespace>RedLockNet</RootNamespace>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Version>2.1.0</Version>
<AssemblyVersion>2.2.0.0</AssemblyVersion>
<Version>2.2.0-pre1</Version>
<FileVersion>$(Version)</FileVersion>
<Authors>Sam Cook</Authors>
<Company />
<Product>RedLock.net</Product>
<Description>Abstractions for the RedLock.net package</Description>
<PackageId>RedLock.net.Abstractions</PackageId>
<Copyright>Copyright 2018 Sam Cook</Copyright>
<PackageLicenseUrl>https://github.com/samcook/RedLock.net/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/samcook/RedLock.net</PackageProjectUrl>
Expand All @@ -18,15 +14,11 @@
<RepositoryType>git</RepositoryType>
<PackageTags>RedLock Redis Distributed Lock</PackageTags>
<PackageReleaseNotes>
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
</PackageReleaseNotes>
<AssemblyName>RedLockNet.Abstractions.StrongName</AssemblyName>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\RedLock.StrongName.snk</AssemblyOriginatorKeyFile>
<DefineConstants>STRONG_NAME</DefineConstants>
</PropertyGroup>

<Import Project="..\RedLockNet.Abstractions.Shared\RedLockNet.Abstractions.Shared.projitems" Label="Shared" />

<NoWarn>CS7035</NoWarn>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
64 changes: 0 additions & 64 deletions RedLock.StrongName.nuspec

This file was deleted.

28 changes: 5 additions & 23 deletions RedLock.net.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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
Expand All @@ -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
64 changes: 0 additions & 64 deletions RedLock.nuspec

This file was deleted.

File renamed without changes.

This file was deleted.

This file was deleted.

File renamed without changes.
28 changes: 7 additions & 21 deletions RedLockNet.Abstractions/RedLockNet.Abstractions.csproj
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net461;net472;netstandard2.0</TargetFrameworks>
<AssemblyName>RedLockNet.Abstractions</AssemblyName>
<PackageId>RedLock.net.Abstractions</PackageId>
<RootNamespace>RedLockNet</RootNamespace>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Version>2.1.0</Version>
<Authors>Sam Cook</Authors>
<Company />
<Product>RedLock.net</Product>
<Title>RedLock.net Abstractions</Title>
<Description>Abstractions for the RedLock.net package</Description>
<PackageId>RedLock.net.Abstractions</PackageId>
<Copyright>Copyright 2018 Sam Cook</Copyright>
<PackageLicenseUrl>https://github.com/samcook/RedLock.net/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/samcook/RedLock.net</PackageProjectUrl>
<RepositoryUrl>https://github.com/samcook/RedLock.net</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/samcook/RedLock.net/master/redlock-icon.png</PackageIconUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>RedLock Redis Distributed Lock</PackageTags>
<PackageReleaseNotes>
2.1.0 - Add connection change events and more detailed lock status information
2.0.0 - .NET Core release
</PackageReleaseNotes>
<AssemblyName>RedLockNet.Abstractions</AssemblyName>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\RedLock.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<Import Project="..\RedLockNet.Abstractions.Shared\RedLockNet.Abstractions.Shared.projitems" Label="Shared" />

</Project>
File renamed without changes.
5 changes: 0 additions & 5 deletions RedLockNet.SERedis.Shared/AssemblyInfo.cs

This file was deleted.

Loading

0 comments on commit cda3fb6

Please sign in to comment.