Merge pull request #239 from MarkCiliaVincenti/AsyncLock

Made use of AsyncNonKeyedLocker; bumped AsyncKeyedLock library.
VahidN · Apr 21, 2024 · ad169cd · ad169cd
2 parents 3b53c5e + 0875883
commit ad169cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/src/EFCoreSecondLevelCacheInterceptor/EFCoreSecondLevelCacheInterceptor.csproj b/src/EFCoreSecondLevelCacheInterceptor/EFCoreSecondLevelCacheInterceptor.csproj
@@ -63,7 +63,7 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
-        <PackageReference Include="AsyncKeyedLock" Version="[6.3.4,)"/>
+        <PackageReference Include="AsyncKeyedLock" Version="[6.4.1,)"/>
         <None Include="../../README.md" Link="README.md" Pack="true" PackagePath="/" Visible="false"/>
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">

diff --git a/src/Tests/EFCoreSecondLevelCacheInterceptor.Tests/Settings/EFServiceProvider.cs b/src/Tests/EFCoreSecondLevelCacheInterceptor.Tests/Settings/EFServiceProvider.cs
@@ -1,7 +1,7 @@
-using System;
+using System;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
+using AsyncKeyedLock;
 using CacheManager.Core;
 using EasyCaching.Core.Configurations;
 using EasyCaching.InMemory;
@@ -54,7 +54,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 public static class EFServiceProvider
 {
-    private static readonly SemaphoreSlim _semaphoreSlim = new(1, 1);
+    private static readonly AsyncNonKeyedLocker _locker = new();
 
     public static IEFCacheServiceProvider GetCacheServiceProvider(TestCacheProvider provider)
     {
@@ -377,8 +377,7 @@ public static string GetConnectionString(string basePath, IConfigurationRoot con
         bool cacheAllQueries,
         params Action<ApplicationDbContext, DebugLoggerProvider>[] actions)
     {
-        _semaphoreSlim.Wait();
-        try
+        using (_locker.Lock())
         {
             var serviceProvider = GetConfiguredContextServiceProvider(cacheProvider, logLevel, cacheAllQueries);
             var cacheServiceProvider = serviceProvider.GetRequiredService<IEFCacheServiceProvider>();
@@ -394,10 +393,6 @@ public static string GetConnectionString(string basePath, IConfigurationRoot con
                 }
             }
         }
-        finally
-        {
-            _semaphoreSlim.Release();
-        }
     }
 
     public static async Task RunInContextAsync(
@@ -406,8 +401,7 @@ public static string GetConnectionString(string basePath, IConfigurationRoot con
         bool cacheAllQueries,
         params Func<ApplicationDbContext, DebugLoggerProvider, Task>[] actions)
     {
-        await _semaphoreSlim.WaitAsync();
-        try
+        using (await _locker.LockAsync())
         {
             var serviceProvider = GetConfiguredContextServiceProvider(cacheProvider, logLevel, cacheAllQueries);
             var cacheServiceProvider = serviceProvider.GetRequiredService<IEFCacheServiceProvider>();
@@ -424,10 +418,6 @@ public static string GetConnectionString(string basePath, IConfigurationRoot con
                 }
             }
         }
-        finally
-        {
-            _semaphoreSlim.Release();
-        }
     }
 
     public static void ExecuteInParallel(Action test, int count = 40)