Cleanup and simplification.

Author: electricessence

GlobalSuppressions.cs

@@ -0,0 +1,9 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize", Justification = "<Pending>", Scope = "member", Target = "~M:Open.Threading.LockBase`1.Dispose")]
+[assembly: SuppressMessage("Usage", "CA2219:Do not raise exceptions in finally clauses", Justification = "<Pending>", Scope = "member", Target = "~M:Open.Threading.ReadWriteHelper`1.Execute(`0,Open.Threading.LockType,System.Action{System.Threading.ReaderWriterLockSlim},System.Nullable{System.Int32},System.Boolean)~System.Boolean")]

Open.Threading.ReadWrite.csproj

@@ -5,6 +5,7 @@
 		<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
+		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Authors>electricessence</Authors>
 		<Description>
@@ -40,7 +41,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Open.Disposable.ObjectPools" Version="2.5.0" />
+		<PackageReference Include="Open.Disposable.ObjectPools" Version="2.6.0" />
 	</ItemGroup>
 
 </Project>

ReadWriteHelper.cs

@@ -19,7 +19,7 @@ public class ReadWriteHelper<TKey> : DeferredCleanupBase
 
 		class ReaderWriterLockTracker : DisposableBase
 		{
-			readonly HashSet<object> _registry = new HashSet<object>();
+			readonly HashSet<object> _registry = new();
 
 			public ReaderWriterLockSlim? Lock;
 
@@ -85,10 +85,10 @@ protected override void OnDispose()
 		readonly ConcurrentQueueObjectPool<ReaderWriterLockTracker> LockPool;
 
 		readonly ConcurrentDictionary<TKey, ReaderWriterLockTracker> Locks
-			= new ConcurrentDictionary<TKey, ReaderWriterLockTracker>();
+			= new();
 
 		readonly ReaderWriterLockSlim CleanupManager
-			= new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
+			= new(LockRecursionPolicy.SupportsRecursion);
 
 		public ReadWriteHelper() : this(false)
 		{
@@ -191,7 +191,7 @@ public LockRecursionPolicy RecursionPolicy
 					try
 					{
 						// result.Lock will only be null if the tracker has been disposed.
-						lockHeld = AcquireLock(result.Lock, type, millisecondsTimeout, throwsOnTimeout);
+						lockHeld = ReadWriteHelper<TKey>.AcquireLock(result.Lock, type, millisecondsTimeout, throwsOnTimeout);
 					}
 					catch (LockRecursionException lrex)
 					{
@@ -227,7 +227,7 @@ void Debug_TrackerDisposedWhileInUse(object sender, EventArgs e)
 			//	Debug.Fail("Attempting to dispose a tracker that is still availalbe in the pool.");
 		}
 
-		private bool AcquireLock(ReaderWriterLockSlim? target, LockType type, int? millisecondsTimeout = null, bool throwsOnTimeout = false)
+		private static bool AcquireLock(ReaderWriterLockSlim? target, LockType type, int? millisecondsTimeout = null, bool throwsOnTimeout = false)
 		{
 			if (target is null)
 				throw new ArgumentNullException(nameof(target));
@@ -318,7 +318,7 @@ private bool Execute<T>(
 			int? millisecondsTimeout = null,
 			bool throwsOnTimeout = false)
 		{
-			T r = default;
+			T r = default!;
 
 			var acquired = Execute(key, type, (rwlock) =>
 			{

ReaderWriterLockSlimExensions.cs

@@ -751,7 +751,7 @@ public static bool TryReadValue<T>(this ReaderWriterLockSlim target,
 			ValidateMillisecondsTimeout(millisecondsTimeout);
 			Contract.EndContractBlock();
 
-			T r = default;
+			T r = default!;
 			var lockHeld = target.Read(() => r = valueFactory(), millisecondsTimeout);
 			result = r!;
 			return lockHeld;
@@ -775,7 +775,7 @@ public static bool TryWriteValue<T>(this ReaderWriterLockSlim target,
 			ValidateMillisecondsTimeout(millisecondsTimeout);
 			Contract.EndContractBlock();
 
-			T r = default;
+			T r = default!;
 			var lockHeld = target.Write(() => r = valueFactory(), millisecondsTimeout);
 			result = r!;
 			return lockHeld;
@@ -795,7 +795,7 @@ public static T ReadValue<T>(this ReaderWriterLockSlim target,
 			ValidateMillisecondsTimeout(millisecondsTimeout);
 			Contract.EndContractBlock();
 
-			T result = default;
+			T result = default!;
 			target.Read(() => result = valueFactory(), millisecondsTimeout, true);
 			return result!;
 		}
@@ -814,7 +814,7 @@ public static T WriteValue<T>(this ReaderWriterLockSlim target,
 			ValidateMillisecondsTimeout(millisecondsTimeout);
 			Contract.EndContractBlock();
 
-			T result = default;
+			T result = default!;
 			target.Write(() => result = valueFactory(), millisecondsTimeout, true);
 			return result!;
 		}

UpgradableReadLock.cs

@@ -37,7 +37,7 @@ namespace Open.Threading
 	/// </summary>
 	public sealed class UpgradableReadLock : LockBase<ReaderWriterLockSlim>
 	{
-		readonly object _sync = new object();
+		readonly object _sync = new();
 		WriteLock? _upgraded;
 		public UpgradableReadLock(ReaderWriterLockSlim target, int? millisecondsTimeout = null, bool throwIfTimeout = true)
 		: base(target, target.EnterUpgradeableReadLock(millisecondsTimeout, throwIfTimeout))