Add default implementation for IAsyncDisposable.DisposeAsync to ICompletableSynchronizedStorageSession and revert to also implement IDisposable to make this a non-breaking change.

Author: ramonsmits

src/NServiceBus.AcceptanceTesting/AcceptanceTestingPersistence/AcceptanceTestingSynchronizedStorageSession.cs

@@ -13,6 +13,11 @@ class AcceptanceTestingSynchronizedStorageSession : ICompletableSynchronizedStor
 {
     public AcceptanceTestingTransaction Transaction { get; private set; }
 
+    public void Dispose()
+    {
+        Transaction = null;
+    }
+
     public ValueTask DisposeAsync()
     {
         Transaction = null;

src/NServiceBus.Core.Tests/ApprovalFiles/APIApprovals.ApproveNServiceBus.approved.txt

@@ -1669,7 +1669,7 @@ namespace NServiceBus.Persistence
         public static System.Threading.Tasks.ValueTask Open(this NServiceBus.Persistence.ICompletableSynchronizedStorageSession session, NServiceBus.Pipeline.IIncomingLogicalMessageContext context) { }
         public static System.Threading.Tasks.ValueTask Open(this NServiceBus.Persistence.ICompletableSynchronizedStorageSession session, NServiceBus.Outbox.IOutboxTransaction outboxTransaction, NServiceBus.Transport.TransportTransaction transportTransaction, NServiceBus.Extensibility.ContextBag contextBag, System.Threading.CancellationToken cancellationToken = default) { }
     }
-    public interface ICompletableSynchronizedStorageSession : NServiceBus.Persistence.ISynchronizedStorageSession, System.IAsyncDisposable
+    public interface ICompletableSynchronizedStorageSession : NServiceBus.Persistence.ISynchronizedStorageSession, System.IAsyncDisposable, System.IDisposable
     {
         System.Threading.Tasks.Task CompleteAsync(System.Threading.CancellationToken cancellationToken = default);
         System.Threading.Tasks.Task Open(NServiceBus.Extensibility.ContextBag context, System.Threading.CancellationToken cancellationToken = default);

src/NServiceBus.Core.Tests/Fakes/FakeSynchronizedStorageSession.cs

@@ -58,6 +58,11 @@ public Task Open(ContextBag context, CancellationToken cancellationToken = defau
         return Task.CompletedTask;
     }
 
+    public void Dispose()
+    {
+        Transaction = null;
+    }
+
     public ValueTask DisposeAsync()
     {
         Transaction = null;

src/NServiceBus.Core/Persistence/Learning/LearningSynchronizedStorageSession.cs

@@ -13,6 +13,16 @@ namespace NServiceBus;
 [SkipWeaving]
 class LearningSynchronizedStorageSession : ICompletableSynchronizedStorageSession
 {
+    public void Dispose()
+    {
+        foreach (var sagaFile in sagaFiles.Values)
+        {
+            sagaFile.Dispose();
+        }
+
+        sagaFiles.Clear();
+    }
+
     public async ValueTask DisposeAsync()
     {
         foreach (var sagaFile in sagaFiles.Values)

src/NServiceBus.Core/Persistence/Learning/SagaPersister/SagaStorageFile.cs

@@ -9,13 +9,26 @@ namespace NServiceBus;
 using Janitor;
 
 [SkipWeaving]
-class SagaStorageFile : IAsyncDisposable
+class SagaStorageFile : IDisposable, IAsyncDisposable
 {
     SagaStorageFile(FileStream fileStream)
     {
         this.fileStream = fileStream;
     }
 
+    public void Dispose()
+    {
+        fileStream.Close();
+
+        if (isCompleted)
+        {
+            File.Delete(fileStream.Name);
+        }
+
+        fileStream.Dispose(); // Already closed, but for completeness
+        fileStream = null;
+    }
+
     public async ValueTask DisposeAsync()
     {
         fileStream.Close();

src/NServiceBus.Core/Reliability/SynchronizedStorage/ICompletableSynchronizedStorageSession.cs

@@ -10,7 +10,7 @@
 /// <summary>
 /// Represents a storage session from point of view of the infrastructure.
 /// </summary>
-public interface ICompletableSynchronizedStorageSession : ISynchronizedStorageSession, IAsyncDisposable
+public interface ICompletableSynchronizedStorageSession : ISynchronizedStorageSession, IDisposable, IAsyncDisposable
 {
     /// <summary>
     /// Tries to open the storage session with the provided outbox transaction.
@@ -41,4 +41,12 @@ public interface ICompletableSynchronizedStorageSession : ISynchronizedStorageSe
     /// Completes the session by saving the changes.
     /// </summary>
     Task CompleteAsync(CancellationToken cancellationToken = default);
+
+#pragma warning disable CA1816
+    ValueTask IAsyncDisposable.DisposeAsync()
+#pragma warning restore CA1816
+    {
+        Dispose();
+        return ValueTask.CompletedTask;
+    }
 }

src/NServiceBus.Core/Reliability/SynchronizedStorage/NoOpCompletableSynchronizedStorageSession.cs

@@ -26,6 +26,10 @@ public Task Open(ContextBag context, CancellationToken cancellationToken = defau
 
     public Task CompleteAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
 
+    public void Dispose()
+    {
+    }
+
     public ValueTask DisposeAsync() => ValueTask.CompletedTask;
 
     public static readonly ICompletableSynchronizedStorageSession Instance = new NoOpCompletableSynchronizedStorageSession();