Skip to content

Commit

Permalink
Merge pull request #1 from june-it/develop
Browse files Browse the repository at this point in the history
Add. NET framework version and Nuget tags
  • Loading branch information
june-it authored Dec 18, 2024
2 parents 54f5bcb + 1fd2398 commit e0f4b74
Showing 2 changed files with 42 additions and 42 deletions.
Original file line number Diff line number Diff line change
@@ -1,46 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Nullable>enable</Nullable>
<TargetFramework>netstandard2.1</TargetFramework>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Title>MyStack.DistributedLock4Redis</Title>
<Version>1.0.7</Version>
<Authors>Jun Wan</Authors>
<Company>Jun Wan</Company>
<PackageIcon>icon.png</PackageIcon>
<PackageReadmeFile>NUGET.md</PackageReadmeFile>
<Description>Open-source Lightweight Distributed Lock Library (Based on Redis)</Description>
<RootNamespace>Microsoft.Extensions.DistributedLock4Redis</RootNamespace>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/june-it/MyStack.DistributedLock4Redis.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<Nullable>enable</Nullable>
<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Title>MyStack.DistributedLock4Redis</Title>
<Version>1.0.8</Version>
<Authors>Jun Wan</Authors>
<Company>Jun Wan</Company>
<PackageIcon>icon.png</PackageIcon>
<PackageReadmeFile>NUGET.md</PackageReadmeFile>
<Description>Open-source Lightweight Distributed Lock Library (Based on Redis)</Description>
<RootNamespace>Microsoft.Extensions.DistributedLock4Redis</RootNamespace>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryUrl>https://github.com/june-it/MyStack.DistributedLock4Redis.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<PackageTags>MyStack;Redis;Distributed Lock</PackageTags>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\icon.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\..\NUGET.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CSRedisCore" Version="3.8.801" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\icon.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\..\NUGET.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="CSRedisCore" Version="3.8.801" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions src/MyStack.DistributedLock4Redis/RedisDistributedLock.cs
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@ public RedisDistributedLock(IOptions<DistributedLock4RedisOptions> options, Lock
protected DistributedLock4RedisOptions Options { get; }
public async Task<IDistributedLockHandle?> TryAcquireAsync(string key, int? expireSeconds = null, int? attemptSeconds = null, CancellationToken cancellation = default)
{
cancellation.ThrowIfCancellationRequested();
if (string.IsNullOrEmpty(key))
{
throw new ArgumentNullException(nameof(key), "Key name cannot be null or empty");
@@ -27,7 +26,7 @@ public RedisDistributedLock(IOptions<DistributedLock4RedisOptions> options, Lock
key = LockKeyResolver.GetKey(key);

DateTime begin = DateTime.Now;
while (true)
while (!cancellation.IsCancellationRequested)
{
if (await RedisHelper.SetAsync(key, Thread.CurrentThread.ManagedThreadId, attemptSeconds ?? Options.DefaultExpireSeconds, RedisExistence.Nx))
{

0 comments on commit e0f4b74

Please sign in to comment.