Fix CA2016: pass cancellation token to semaphore.Wait in MemoryCacheBase

src/Core/Grand.Infrastructure/Caching/MemoryCacheBase.cs

@@ -10,7 +10,7 @@
 /// <summary>
 ///     Represents a manager for memory caching
 /// </summary>
 public class MemoryCacheBase : ICacheBase, IDisposable
 {
     #region Ctor
 
@@ -46,7 +46,7 @@
     {
         if (_cache.TryGetValue(key, out T cacheEntry)) return cacheEntry;
         var semaphore = CacheEntries.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
-        semaphore.Wait();
+        semaphore.Wait(CancellationToken.None);
         try
         {
             if (!_cache.TryGetValue(key, out cacheEntry))
@@ -72,7 +72,7 @@
     {
         if (_cache.TryGetValue(key, out T cacheEntry)) return cacheEntry;
         var semaphore = CacheEntries.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
         await semaphore.WaitAsync();
         try
         {
             if (!_cache.TryGetValue(key, out cacheEntry))
@@ -97,7 +97,7 @@
     public virtual async Task<T> SetAsync<T>(string key, Func<Task<T>> acquire, int cacheTime)
     {
         var semaphore = CacheEntries.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
         await semaphore.WaitAsync();
         try
         {
             var cacheEntry = await acquire();
@@ -115,7 +115,7 @@
         _cache.Remove(key);
 
         if (publisher)
             await _mediator.Publish(new EntityCacheEvent(key, CacheEvent.RemoveKey));
     }
 
     public virtual async Task RemoveByPrefix(string prefix, bool publisher = true)
@@ -124,7 +124,7 @@
         foreach (var cacheEntries in entriesToRemove) _cache.Remove(cacheEntries.Key);
 
         if (publisher)
             await _mediator.Publish(new EntityCacheEvent(prefix, CacheEvent.RemovePrefix));
     }
 
     public virtual Task Clear(bool publisher = true)

src/Tests/Grand.Infrastructure.Tests/Caching/MemoryCacheBaseTests.cs

@@ -44,6 +44,31 @@
         Assert.AreEqual("test", result);
     }
 
+    [TestMethod]
+    [Timeout(10000)]
+    public async Task Get_WhenClearCancelsWaitingSemaphore_DoesNotThrow()
+    {
+        var acquireStarted = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var releaseAcquire = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        var firstRead = _service.GetAsync("key", async () =>
+        {
+            acquireStarted.SetResult(true);
+            await releaseAcquire.Task;
+            return "test";
+        }, 1);
+
+        await acquireStarted.Task;
+
+        var secondRead = Task.Run(() => _service.Get("key", () => "fallback", 1));
+
+        _service.Clear(false).GetAwaiter().GetResult();
+        releaseAcquire.SetResult(true);
+
+        Assert.AreEqual("test", await firstRead);
+        Assert.AreEqual("test", await secondRead);
+    }
+
     [TestMethod]
     public async Task GetAsyncTest()
     {