Target core 3.0 and adapt to IAsyncDisposable

Author: manandre

FollowingFileStream.ConsoleTestTool/FollowingFileStream.ConsoleTestTool.csproj

@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <LangVersion>7.1</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

FollowingFileStream.Tests/FollowingFileStream.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

FollowingFileStream/AsyncStream.cs

@@ -284,23 +284,26 @@ public sealed override void Write(byte[] buffer, int offset, int count)
         /// </exception>
         public abstract override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken);
 
-        private bool disposed = false;
+        /// <summary>
+        /// Asynchronously releases the unmanaged resources used by the FollowingFileStream and optionally
+        /// releases the managed resources.
+        /// </summary>
+        /// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.
+        ///</param>
+        protected virtual ValueTask DisposeAsync(bool disposing) => default;
+
+        /// <summary>
+        /// Asynchronously releases all resources used by the AsyncStream.
+        /// </summary>
+        public sealed override ValueTask DisposeAsync() => DisposeAsync(true);
 
         /// <summary>
         /// Releases the unmanaged resources used by the FollowingFileStream and optionally
         /// releases the managed resources.
         /// </summary>
         /// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.
         ///</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposed)
-                return;
-
-            disposed = true;
-            // Call stream class implementation.
-            base.Dispose(disposing);
-        }
+        protected sealed override void Dispose(bool disposing) => DisposeAsync(disposing).GetAwaiter().GetResult();
 
         /// <summary>
         /// Synchronized version of an async stream
@@ -398,26 +401,6 @@ public override int WriteTimeout
                 }
             }
 
-            protected override void Dispose(bool disposing)
-            {
-                try
-                {
-                    // Explicitly pick up a potentially methodimpl'ed Dispose
-                    if (disposing)
-                    {
-                        cts.Cancel();
-                        using (locker.Lock())
-                        {
-                            ((IDisposable)_stream).Dispose();
-                        }
-                    }
-                }
-                finally
-                {
-                    base.Dispose(disposing);
-                }
-            }
-
             public override long Seek(long offset, SeekOrigin origin)
             {
                 using (locker.Lock(cts.Token))
@@ -479,6 +462,31 @@ public override async Task FlushAsync(CancellationToken cancellationToken)
                     cancellationToken.ThrowIfCancellationRequested();
                 }
             }
+
+            private bool disposed = false;
+
+            protected override async ValueTask DisposeAsync(bool disposing)
+            {
+                if (disposed)
+                    return;
+                
+                try
+                {
+                    // Explicitly pick up a potentially methodimpl'ed DisposeAsync
+                    if (disposing)
+                    {
+                        cts.Cancel();
+                        using (await locker.LockAsync())
+                        {
+                            await ((IAsyncDisposable)_stream).DisposeAsync();
+                        }
+                    }
+                }
+                finally
+                {
+                    await base.DisposeAsync(disposing);
+                }
+            }
         }
     }
 

FollowingFileStream/FollowingFileStream.cs

@@ -302,28 +302,33 @@ private bool IsFileLockedForWriting()
             return false;
         }
 
-        bool disposed = false;
+        private bool disposed = false;
 
         /// <summary>
         /// Releases the unmanaged resources used by the FollowingFileStream and optionally
         /// releases the managed resources.
         /// </summary>
         /// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.
         ///</param>
-        protected override void Dispose(bool disposing)
+        protected override async ValueTask DisposeAsync(bool disposing)
         {
             if (disposed)
                 return;
 
-            if (disposing)
+            try
             {
-                cts.Cancel();
-                fileStream.Dispose();
+                if (disposing)
+                {
+                    cts.Cancel();
+                    await fileStream.DisposeAsync();
+                }
+            }
+            finally
+            {
+                disposed = true;
+                // Call stream class implementation.
+                base.Dispose(disposing);
             }
-
-            disposed = true;
-            // Call stream class implementation.
-            base.Dispose(disposing);
         }
 
         /// <summary>

FollowingFileStream/FollowingFileStream.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>