Merge branch 'main' into users/alexpeck/soaklfuadd

Author: bitfaster

BitFaster.Caching.UnitTests/Buffers/MpmcBoundedBufferSoakTests.cs

@@ -22,7 +22,7 @@ public MpmcBoundedBufferSoakTests(ITestOutputHelper testOutputHelper)
         }
 
         [Theory]
-        [Repeat(3)]
+        [Repeat(10)]
         public async Task WhenAddIsContendedBufferCanBeFilled(int iteration)
         {
             this.testOutputHelper.WriteLine($"Iteration {iteration}");

BitFaster.Caching.UnitTests/Buffers/MpscBoundedBufferSoakTests.cs

@@ -22,7 +22,7 @@ public MpscBoundedBufferSoakTests(ITestOutputHelper testOutputHelper)
         }
 
         [Theory]
-        [Repeat(3)]
+        [Repeat(10)]
         public async Task WhenAddIsContendedBufferCanBeFilled(int iteration)
         {
             this.testOutputHelper.WriteLine($"Iteration {iteration}");

BitFaster.Caching/AssemblyInfo.cs

@@ -1,3 +1,7 @@
 using System.Runtime.CompilerServices;
 
+#if NET6_0_OR_GREATER
+[module: System.Runtime.CompilerServices.SkipLocalsInit]
+#endif
+
 [assembly: InternalsVisibleTo("BitFaster.Caching.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f55849315b02d525d40701eee5d8eba39e6a517644e8af3fa15141eab7058e76be808e36cfee8d7e071b5aac37bd5e45c67971602680f7bfc26d8c9ebca95dd33b4e3f17a4c28b01268ee6b110ad7e2106ab8ffd1c7be3143192527ce5f639395e46ab086518e881706c6ee9eb96f0263aa34e5152cf5aecf657d463fecf62ca")]

BitFaster.Caching/BitFaster.Caching.csproj

@@ -10,7 +10,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2.3.0</Version>
+    <Version>2.3.1</Version>
     <Copyright>Copyright © Alex Peck $([System.DateTime]::Now.ToString(yyyy))</Copyright>
     <PackageProjectUrl></PackageProjectUrl>
     <RepositoryUrl>https://github.com/bitfaster/BitFaster.Caching</RepositoryUrl>
@@ -22,8 +22,8 @@
     <IncludeSymbols>True</IncludeSymbols>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <AssemblyVersion>2.3.0.0</AssemblyVersion>
-    <FileVersion>2.3.0.0</FileVersion>
+    <AssemblyVersion>2.3.1.0</AssemblyVersion>
+    <FileVersion>2.3.1.0</FileVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <!--Package Validation-->

BitFaster.Caching/Lfu/ConcurrentLfu.cs

@@ -188,9 +188,13 @@ public void Trim(int itemCount)
                 TakeCandidatesInLruOrder(this.probationLru, candidates, itemCount);
                 TakeCandidatesInLruOrder(this.protectedLru, candidates, itemCount);
                 TakeCandidatesInLruOrder(this.windowLru, candidates, itemCount);
-            }
-
+            }
+
+#if NET6_0_OR_GREATER
+            foreach (var candidate in CollectionsMarshal.AsSpan(candidates))
+#else
             foreach (var candidate in candidates)
+#endif
             {
                 this.TryRemove(candidate.Key);
             }