Upgrade to .NET 9x

Author: VahidN

.editorconfig

@@ -9,7 +9,18 @@ dotnet_diagnostic.S127.severity = suggestion
 dotnet_diagnostic.S2857.severity = suggestion
 dotnet_diagnostic.S2094.severity = suggestion
 dotnet_diagnostic.CA2227.severity = suggestion 
+
 dotnet_diagnostic.IDE0055.severity = none
+dotnet_diagnostic.IDE0160.severity = none
+dotnet_diagnostic.IDE0022.severity = none
+dotnet_diagnostic.IDE0021.severity = none
+dotnet_diagnostic.IDE0008.severity = none
+dotnet_diagnostic.IDE0058.severity = suggestion 
+dotnet_diagnostic.IDE0046.severity = suggestion
+dotnet_diagnostic.IDE0048.severity = suggestion
+dotnet_diagnostic.IDE0010.severity = suggestion
+dotnet_diagnostic.IDE0045.severity = suggestion
+
 
 # CA1510: Use 'ArgumentNullException.ThrowIfNull' instead of explicitly throwing a new exception instance
 dotnet_diagnostic.CA1510.severity = suggestion

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Build EFCoreSecondLevelCacheInterceptor lib
       run: dotnet build ./src/EFCoreSecondLevelCacheInterceptor/EFCoreSecondLevelCacheInterceptor.csproj --configuration Release
 

.github/workflows/codeql.yml

@@ -66,7 +66,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Build
       run: dotnet build --configuration Release    
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.400",
+    "version": "9.0.100",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }

src/EFCoreSecondLevelCacheInterceptor/CacheSpecificQueriesOptions.cs

@@ -6,17 +6,15 @@ namespace EFCoreSecondLevelCacheInterceptor;
 /// <summary>
 ///     CacheAllQueries Options
 /// </summary>
-public class CacheSpecificQueriesOptions : CacheAllQueriesOptions
+/// <remarks>
+///     CacheAllQueries Options
+/// </remarks>
+public class CacheSpecificQueriesOptions(IList<Type>? entityTypes) : CacheAllQueriesOptions
 {
-    /// <summary>
-    ///     CacheAllQueries Options
-    /// </summary>
-    public CacheSpecificQueriesOptions(IList<Type>? entityTypes) => EntityTypes = entityTypes;
-
     /// <summary>
     ///     Given entity types to cache
     /// </summary>
-    public IList<Type>? EntityTypes { get; }
+    public IList<Type>? EntityTypes { get; } = entityTypes;
 
     /// <summary>
     ///     How should we determine which tables should be cached?

src/EFCoreSecondLevelCacheInterceptor/DbCommandInterceptorProcessor.cs

@@ -236,7 +236,7 @@ public T ProcessExecutingCommands<T>(DbCommand command, DbContext? context, T re
 
             var efCacheKey = _cacheKeyProvider.GetEFCacheKey(command, context, cachePolicy);
 
-            if (!(_cacheService.GetValue(efCacheKey, cachePolicy) is EFCachedData cacheResult))
+            if (_cacheService.GetValue(efCacheKey, cachePolicy) is not { } cacheResult)
             {
                 if (_logger.IsLoggerEnabled)
                 {

src/EFCoreSecondLevelCacheInterceptor/EFCacheKey.cs

@@ -6,13 +6,11 @@ namespace EFCoreSecondLevelCacheInterceptor;
 /// <summary>
 ///     Stores information of the computed key of the input LINQ query.
 /// </summary>
-public class EFCacheKey
+/// <remarks>
+///     Stores information of the computed key of the input LINQ query.
+/// </remarks>
+public class EFCacheKey(ISet<string> cacheDependencies)
 {
-    /// <summary>
-    ///     Stores information of the computed key of the input LINQ query.
-    /// </summary>
-    public EFCacheKey(ISet<string> cacheDependencies) => CacheDependencies = cacheDependencies;
-
     /// <summary>
     ///     Hash of the input LINQ query's computed key.
     /// </summary>
@@ -27,7 +25,7 @@ public class EFCacheKey
     ///     Determines which entities are used in this LINQ query.
     ///     This array will be used to invalidate the related cache of all related queries automatically.
     /// </summary>
-    public ISet<string> CacheDependencies { get; }
+    public ISet<string> CacheDependencies { get; } = cacheDependencies;
 
     /// <summary>
     ///     Equals
@@ -40,7 +38,8 @@ public override bool Equals(object? obj)
             return false;
         }
 
-        return string.Equals(KeyHash, efCacheKey.KeyHash, StringComparison.Ordinal) && DbContext == efCacheKey.DbContext;
+        return string.Equals(KeyHash, efCacheKey.KeyHash, StringComparison.Ordinal) &&
+               DbContext == efCacheKey.DbContext;
     }
 
     /// <summary>
@@ -51,13 +50,15 @@ public override int GetHashCode()
         unchecked
         {
             var hash = 17;
-            return hash * 23 + KeyHash.GetHashCode(StringComparison.Ordinal) + (DbContext == null ? 0 : DbContext.Name.GetHashCode(StringComparison.Ordinal));
+
+            return hash * 23 + KeyHash.GetHashCode(StringComparison.Ordinal) +
+                   (DbContext == null ? 0 : DbContext.Name.GetHashCode(StringComparison.Ordinal));
         }
     }
 
     /// <summary>
     ///     ToString
     /// </summary>
-    public override string ToString() =>
-        $"KeyHash: {KeyHash}, DbContext: {DbContext?.Name}, CacheDependencies: {string.Join(", ", CacheDependencies)}.";
+    public override string ToString()
+        => $"KeyHash: {KeyHash}, DbContext: {DbContext?.Name}, CacheDependencies: {string.Join(separator: ", ", CacheDependencies)}.";
 }

src/EFCoreSecondLevelCacheInterceptor/EFCacheKeyProvider.cs

@@ -3,9 +3,9 @@
 using System.Text;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-#if NET5_0 || NET6_0 || NET7_0 || NET8_0
+#if NET9_0 || NET5_0 || NET6_0 || NET7_0 || NET8_0
 using System.Text.Json;
+using Microsoft.Extensions.Options;
 
 #else
 using System.Collections;
@@ -19,7 +19,7 @@ namespace EFCoreSecondLevelCacheInterceptor;
 /// </summary>
 public class EFCacheKeyProvider : IEFCacheKeyProvider
 {
-#if NET5_0 || NET6_0 || NET7_0 || NET8_0
+#if NET9_0 || NET5_0 || NET6_0 || NET7_0 || NET8_0
     private readonly EFCoreSecondLevelCacheSettings _settings;
 #endif
 
@@ -40,7 +40,7 @@ public EFCacheKeyProvider(IEFCacheDependenciesProcessor cacheDependenciesProcess
         ILogger<EFCacheKeyProvider> keyProviderLogger,
         IEFHashProvider hashProvider,
         IEFCacheKeyPrefixProvider cacheKeyPrefixProvider
-#if NET5_0 || NET6_0 || NET7_0 || NET8_0
+#if NET9_0 || NET5_0 || NET6_0 || NET7_0 || NET8_0
         ,
         IOptions<EFCoreSecondLevelCacheSettings> cacheSettings
 #endif
@@ -52,7 +52,7 @@ IOptions<EFCoreSecondLevelCacheSettings> cacheSettings
         _cachePolicyParser = cachePolicyParser;
         _hashProvider = hashProvider ?? throw new ArgumentNullException(nameof(hashProvider));
         _cacheKeyPrefixProvider = cacheKeyPrefixProvider;
-#if NET5_0 || NET6_0 || NET7_0 || NET8_0
+#if NET9_0 || NET5_0 || NET6_0 || NET7_0 || NET8_0
         _settings = cacheSettings?.Value ?? throw new ArgumentNullException(nameof(cacheSettings));
 #endif
     }
@@ -81,7 +81,7 @@ public EFCacheKey GetEFCacheKey(DbCommand command, DbContext context, EFCachePol
             throw new ArgumentNullException(nameof(cachePolicy));
         }
 
-        var cacheKey = getCacheKey(command, cachePolicy.CacheSaltKey);
+        var cacheKey = GetCacheKey(command, cachePolicy.CacheSaltKey);
         var cacheKeyPrefix = _cacheKeyPrefixProvider.GetCacheKeyPrefix();
 
         var cacheKeyHash = !string.IsNullOrEmpty(cacheKeyPrefix)
@@ -94,8 +94,8 @@ public EFCacheKey GetEFCacheKey(DbCommand command, DbContext context, EFCachePol
         if (_logger.IsLoggerEnabled)
         {
             _keyProviderLogger.LogDebug(
-                "KeyHash: {CacheKeyHash}, DbContext: {Name}, CacheDependencies: {Dependencies}.", cacheKeyHash,
-                cacheDbContextType?.Name, string.Join(", ", cacheDependencies));
+                message: "KeyHash: {CacheKeyHash}, DbContext: {Name}, CacheDependencies: {Dependencies}.", cacheKeyHash,
+                cacheDbContextType?.Name, string.Join(separator: ", ", cacheDependencies));
         }
 
         return new EFCacheKey(cacheDependencies)
@@ -105,12 +105,12 @@ public EFCacheKey GetEFCacheKey(DbCommand command, DbContext context, EFCachePol
         };
     }
 
-    private string getCacheKey(DbCommand command, string saltKey)
+    private string GetCacheKey(DbCommand command, string saltKey)
     {
         var cacheKey = new StringBuilder();
         cacheKey.AppendLine(_cachePolicyParser.RemoveEFCachePolicyTag(command.CommandText));
 
-        cacheKey.AppendLine("ConnectionString").Append('=').Append(command.Connection?.ConnectionString);
+        cacheKey.AppendLine(value: "ConnectionString").Append(value: '=').Append(command.Connection?.ConnectionString);
 
         foreach (DbParameter? parameter in command.Parameters)
         {
@@ -120,33 +120,33 @@ private string getCacheKey(DbCommand command, string saltKey)
             }
 
             cacheKey.Append(parameter.ParameterName)
-                .Append('=')
+                .Append(value: '=')
                 .Append(GetParameterValue(parameter))
-                .Append(',')
-                .Append("Size")
-                .Append('=')
+                .Append(value: ',')
+                .Append(value: "Size")
+                .Append(value: '=')
                 .Append(parameter.Size)
-                .Append(',')
-                .Append("Precision")
-                .Append('=')
+                .Append(value: ',')
+                .Append(value: "Precision")
+                .Append(value: '=')
                 .Append(parameter.Precision)
-                .Append(',')
-                .Append("Scale")
-                .Append('=')
+                .Append(value: ',')
+                .Append(value: "Scale")
+                .Append(value: '=')
                 .Append(parameter.Scale)
-                .Append(',')
-                .Append("Direction")
-                .Append('=')
+                .Append(value: ',')
+                .Append(value: "Direction")
+                .Append(value: '=')
                 .Append(parameter.Direction)
-                .Append(',');
+                .Append(value: ',');
         }
 
-        cacheKey.AppendLine("SaltKey").Append('=').Append(saltKey);
+        cacheKey.AppendLine(value: "SaltKey").Append(value: '=').Append(saltKey);
 
         return cacheKey.ToString().Trim();
     }
 
-#if NET5_0 || NET6_0 || NET7_0 || NET8_0
+#if NET9_0 || NET5_0 || NET6_0 || NET7_0 || NET8_0
     private string? GetParameterValue(DbParameter parameter)
         => _settings.JsonSerializerOptions is null
             ? JsonSerializer.Serialize(parameter.Value)

src/EFCoreSecondLevelCacheInterceptor/EFCacheManagerCoreProvider.cs

@@ -53,13 +53,10 @@ public void InsertValue(EFCacheKey cacheKey, EFCachedData value, EFCachePolicy c
             throw new ArgumentNullException(nameof(cacheKey));
         }
 
-        if (value == null)
+        value ??= new EFCachedData
         {
-            value = new EFCachedData
-            {
-                IsNull = true
-            };
-        }
+            IsNull = true
+        };
 
         var keyHash = cacheKey.KeyHash;
 

src/EFCoreSecondLevelCacheInterceptor/EFCachePolicyParser.cs

@@ -94,7 +94,7 @@ public string RemoveEFCachePolicyTag(string commandText)
 
         var additionalNewlineIndex = commandText.IndexOf(value: '\n', endIndex + 1) - endIndex;
 
-        if (additionalNewlineIndex == 1 || additionalNewlineIndex == 2)
+        if (additionalNewlineIndex is 1 or 2)
         {
             // EF's TagWith(..) method inserts an additional line break between
             // comments which we can remove as well
@@ -197,7 +197,7 @@ private bool ShouldCacheQueriesContainingTableTypes(string commandText,
         switch (options.TableTypeComparison)
         {
             case TableTypeComparison.Contains:
-                if (queryEntityTypes.Any(entityType => options.EntityTypes.Contains(entityType)))
+                if (queryEntityTypes.Any(options.EntityTypes.Contains))
                 {
                     return true;
                 }
@@ -219,7 +219,7 @@ private bool ShouldCacheQueriesContainingTableTypes(string commandText,
 
                 break;
             case TableTypeComparison.ContainsOnly:
-                if (queryEntityTypes.All(x => options.EntityTypes.Contains(x)))
+                if (queryEntityTypes.All(options.EntityTypes.Contains))
                 {
                     return true;
                 }
@@ -255,7 +255,7 @@ private bool ShouldCacheQueriesContainingTableNames(string commandText, CacheSpe
         switch (options.TableNameComparison)
         {
             case TableNameComparison.Contains:
-                if (options.TableNames.Any(tableName => commandTableNames.Contains(tableName)))
+                if (options.TableNames.Any(commandTableNames.Contains))
                 {
                     return true;
                 }
@@ -342,7 +342,7 @@ private bool ShouldCacheQueriesContainingTableNames(string commandText, CacheSpe
         {
             var commandTableNames = _sqlCommandsProcessor.GetSqlCommandTableNames(commandText);
 
-            if (options.TableNames.Any(tableName => commandTableNames.Contains(tableName)))
+            if (options.TableNames.Any(commandTableNames.Contains))
             {
                 shouldBeCached = false;
             }
@@ -352,7 +352,7 @@ private bool ShouldCacheQueriesContainingTableNames(string commandText, CacheSpe
         {
             var queryEntityTypes = _sqlCommandsProcessor.GetSqlCommandEntityTypes(commandText, allEntityTypes);
 
-            if (queryEntityTypes.Any(entityType => options.EntityTypes.Contains(entityType)))
+            if (queryEntityTypes.Any(options.EntityTypes.Contains))
             {
                 shouldBeCached = false;
             }
@@ -387,21 +387,15 @@ private bool ShouldCacheQueriesContainingTableNames(string commandText, CacheSpe
             .First(textLine => textLine.StartsWith(EFCachePolicyTagPrefix, StringComparison.Ordinal))
             .Trim();
 
-        var parts = efCachePolicyCommentLine.Split(new[]
-        {
-            EFCachePolicy.PartsSeparator
-        }, StringSplitOptions.RemoveEmptyEntries);
+        var parts = efCachePolicyCommentLine.Split([EFCachePolicy.PartsSeparator],
+            StringSplitOptions.RemoveEmptyEntries);
 
         if (parts.Length != 2)
         {
             return null;
         }
 
-        var options = parts[1]
-            .Split(new[]
-            {
-                EFCachePolicy.ItemsSeparator
-            }, StringSplitOptions.None);
+        var options = parts[1].Split([EFCachePolicy.ItemsSeparator], StringSplitOptions.None);
 
         if (options.Length < 2)
         {
@@ -421,11 +415,7 @@ private bool ShouldCacheQueriesContainingTableNames(string commandText, CacheSpe
         var saltKey = options.Length >= 3 ? options[2] : string.Empty;
 
         var cacheDependencies = options.Length >= 4
-            ? options[3]
-                .Split(new[]
-                {
-                    EFCachePolicy.CacheDependenciesSeparator
-                }, StringSplitOptions.RemoveEmptyEntries)
+            ? options[3].Split([EFCachePolicy.CacheDependenciesSeparator], StringSplitOptions.RemoveEmptyEntries)
             : [];
 
         var isDefaultCacheableMethod = options.Length >= 5 && bool.Parse(options[4]);