merge

Author: Alex Peck

.github/workflows/codeql-analysis.yml

@@ -52,8 +52,8 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    #- name: Autobuild
-    #  uses: github/codeql-action/autobuild@v2
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -66,16 +66,5 @@ jobs:
     #   make bootstrap
     #   make release
 
-    - name: Setup .NET SDK
-      uses: actions/[email protected]
-      with:
-        dotnet-version: '9.0.x'
-
-    - name: Restore dependencies
-      run: dotnet restore
-
-    - name: Build
-      run: dotnet build --configuration Debug --no-restore
-
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

BitFaster.Caching.Benchmarks/BitFaster.Caching.Benchmarks.csproj

@@ -26,7 +26,7 @@
     <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.2" />
     <PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
   </ItemGroup>
 

BitFaster.Caching.HitRateAnalysis/BitFaster.Caching.HitRateAnalysis.csproj

@@ -31,7 +31,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.2" />
       <PackageReference Include="Plotly.NET.CSharp" Version="0.13.0" />
       <PackageReference Include="Plotly.NET.ImageExport" Version="6.1.0" />
   </ItemGroup>

BitFaster.Caching.ThroughputAnalysis/BitFaster.Caching.ThroughputAnalysis.csproj

@@ -26,7 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.2" />
     <PackageReference Include="Plotly.NET" Version="5.1.0" />
     <PackageReference Include="Plotly.NET.ImageExport" Version="6.1.0" />
   </ItemGroup>

BitFaster.Caching/Lru/Defaults.cs

@@ -6,11 +6,6 @@ namespace BitFaster.Caching.Lru
 {
     internal static class Defaults
     {
-        public static int ConcurrencyLevel
-        {
-            get { return Environment.ProcessorCount; }
-        }
-
-        public static readonly TimeSpan Infinite = new(0, 0, 0, 0, -1);
+        public static int ConcurrencyLevel => Environment.ProcessorCount;
     }
 }

BitFaster.Caching/Lru/EqualCapacityPartition.cs

@@ -9,30 +9,23 @@ namespace BitFaster.Caching.Lru
     [DebuggerDisplay("{Hot}/{Warm}/{Cold}")]
     public class EqualCapacityPartition : ICapacityPartition
     {
-        private readonly int hotCapacity;
-        private readonly int warmCapacity;
-        private readonly int coldCapacity;
-
         /// <summary>
         /// Initializes a new instance of the EqualCapacityPartition class with the specified total capacity.
         /// </summary>
         /// <param name="totalCapacity">The total capacity.</param>
         public EqualCapacityPartition(int totalCapacity)
         {
-            var (hot, warm, cold) = ComputeQueueCapacity(totalCapacity);
-            this.hotCapacity = hot;
-            this.warmCapacity = warm;
-            this.coldCapacity = cold;
+            (Hot, Warm, Cold) = ComputeQueueCapacity(totalCapacity);
         }
 
         ///<inheritdoc/>
-        public int Cold => this.coldCapacity;
+        public int Cold { get; }
 
         ///<inheritdoc/>
-        public int Warm => this.warmCapacity;
+        public int Warm { get; }
 
         ///<inheritdoc/>
-        public int Hot => this.hotCapacity;
+        public int Hot { get; }
 
         private static (int hot, int warm, int cold) ComputeQueueCapacity(int capacity)
         {

BitFaster.Caching/Lru/LruPolicy.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.CompilerServices;
+using System.Threading;
 
 namespace BitFaster.Caching.Lru
 {
@@ -10,7 +11,7 @@ namespace BitFaster.Caching.Lru
         where K : notnull
     {
         ///<inheritdoc/>
-        public TimeSpan TimeToLive => Defaults.Infinite;
+        public TimeSpan TimeToLive => Timeout.InfiniteTimeSpan;
 
         ///<inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]