Publish EFCoreSecondLevelCacheInterceptor.HybridCache, Close #292

Author: VahidN

src/EFCoreSecondLevelCacheInterceptor.HybridCache/EFHybridCacheDependenciesStore.cs

@@ -27,10 +27,11 @@ public void AddCacheDependencies(IEnumerable<string>? tags)
     {
         tags ??= [];
 
-        // NOTE: hybridCache doesn't have a synchronous API!! So ... we will wait!
-
-        var currentTags = await hybridCache.GetOrCreateAsync<List<string>>(TagsCacheKey,
-            factory => ValueTask.FromResult<List<string>>([]));
+        var currentTags = hybridCache.GetOrCreateAsync<List<string>>(TagsCacheKey,
+                factory => ValueTask.FromResult<List<string>>([]))
+            .Preserve()
+            .GetAwaiter()
+            .GetResult();
 
         foreach (var tag in tags)
         {
@@ -40,7 +41,7 @@ public void AddCacheDependencies(IEnumerable<string>? tags)
             }
         }
 
-        hybridCache.SetAsync(TagsCacheKey, currentTags, Options);
+        hybridCache.SetAsync(TagsCacheKey, currentTags, Options).Preserve().GetAwaiter().GetResult();
     }
 
     /// <summary>
@@ -51,22 +52,27 @@ public void RemoveCacheDependencies(IEnumerable<string>? tags)
     {
         tags ??= [];
 
-        var currentTags = await hybridCache.GetOrCreateAsync<List<string>>(TagsCacheKey,
-            factory => ValueTask.FromResult<List<string>>([]));
+        var currentTags = hybridCache.GetOrCreateAsync<List<string>>(TagsCacheKey,
+                factory => ValueTask.FromResult<List<string>>([]))
+            .Preserve()
+            .GetAwaiter()
+            .GetResult();
 
         foreach (var tag in tags)
         {
             currentTags.Remove(tag);
         }
 
-        hybridCache.SetAsync(TagsCacheKey, currentTags, Options);
+        hybridCache.SetAsync(TagsCacheKey, currentTags, Options).Preserve().GetAwaiter().GetResult();
     }
 
     /// <summary>
     ///     Returns the cached entries added by this library.
     /// </summary>
     public ISet<string> GetAllCacheDependencies()
         => new HashSet<string>(
-            await hybridCache.GetOrCreateAsync<List<string>>(TagsCacheKey,
-                factory => ValueTask.FromResult<List<string>>([])), StringComparer.Ordinal);
+            hybridCache.GetOrCreateAsync<List<string>>(TagsCacheKey, factory => ValueTask.FromResult<List<string>>([]))
+                .Preserve()
+                .GetAwaiter()
+                .GetResult(), StringComparer.Ordinal);
 }

src/EFCoreSecondLevelCacheInterceptor.HybridCache/EFHybridCacheProvider.cs

@@ -24,18 +24,19 @@ public void InsertValue(EFCacheKey cacheKey, EFCachedData? value, EFCachePolicy
         ArgumentNullException.ThrowIfNull(cacheKey);
         ArgumentNullException.ThrowIfNull(cachePolicy);
 
-        // NOTE: hybridCache doesn't have a synchronous API!! So ... we will wait!
-
         value ??= new EFCachedData
         {
             IsNull = true
         };
 
         hybridCache.SetAsync(cacheKey.KeyHash, value, new HybridCacheEntryOptions
-        {
-            Expiration = cachePolicy.CacheTimeout,
-            LocalCacheExpiration = cachePolicy.CacheTimeout
-        }, cacheKey.CacheDependencies);
+            {
+                Expiration = cachePolicy.CacheTimeout,
+                LocalCacheExpiration = cachePolicy.CacheTimeout
+            }, cacheKey.CacheDependencies)
+            .Preserve()
+            .GetAwaiter()
+            .GetResult();
 
         cacheDependenciesStore.AddCacheDependencies(cacheKey.CacheDependencies);
     }
@@ -62,10 +63,13 @@ public void ClearAllCachedEntries()
         ArgumentNullException.ThrowIfNull(cacheKey);
 
         return hybridCache.GetOrCreateAsync<EFCachedData?>(cacheKey.KeyHash, factory
-            => ValueTask.FromResult<EFCachedData?>(new EFCachedData
-            {
-                IsNull = true
-            }));
+                => ValueTask.FromResult<EFCachedData?>(new EFCachedData
+                {
+                    IsNull = true
+                }))
+            .Preserve()
+            .GetAwaiter()
+            .GetResult();
     }
 
     /// <summary>
@@ -81,11 +85,7 @@ public void InvalidateCacheDependencies(EFCacheKey cacheKey)
 
     private void InvalidateTaggedEntries(ISet<string> cacheDependencies)
     {
-        foreach (var rootCacheKey in cacheDependencies)
-        {
-            hybridCache.RemoveByTagAsync(rootCacheKey);
-        }
-
+        hybridCache.RemoveByTagAsync(cacheDependencies).Preserve().GetAwaiter().GetResult();
         cacheDependenciesStore.RemoveCacheDependencies(cacheDependencies);
     }
 }