Skip to content

Commit 5d5bdd5

Browse files
author
Oren (electricessence)
committed
Updated packaging.
Added nullable support for inspection purposes.
1 parent 5c83927 commit 5d5bdd5

File tree

9 files changed

+198
-161
lines changed

9 files changed

+198
-161
lines changed

Lock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public Lock(object target, int millisecondsTimeout, bool throwIfTimeout = true)
3838

3939
}
4040

41-
protected override void OnDispose(object target)
41+
protected override void OnDispose(object? target)
4242
{
4343
if (target != null) Monitor.Exit(target);
4444
}

LockBase.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*!
22
* @author electricessence / https://github.com/electricessence/
3-
* Licensing: MIT https://github.com/electricessence/Open/blob/dotnet-core/LICENSE.md
43
* Based upon code from Stephen Cleary's Nitro library.
54
*/
65

@@ -12,7 +11,7 @@ namespace Open.Threading
1211
public abstract class LockBase<TSync> : IDisposable
1312
where TSync : class
1413
{
15-
protected TSync _target;
14+
protected TSync? _target;
1615
public readonly bool LockHeld;
1716

1817
protected LockBase(TSync target, bool lockHeld)
@@ -21,7 +20,7 @@ protected LockBase(TSync target, bool lockHeld)
2120
if (lockHeld)
2221
_target = target;
2322
}
24-
protected abstract void OnDispose(TSync target);
23+
protected abstract void OnDispose(TSync? target);
2524

2625
public void Dispose()
2726
{

Open.Threading.ReadWrite.csproj

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
54
<RootNamespace>Open.Threading</RootNamespace>
5+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
6+
<LangVersion>latest</LangVersion>
7+
<Nullable>enable</Nullable>
68
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
79
<Authors>electricessence</Authors>
8-
<Company />
9-
<Product />
10-
<PackageLicenseUrl></PackageLicenseUrl>
1110
<Description>
1211
Useful set of extensions and classes for simplifying and optimizing read-write synchronization.
1312

1413
Part of the "Open" set of libraries.
1514
</Description>
16-
<Version>1.3.3</Version>
17-
<PackageTags>dotnet, dotnet-core, dotnetcore, cs, collections, extensions, threadsafe, thread-safe, readwrite, read-write, readerwriterlock, readerwriterlockslim</PackageTags>
18-
<Copyright>https://github.com/electricessence/Open.Threading/blob/master/LISCENSE.md</Copyright>
19-
<PackageProjectUrl>https://github.com/electricessence/Open.Threading/</PackageProjectUrl>
20-
<RepositoryUrl>https://github.com/electricessence/Open.Threading/</RepositoryUrl>
15+
<PackageTags>collections;extensions;threadsafe;thread safe; thread safety;readwrite;read write;readerwriterlock;readerwriterlockslim</PackageTags>
16+
<Copyright>© electricessence (Oren F.) All rights reserved.</Copyright>
17+
<PackageProjectUrl>https://github.com/Open-NET-Libraries/Open.Threading/</PackageProjectUrl>
18+
<RepositoryUrl>https://github.com/Open-NET-Libraries/Open.Threading/</RepositoryUrl>
2119
<RepositoryType>git</RepositoryType>
20+
<Version>1.4.0</Version>
2221
<PackageReleaseNotes></PackageReleaseNotes>
2322
<PackageLicenseExpression>MIT</PackageLicenseExpression>
23+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
24+
<IncludeSymbols>true</IncludeSymbols>
25+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
26+
<PackageIcon>logo.png</PackageIcon>
2427
</PropertyGroup>
2528

26-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
27-
<LangVersion>latest</LangVersion>
28-
</PropertyGroup>
29-
30-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
31-
<LangVersion>latest</LangVersion>
32-
</PropertyGroup>
29+
<ItemGroup>
30+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
31+
</ItemGroup>
3332

3433
<ItemGroup>
3534
<None Remove=".git" />
3635
<None Remove=".gitignore" />
37-
<None Remove="LISCENSE.md" />
38-
<None Remove="README.md" />
36+
<None Include="logo.png">
37+
<Pack>True</Pack>
38+
<PackagePath></PackagePath>
39+
</None>
3940
</ItemGroup>
4041

4142
<ItemGroup>
42-
<PackageReference Include="Open.Disposable.ObjectPools" Version="2.4.1" />
43+
<PackageReference Include="Open.Disposable.ObjectPools" Version="2.5.0" />
4344
</ItemGroup>
4445

4546
</Project>

ReadLock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ReadLock(ReaderWriterLockSlim target, int? millisecondsTimeout = null, bo
4141
{
4242
}
4343

44-
protected override void OnDispose(ReaderWriterLockSlim target)
44+
protected override void OnDispose(ReaderWriterLockSlim? target)
4545
{
4646
target?.ExitReadLock();
4747
}

0 commit comments

Comments
 (0)