Add Microsoft.CodeAnalysis.FxCopAnalyzers

Author: manandre

FollowingFileStream.ConsoleTestTool/Program.cs

@@ -9,11 +9,10 @@ static class Program
         private const string InputPath = "source.txt";
         private const string OutputPath = "destination.txt";
 
-        static async Task Main(string[] args)
+        static async Task Main()
         {
-            Console.WriteLine("Hello World!");
-            var input = WriteInput();
-            await CopyToOutput();
+            var input = WriteInput().ConfigureAwait(false);
+            await CopyToOutput().ConfigureAwait(false);
             await input;
         }
 
@@ -22,20 +21,20 @@ private static async Task WriteInput()
             using (var sw = new StreamWriter(new FileStream(InputPath, FileMode.Create, FileAccess.Write, FileShare.Read)))
             using (var sr = new StreamReader(Console.OpenStandardInput()))
             {
-                await sr.CopyToAsync(sw, stopOn:"quit");
+                await sr.CopyToAsync(sw, stopOn:"quit").ConfigureAwait(false);
             }
         }
         private static async Task CopyToOutput()
         {
             using (var source = new FollowingFileStream(InputPath))
             using (var destination = new FileStream(OutputPath, FileMode.Create, FileAccess.Write, FileShare.Read))
             {
-                await source.CopyToAsync(destination);
+                await source.CopyToAsync(destination).ConfigureAwait(false);
             }
         }
     }
 
-    static public class TextReaderExtensions
+    static class TextReaderExtensions
     {
         public static async Task CopyToAsync(this TextReader reader, TextWriter writer, string stopOn)
         {

FollowingFileStream/AsyncStream.cs

@@ -11,7 +11,7 @@ namespace Manandre.IO
     /// <summary>
     /// 
     /// </summary>
-    #pragma warning disable S3881
+#pragma warning disable S3881
     public abstract class AsyncStream : Stream
     {
 #if !NETSTANDARD1_3
@@ -442,50 +442,56 @@ public override void SetLength(long value)
             public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
             {
                 var read = 0;
-                var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, cts.Token);
-                try
+                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, cts.Token))
                 {
-                    using (await locker.LockAsync(linkedCts.Token))
+                    try
                     {
-                        read = await _stream.ReadAsync(buffer, offset, count, linkedCts.Token);
+                        using (await locker.LockAsync(linkedCts.Token))
+                        {
+                            read = await _stream.ReadAsync(buffer, offset, count, linkedCts.Token).ConfigureAwait(false);
+                        }
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
                     }
-                }
-                catch (OperationCanceledException)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
                 }
                 return read;
             }
 
             public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
             {
-                var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, cts.Token);
-                try
+                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, cts.Token))
                 {
-                    using (await locker.LockAsync(linkedCts.Token))
+                    try
                     {
-                        await _stream.WriteAsync(buffer, offset, count, linkedCts.Token);
+                        using (await locker.LockAsync(linkedCts.Token))
+                        {
+                            await _stream.WriteAsync(buffer, offset, count, linkedCts.Token).ConfigureAwait(false);
+                        }
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
                     }
-                }
-                catch (OperationCanceledException)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
                 }
             }
 
             public override async Task FlushAsync(CancellationToken cancellationToken)
             {
-                var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, cts.Token);
-                try
+                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, cts.Token))
                 {
-                    using (await locker.LockAsync(linkedCts.Token))
+                    try
                     {
-                        await _stream.FlushAsync(linkedCts.Token);
+                        using (await locker.LockAsync(linkedCts.Token))
+                        {
+                            await _stream.FlushAsync(linkedCts.Token).ConfigureAwait(false);
+                        }
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
                     }
-                }
-                catch (OperationCanceledException)
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
                 }
             }
 
@@ -496,7 +502,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
             {
                 if (disposed)
                     return;
-                
+
                 try
                 {
                     // Explicitly pick up a potentially methodimpl'ed DisposeAsync
@@ -507,6 +513,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
                         {
                             await ((IAsyncDisposable)_stream).DisposeAsync();
                         }
+                        cts.Dispose();
                     }
                 }
                 finally
@@ -531,6 +538,7 @@ protected override void Dispose(bool disposing)
                         {
                             ((IDisposable)_stream).Dispose();
                         }
+                        cts.Dispose();
 
                     }
                 }
@@ -544,7 +552,7 @@ protected override void Dispose(bool disposing)
         }
     }
 
-    #pragma warning restore S3881
+#pragma warning restore S3881
 
     /// <summary>
     /// AsyncStream class extensions

FollowingFileStream/FollowingFileStream.cs

@@ -237,15 +237,15 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
             int read = 0;
             do
             {
-                read = await fileStream.ReadAsync(buffer, offset, count, cancellationToken);
+                read = await fileStream.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
             }
-            while (read == 0 && await RetryNeededAsync());
+            while (read == 0 && await RetryNeededAsync().ConfigureAwait(false));
 
             // In case the filestream has been written and closed between the last read operation
             // and the IsFileLockedForWriting() check
             if (read == 0)
             {
-                read = await fileStream.ReadAsync(buffer, offset, count, cancellationToken);
+                read = await fileStream.ReadAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
             }
 
             TotalTime = 0;
@@ -348,6 +348,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
                 {
                     cts.Cancel();
                     await fileStream.DisposeAsync();
+                    cts.Dispose();
                 }
             }
             finally
@@ -373,6 +374,7 @@ protected override void Dispose(bool disposing)
             {
                 cts.Cancel();
                 fileStream.Dispose();
+                cts.Dispose();
             }
 
             disposed = true;

FollowingFileStream/FollowingFileStream.csproj

@@ -19,5 +19,6 @@
   <ItemGroup>
     <PackageReference Include="Nito.AsyncEx" Version="5.0.0"/>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.5"/>
   </ItemGroup>
-</Project>
+</Project>