deal with rebase conflicts

Author: mgravell

src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.L2.cs

@@ -171,8 +171,9 @@ internal async Task<long> SafeReadTagInvalidationAsync(string tag)
             buffer.RecycleIfAppropriate();
             return timestamp;
         }
-        catch (Exception ex) // this is the "Safe" in "SafeReadTagInvalidationAsync"
+        catch (Exception ex)
         {
+            // ^^^ this catch is the "Safe" in "SafeReadTagInvalidationAsync"
             Debug.WriteLine(ex.Message);
 
             // if anything goes wrong reading tag invalidations; we have to assume the tag is invalid

src/Libraries/Microsoft.Extensions.Caching.Hybrid/Internal/DefaultHybridCache.Serialization.cs

@@ -67,7 +67,7 @@ private bool TrySerialize<T>(T value, out BufferChunk buffer, out IHybridCacheSe
 
             serializer.Serialize(value, writer);
 
-            buffer = new(writer.DetachCommitted(out var length), length, returnToPool: true); // remove buffer ownership from the writer
+            buffer = new(writer.DetachCommitted(out var length), 0, length, returnToPool: true); // remove buffer ownership from the writer
             writer.Dispose(); // we're done with the writer
             return true;
         }

test/Libraries/Microsoft.Extensions.Caching.Hybrid.Tests/LocalInvalidationTests.cs

@@ -77,7 +77,9 @@ public async Task TagBasedInvalidate(bool withL2)
         }
 
         Guid lastValue = Guid.Empty;
-        for (int i = 0; i < 3; i++) // because we want to test pre-existing L1/L2 impact
+
+        // loop because we want to test pre-existing L1/L2 impact
+        for (int i = 0; i < 3; i++)
         {
             using var services = GetDefaultCache(out var cache, svc =>
             {