Nito -> AsyncLock

Author: soenneker

src/AsyncSingleton{T,T1}.cs

@@ -1,10 +1,10 @@
-using Nito.AsyncEx;
-using Soenneker.Atomics.ValueBools;
+using Soenneker.Atomics.ValueBools;
 using Soenneker.Extensions.ValueTask;
 using Soenneker.Utils.AsyncSingleton.Abstract;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Soenneker.Asyncs.Locks;
 
 namespace Soenneker.Utils.AsyncSingleton;
 
@@ -54,7 +54,7 @@ private ValueTask<T> GetOrCreate(CancellationToken ct, T1 arg)
 
         async ValueTask<T> Slow(CancellationToken token, T1 a)
         {
-            using (await _lock.LockAsync(token).ConfigureAwait(false))
+            using (await _lock.Lock(token).NoSync())
             {
                 if (_disposed.Value)
                     throw new ObjectDisposedException(typeof(AsyncSingleton<T, T1>).Name);
@@ -80,7 +80,7 @@ public T GetSync(T1 arg, CancellationToken cancellationToken = default)
         if (_hasValue.Value)
             return _instance!;
 
-        using (_lock.Lock())
+        using (_lock.LockSync())
         {
             if (_disposed.Value)
                 throw new ObjectDisposedException(typeof(AsyncSingleton<T, T1>).Name);
@@ -138,7 +138,7 @@ public void Dispose()
 
         object? local;
 
-        using (_lock.Lock())
+        using (_lock.LockSync())
         {
             _hasValue.Value = false;
             local = _instance;
@@ -160,7 +160,7 @@ public async ValueTask DisposeAsync()
 
         object? local;
 
-        using (await _lock.LockAsync().ConfigureAwait(false))
+        using (await _lock.Lock().NoSync())
         {
             _hasValue.Value = false;
             local = _instance;

src/AsyncSingleton{T}.cs

@@ -1,10 +1,10 @@
-using Nito.AsyncEx;
-using Soenneker.Atomics.ValueBools;
+using Soenneker.Atomics.ValueBools;
 using Soenneker.Extensions.ValueTask;
 using Soenneker.Utils.AsyncSingleton.Abstract;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Soenneker.Asyncs.Locks;
 
 namespace Soenneker.Utils.AsyncSingleton;
 
@@ -54,7 +54,7 @@ public virtual ValueTask<T> GetOrCreate(CancellationToken cancellationToken = de
 
         async ValueTask<T> Slow(CancellationToken ct)
         {
-            using (await _lock.LockAsync(ct).ConfigureAwait(false))
+            using (await _lock.Lock(ct).NoSync())
             {
                 if (_disposed.Value)
                     throw new ObjectDisposedException(typeof(AsyncSingleton<T>).Name);
@@ -80,7 +80,7 @@ public T GetSync(CancellationToken cancellationToken = default)
         if (_hasValue.Value)
             return (T)_instance!;
 
-        using (_lock.Lock())
+        using (_lock.LockSync())
         {
             if (_disposed.Value)
                 throw new ObjectDisposedException(typeof(AsyncSingleton<T>).Name);
@@ -138,7 +138,7 @@ public void Dispose()
 
         object? local;
 
-        using (_lock.Lock())
+        using (_lock.LockSync())
         {
             _hasValue.Value = false;
             local = _instance;
@@ -161,7 +161,7 @@ public async ValueTask DisposeAsync()
 
         object? local;
 
-        using (await _lock.LockAsync().ConfigureAwait(false))
+        using (await _lock.Lock().NoSync())
         {
             _hasValue.Value = false;
             local = _instance;

src/Soenneker.Utils.AsyncSingleton.csproj

@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net10.0</TargetFramework>
@@ -30,23 +32,17 @@
         <LangVersion>latest</LangVersion>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageIcon>icon.png</PackageIcon>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild></PropertyGroup>
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    </PropertyGroup>
 
-    <ItemGroup>
-      <Compile Remove="NewFolder\**" />
-      <EmbeddedResource Remove="NewFolder\**" />
-      <None Remove="NewFolder\**" />
-    </ItemGroup>
-    
     <ItemGroup>
         <None Include="..\README.md" Pack="true" PackagePath="\" />
         <None Include="..\LICENSE" Pack="true" PackagePath="\" />
         <None Include="..\icon.png" Pack="true" PackagePath="\" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-        <PackageReference Include="Soenneker.Atomics.ValueBools" Version="4.0.3" />
-        <PackageReference Include="Soenneker.Extensions.ValueTask" Version="4.0.97" />
+        <PackageReference Include="Soenneker.Asyncs.Locks" Version="4.0.1" />
+        <PackageReference Include="Soenneker.Extensions.ValueTask" Version="4.0.98" />
     </ItemGroup>
-</Project>
+</Project>