Merge branch 'netstandard' into master

RiversideValley · Sep 22, 2021 · dc60b05 · dc60b05
2 parents 68db1b4 + 36da638
commit dc60b05
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/CmlLib/Utils/IOUtil.cs b/CmlLib/Utils/IOUtil.cs
@@ -181,7 +181,7 @@ public static async Task<string> ReadFileAsync(string path)
             using var reader = AsyncStreamReader(path, Encoding.UTF8);
             var content = await reader.ReadToEndAsync()
                 .ConfigureAwait(false); // **MUST be awaited in this scope**
-            await disposeStreamAsync(reader.BaseStream).ConfigureAwait(false);
+            await reader.BaseStream.FlushAsync().ConfigureAwait(false);
             return content;
         }
 
@@ -190,30 +190,19 @@ public static async Task WriteFileAsync(string path, string content)
         {
             // UTF8 with BOM might not be recognized by minecraft. not tested
             var encoder = new UTF8Encoding(false);
-            var writer = AsyncStreamWriter(path, encoder, false);
+            using var writer = AsyncStreamWriter(path, encoder, false);
             await writer.WriteAsync(content).ConfigureAwait(false); // **MUST be awaited in this scope**
             await writer.FlushAsync().ConfigureAwait(false);
-            writer.Dispose();
         }
 
         public static async Task CopyFileAsync(string sourceFile, string destinationFile)
         {
-            var sourceStream = AsyncReadStream(sourceFile);
-            var destinationStream = AsyncWriteStream(destinationFile, false);
+            using var sourceStream = AsyncReadStream(sourceFile);
+            using var destinationStream = AsyncWriteStream(destinationFile, false);
 
             await sourceStream.CopyToAsync(destinationStream).ConfigureAwait(false);
+
             await destinationStream.FlushAsync().ConfigureAwait(false);
-
-            await disposeStreamAsync(sourceStream).ConfigureAwait(false);
-            await disposeStreamAsync(destinationStream).ConfigureAwait(false);
-        }
-
-        private static async Task disposeStreamAsync(Stream stream)
-        {
-            stream.Dispose();
-            return Task.CompletedTask;
-            await stream.FlushAsync().ConfigureAwait(false);
-            stream.Dispose();
         }
 
         #endregion