Clean up CrypoStream/GZipStream/DeflateStream docs

includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md

@@ -12,4 +12,3 @@ The following example shows how to use the <xref:System.IO.Compression.DeflateSt
 
 :::code language="csharp" source="~/snippets/csharp/System.IO.Compression/Deflate/FileCompressionModeExample.cs" id="Snippet1":::
 :::code language="vb" source="~/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb" id="Snippet1":::
-

snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj

@@ -2,9 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <StartupObject>FileCompressionModeExample</StartupObject>
   </PropertyGroup>
 
 </Project>

snippets/csharp/System.IO.Compression/Deflate/FileCompressionLevelExample.cs

@@ -9,7 +9,7 @@ public static class FileCompressionLevelExample
     private const string OriginalFileName = "original.txt";
     private const string CompressedFileName = "compressed.dfl";
 
-    public static void Main()
+    public static void Run()
     {
         CreateFileToCompress();
         CompressFile();
@@ -18,8 +18,8 @@ public static void Main()
 
         /*
          Output:
-            The original file 'original.txt' weighs 445 bytes.
-            The compressed file 'compressed.dfl' weighs 259 bytes.
+            The original file 'original.txt' is 445 bytes.
+            The compressed file 'compressed.dfl' is 259 bytes.
          */
     }
 
@@ -37,9 +37,9 @@ private static void PrintResults()
     {
         long originalSize = new FileInfo(OriginalFileName).Length;
         long compressedSize = new FileInfo(CompressedFileName).Length;
-        
-        Console.WriteLine($"The original file '{OriginalFileName}' weighs {originalSize} bytes.");
-        Console.WriteLine($"The compressed file '{CompressedFileName}' weighs {compressedSize} bytes.");
+
+        Console.WriteLine($"The original file '{OriginalFileName}' is {originalSize} bytes.");
+        Console.WriteLine($"The compressed file '{CompressedFileName}' is {compressedSize} bytes.");
     }
 
     private static void DeleteFiles()

snippets/csharp/System.IO.Compression/Deflate/FileCompressionModeExample.cs

@@ -10,7 +10,7 @@ public static class FileCompressionModeExample
     private const string CompressedFileName = "compressed.dfl";
     private const string DecompressedFileName = "decompressed.txt";
 
-    public static void Main()
+    public static void Run()
     {
         CreateFileToCompress();
         CompressFile();
@@ -21,11 +21,11 @@ public static void Main()
         /*
          Output:
 
-            The original file 'original.txt' weighs 445 bytes. Contents: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+            The original file 'original.txt' is 445 bytes. Contents: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
-            The compressed file 'compressed.dfl' weighs 265 bytes.
+            The compressed file 'compressed.dfl' is 265 bytes.
 
-            The decompressed file 'decompressed.txt' weighs 445 bytes. Contents: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+            The decompressed file 'decompressed.txt' is 445 bytes. Contents: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
          */
     }
 
@@ -52,10 +52,10 @@ private static void PrintResults()
         long originalSize = new FileInfo(OriginalFileName).Length;
         long compressedSize = new FileInfo(CompressedFileName).Length;
         long decompressedSize = new FileInfo(DecompressedFileName).Length;
-        
-        Console.WriteLine($"The original file '{OriginalFileName}' weighs {originalSize} bytes. Contents: \"{File.ReadAllText(OriginalFileName)}\"");
-        Console.WriteLine($"The compressed file '{CompressedFileName}' weighs {compressedSize} bytes.");
-        Console.WriteLine($"The decompressed file '{DecompressedFileName}' weighs {decompressedSize} bytes. Contents: \"{File.ReadAllText(DecompressedFileName)}\"");
+
+        Console.WriteLine($"The original file '{OriginalFileName}' is {originalSize} bytes. Contents: \"{File.ReadAllText(OriginalFileName)}\"");
+        Console.WriteLine($"The compressed file '{CompressedFileName}' is {compressedSize} bytes.");
+        Console.WriteLine($"The decompressed file '{DecompressedFileName}' is {decompressedSize} bytes. Contents: \"{File.ReadAllText(DecompressedFileName)}\"");
     }
 
     private static void DeleteFiles()

snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs

@@ -9,7 +9,7 @@ public static class MemoryWriteReadExample
     private const string Message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
     private static readonly byte[] s_messageBytes = Encoding.ASCII.GetBytes(Message);
 
-    public static void Main()
+    public static void Run()
     {
         Console.WriteLine($"The original string length is {s_messageBytes.Length} bytes.");
         using var stream = new MemoryStream();
@@ -35,10 +35,18 @@ private static int DecompressStreamToBytes(Stream stream)
     {
         stream.Position = 0;
         int bufferSize = 512;
-        byte[] decompressedBytes = new byte[bufferSize];
-        using var decompressor = new DeflateStream(stream, CompressionMode.Decompress);
-        int length = decompressor.Read(decompressedBytes, 0, bufferSize);
-        return length;
+        byte[] buffer = new byte[bufferSize];
+        using var deflateStream = new DeflateStream(stream, CompressionMode.Decompress);
+
+        int totalRead = 0;
+        while (totalRead < buffer.Length)
+        {
+            int bytesRead = deflateStream.Read(buffer.AsSpan(totalRead));
+            if (bytesRead == 0) break;
+            totalRead += bytesRead;
+        }
+
+        return totalRead;
     }
 }
 //</snippet1>

snippets/csharp/System.IO.Compression/Deflate/Program.cs

@@ -0,0 +1,9 @@
+class Program
+{
+    public static void Main()
+    {
+        MemoryWriteReadExample.Run();
+        //FileCompressionLevelExample.Run();
+        //FileCompressionModeExample.Run();
+    }
+}