From 90c374497510860a99f8aef768e8016fdf385edc Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Lopez <1175054+carlossanlop@users.noreply.github.com> Date: Sat, 2 Oct 2021 23:43:51 -0700 Subject: [PATCH 1/5] System.IO.Compression.DeflateStream examples update --- .../.ctor_Stream_CompressionLevel.md | 8 +++ .../.ctor_Stream_CompressionLevel_Boolean.md | 10 --- .../.ctor_Stream_CompressionMode.md | 4 +- .../.ctor_Stream_CompressionMode_Boolean.md | 14 ---- .../DeflateStream/DeflateStream.md | 7 +- .../Deflate/Deflate.csproj | 10 +++ .../FileCompressCompressionLevelExample.cs | 53 +++++++++++++++ ...ompressDecompressCompressionModeExample.cs | 67 +++++++++++++++++++ .../Deflate/MemoryWriteReadExample.cs | 38 +++++++++++ .../IO.Compression.Deflate1/CS/deflatetest.cs | 62 ----------------- .../cs/program1.cs | 40 ----------- .../cs/program2.cs | 41 ------------ .../cs/program3.cs | 39 ----------- .../Deflate/Deflate.vbproj | 10 +++ .../FileCompressCompressionLevelExample.vb | 48 +++++++++++++ ...ompressDecompressCompressionModeExample.vb | 64 ++++++++++++++++++ .../Deflate/MemoryWriteReadExample.vb | 38 +++++++++++ .../IO.Compression.Deflate1/VB/deflatetest.vb | 50 -------------- .../vb/program1.vb | 29 -------- .../vb/program2.vb | 30 --------- .../vb/program3.vb | 30 --------- xml/System.IO.Compression/DeflateStream.xml | 34 +++++----- 22 files changed, 357 insertions(+), 369 deletions(-) create mode 100644 includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md delete mode 100644 includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel_Boolean.md delete mode 100644 includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode_Boolean.md create mode 100644 samples/snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj create mode 100644 samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs create mode 100644 samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs create mode 100644 samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs delete mode 100644 samples/snippets/csharp/VS_Snippets_CLR/IO.Compression.Deflate1/CS/deflatetest.cs delete mode 100644 samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program1.cs delete mode 100644 samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program2.cs delete mode 100644 samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program3.cs create mode 100644 samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj create mode 100644 samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb create mode 100644 samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb create mode 100644 samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb delete mode 100644 samples/snippets/visualbasic/VS_Snippets_CLR/IO.Compression.Deflate1/VB/deflatetest.vb delete mode 100644 samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program1.vb delete mode 100644 samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program2.vb delete mode 100644 samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program3.vb diff --git a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md new file mode 100644 index 00000000000..8a58b99ca5c --- /dev/null +++ b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md @@ -0,0 +1,8 @@ +This constructor overload uses the compression mode . To set the compression mode to another value, use the or overload. + +## Examples + +The following example shows how to set the compression level when creating a object and how to leave the stream open. + +:::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs" id="Snippet2"::: +:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb" id="Snippet2"::: diff --git a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel_Boolean.md b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel_Boolean.md deleted file mode 100644 index 1481981a933..00000000000 --- a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel_Boolean.md +++ /dev/null @@ -1,10 +0,0 @@ -You use this constructor when you want to specify whether compression efficiency or speed is more important for an instance of the class, and whether to leave the stream object open after disposing the object. - -This constructor overload uses the compression mode . To set the compression mode to another value, use the or overload. - -## Examples - -The following example shows how to set the compression level when creating a object and how to leave the stream open. - -:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program2.cs" id="Snippet2"::: -:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program2.vb" id="Snippet2"::: diff --git a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md index efbd304e740..d939138003a 100644 --- a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md +++ b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md @@ -10,6 +10,6 @@ By default, the compression level is set to class to compress and decompress a file. -:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR/IO.Compression.Deflate1/CS/deflatetest.cs" id="Snippet1"::: -:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR/IO.Compression.Deflate1/VB/deflatetest.vb" id="Snippet1"::: +:::code language="csharp" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs" id="Snippet1"::: +:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb" id="Snippet1"::: diff --git a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode_Boolean.md b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode_Boolean.md deleted file mode 100644 index 90cff216de9..00000000000 --- a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode_Boolean.md +++ /dev/null @@ -1,14 +0,0 @@ -By default, owns the underlying stream, so closing the stream also closes the underlying stream. Note that the state of the underlying stream can affect the usability of the stream. Also, no explicit checks are performed, so no additional exceptions are thrown when the new instance is created. - -If an instance of the class is created with the `mode` parameter equal to `Compress`, header information is inserted immediately. If no further action occurs, the stream appears as a valid, empty, compressed file. - -Using the class to compress a file larger than 4 GB raises an exception. - -By default, the compression level is set to when the compression mode is . - -## Examples - -The following code example shows how to use the class to compress and decompress a file. - -:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR/IO.Compression.Deflate1/CS/deflatetest.cs" id="Snippet1"::: -:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR/IO.Compression.Deflate1/VB/deflatetest.vb" id="Snippet1"::: diff --git a/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md b/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md index 52a7a9dc0f2..9ad0f0d62e9 100644 --- a/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md +++ b/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md @@ -1,4 +1,3 @@ - This class represents the Deflate algorithm, which is an industry-standard algorithm for lossless file compression and decompression. Starting with the .NET Framework 4.5, the class uses the zlib library. As a result, it provides a better compression algorithm and, in most cases, a smaller compressed file than it provides in earlier versions of the .NET Framework. This class does not inherently provide functionality for adding files to or extracting files from zip archives. To work with zip archives, use the and the classes. @@ -9,7 +8,7 @@ The compression functionality in and ## Examples -The following example shows how to use the class to compress and decompress a directory of files. +The following example shows how to use the class to compress and decompress a file. -:::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR/IO.Compression.Deflate1/CS/deflatetest.cs" id="Snippet1"::: -:::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR/IO.Compression.Deflate1/VB/deflatetest.vb" id="Snippet1"::: +:::code language="csharp" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs" id="Snippet1"::: +:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb" id="Snippet1"::: diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj b/samples/snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj new file mode 100644 index 00000000000..0492920ba76 --- /dev/null +++ b/samples/snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj @@ -0,0 +1,10 @@ + + + + Exe + net6.0 + enable + MemoryWriteReadExample + + + diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs new file mode 100644 index 00000000000..a051abb39e0 --- /dev/null +++ b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs @@ -0,0 +1,53 @@ +// +using System; +using System.IO; +using System.IO.Compression; + +public static class FileCompressCompressionLevelExample +{ + private const string OriginalFileName = "original.txt"; + private const string CompressedFileName = "compressed.dfl"; + + public static void Main() + { + CreateFileToCompress(); + CompressFile(); + PrintResults(); + DeleteFiles(); + + /* + Output: + The original file 'original.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." + The compressed file 'compressed.dfl' weighs 54 bytes. + */ + } + + private static void CreateFileToCompress() + { + using var writer = new StreamWriter(OriginalFileName); + writer.Write($"This is the content saved inside the {OriginalFileName} file."); + } + + private static void CompressFile() + { + using FileStream originalFileStream = File.Open(OriginalFileName, FileMode.Open); + using FileStream compressedFileStream = File.Create(CompressedFileName); + using var deflateStream = new DeflateStream(compressedFileStream, CompressionLevel.Fastest); + originalFileStream.CopyTo(deflateStream); + } + + 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. Contents: \"{File.ReadAllText(OriginalFileName)}\""); + Console.WriteLine($"The compressed file '{CompressedFileName}' weighs {compressedSize} bytes."); + } + + private static void DeleteFiles() + { + File.Delete(OriginalFileName); + File.Delete(CompressedFileName); + } +} +// diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs new file mode 100644 index 00000000000..c2296dd32b4 --- /dev/null +++ b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs @@ -0,0 +1,67 @@ +// +using System; +using System.IO; +using System.IO.Compression; + +public static class FileCompressDecompressCompressionModeExample +{ + private const string OriginalFileName = "original.txt"; + private const string CompressedFileName = "compressed.dfl"; + private const string DecompressedFileName = "decompressed.txt"; + + public static void Main() + { + CreateFileToCompress(); + CompressFile(); + DecompressFile(); + PrintResults(); + DeleteFiles(); + + /* + Output: + The original file 'original.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." + The compressed file 'compressed.dfl' weighs 52 bytes. + The decompressed file 'decompressed.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." + */ + } + + private static void CreateFileToCompress() + { + using var writer = new StreamWriter(OriginalFileName); + writer.Write($"This is the content saved inside the {OriginalFileName} file."); + } + + private static void CompressFile() + { + using FileStream originalFileStream = File.Open(OriginalFileName, FileMode.Open); + using FileStream compressedFileStream = File.Create(CompressedFileName); + using var deflateStream = new DeflateStream(compressedFileStream, CompressionMode.Compress); + originalFileStream.CopyTo(deflateStream); + } + + private static void DecompressFile() + { + using FileStream compressedFileStream = File.Open(CompressedFileName, FileMode.Open); + using FileStream outputFileStream = File.Create(DecompressedFileName); + using var deflateStream = new DeflateStream(compressedFileStream, CompressionMode.Decompress); + deflateStream.CopyTo(outputFileStream); + } + + 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)}\""); + } + + private static void DeleteFiles() + { + File.Delete(OriginalFileName); + File.Delete(CompressedFileName); + File.Delete(DecompressedFileName); + } +} +// diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs b/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs new file mode 100644 index 00000000000..dfed639cad1 --- /dev/null +++ b/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs @@ -0,0 +1,38 @@ +// +using System; +using System.IO; +using System.IO.Compression; +using System.Text; + +public static class MemoryWriteReadExample +{ + private const string Message = "example text to compress and decompress"; + private static readonly byte[] s_messageBytes = Encoding.ASCII.GetBytes(Message); + + public static void Main() + { + Console.WriteLine($"The original string length is {s_messageBytes.Length} bytes."); + using var stream = new MemoryStream(); + CompressBytesToStream(stream); + Console.WriteLine($"The compressed stream length is {stream.Length} bytes."); + int decompressedLength = DecompressStreamToBytes(stream); + Console.WriteLine($"The decompressed string length is {decompressedLength} bytes, same as the original length."); + } + + private static void CompressBytesToStream(Stream stream) + { + using var compressor = new DeflateStream(stream, CompressionMode.Compress, leaveOpen: true); + compressor.Write(s_messageBytes, 0, s_messageBytes.Length); + } + + 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; + } +} +// diff --git a/samples/snippets/csharp/VS_Snippets_CLR/IO.Compression.Deflate1/CS/deflatetest.cs b/samples/snippets/csharp/VS_Snippets_CLR/IO.Compression.Deflate1/CS/deflatetest.cs deleted file mode 100644 index 3fd81bb2f3c..00000000000 --- a/samples/snippets/csharp/VS_Snippets_CLR/IO.Compression.Deflate1/CS/deflatetest.cs +++ /dev/null @@ -1,62 +0,0 @@ -// -using System; -using System.IO; -using System.IO.Compression; - -public class Program -{ - static string directoryPath = @"c:\temp"; - public static void Main() - { - - DirectoryInfo directorySelected = new DirectoryInfo(directoryPath); - Compress(directorySelected); - - foreach (FileInfo fileToDecompress in directorySelected.GetFiles("*.cmp")) - { - Decompress(fileToDecompress); - } - } - - public static void Compress(DirectoryInfo directorySelected) - { - - foreach (FileInfo file in directorySelected.GetFiles("*.xml")) - using (FileStream originalFileStream = file.OpenRead()) - { - if ((File.GetAttributes(file.FullName) & FileAttributes.Hidden) - != FileAttributes.Hidden & file.Extension != ".cmp") - { - using (FileStream compressedFileStream = File.Create(file.FullName + ".cmp")) - { - using (DeflateStream compressionStream = new DeflateStream(compressedFileStream, CompressionMode.Compress)) - { - originalFileStream.CopyTo(compressionStream); - } - } - - FileInfo info = new FileInfo(directoryPath + "\\" + file.Name + ".cmp"); - Console.WriteLine("Compressed {0} from {1} to {2} bytes.", file.Name, file.Length, info.Length); - } - } - } - - public static void Decompress(FileInfo fileToDecompress) - { - using (FileStream originalFileStream = fileToDecompress.OpenRead()) - { - string currentFileName = fileToDecompress.FullName; - string newFileName = currentFileName.Remove(currentFileName.Length - fileToDecompress.Extension.Length); - - using (FileStream decompressedFileStream = File.Create(newFileName)) - { - using (DeflateStream decompressionStream = new DeflateStream(originalFileStream, CompressionMode.Decompress)) - { - decompressionStream.CopyTo(decompressedFileStream); - Console.WriteLine("Decompressed: {0}", fileToDecompress.Name); - } - } - } - } -} -// \ No newline at end of file diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program1.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program1.cs deleted file mode 100644 index 533695f0231..00000000000 --- a/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program1.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -using System; -using System.Collections.Generic; -using System.IO; -using System.IO.Compression; - -namespace ConsoleApplication -{ - class Program - { - static void Main(string[] args) - { - string directoryPath = @"c:\users\public\reports"; - DirectoryInfo directorySelected = new DirectoryInfo(directoryPath); - - foreach (FileInfo fileToCompress in directorySelected.EnumerateFiles()) - { - Compress(fileToCompress); - } - } - - public static void Compress(FileInfo fileToCompress) - { - using (FileStream originalFileStream = fileToCompress.OpenRead()) - { - if ((File.GetAttributes(fileToCompress.FullName) & FileAttributes.Hidden) != FileAttributes.Hidden & fileToCompress.Extension != ".cmp") - { - using (FileStream compressedFileStream = File.Create(fileToCompress.FullName + ".cmp")) - { - using (DeflateStream compressionStream = new DeflateStream(compressedFileStream, CompressionLevel.Fastest)) - { - originalFileStream.CopyTo(compressionStream); - } - } - } - } - } - } -} -// diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program2.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program2.cs deleted file mode 100644 index 463a098f705..00000000000 --- a/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program2.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -using System; -using System.Collections.Generic; -using System.IO; -using System.IO.Compression; - -namespace ConsoleApplication -{ - class Program - { - static void Main(string[] args) - { - string directoryPath = @"c:\users\public\reports"; - DirectoryInfo directorySelected = new DirectoryInfo(directoryPath); - - foreach (FileInfo fileToCompress in directorySelected.EnumerateFiles()) - { - Compress(fileToCompress); - } - } - - public static void Compress(FileInfo fileToCompress) - { - using (FileStream originalFileStream = fileToCompress.OpenRead()) - { - if ((File.GetAttributes(fileToCompress.FullName) & FileAttributes.Hidden) != FileAttributes.Hidden & fileToCompress.Extension != ".cmp") - { - using (FileStream compressedFileStream = File.Create(fileToCompress.FullName + ".cmp")) - { - using (DeflateStream compressionStream = new DeflateStream(compressedFileStream, CompressionLevel.Fastest, true)) - { - originalFileStream.CopyTo(compressionStream); - } - Console.WriteLine(string.Format("file compressed to {0} bytes", compressedFileStream.Length)); - } - } - } - } - } -} -// diff --git a/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program3.cs b/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program3.cs deleted file mode 100644 index 1205dca7a81..00000000000 --- a/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program3.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -using System; -using System.Text; -using System.IO; -using System.IO.Compression; - -namespace ExampleConsoleApplication -{ - class Program - { - static void Main(string[] args) - { - UnicodeEncoding uniEncode = new UnicodeEncoding(); - - byte[] bytesToCompress = uniEncode.GetBytes("example text to compress and decompress"); - Console.WriteLine("starting with: " + uniEncode.GetString(bytesToCompress)); - - using (FileStream fileToCompress = File.Create("examplefile.gz")) - { - using (DeflateStream compressionStream = new DeflateStream(fileToCompress, CompressionMode.Compress)) - { - compressionStream.Write(bytesToCompress, 0, bytesToCompress.Length); - } - } - - byte[] decompressedBytes = new byte[bytesToCompress.Length]; - using (FileStream fileToDecompress = File.Open("examplefile.gz", FileMode.Open)) - { - using (DeflateStream decompressionStream = new DeflateStream(fileToDecompress, CompressionMode.Decompress)) - { - decompressionStream.Read(decompressedBytes, 0, bytesToCompress.Length); - } - } - - Console.WriteLine("ending with: " + uniEncode.GetString(decompressedBytes)); - } - } -} -// \ No newline at end of file diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj b/samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj new file mode 100644 index 00000000000..abdf9830e49 --- /dev/null +++ b/samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj @@ -0,0 +1,10 @@ + + + + Exe + net6.0 + enable + Deflate.MemoryWriteReadExample + + + diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb new file mode 100644 index 00000000000..bfe424725b3 --- /dev/null +++ b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb @@ -0,0 +1,48 @@ +' +Imports System.IO +Imports System.IO.Compression + +Module FileCompressCompressionLevelExample + Private Const OriginalFileName As String = "original.txt" + Private Const CompressedFileName As String = "compressed.dfl" + + Sub Main() + CreateFileToCompress() + CompressFile() + PrintResults() + DeleteFiles() + + 'Output: + ' The original file 'original.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." + ' The compressed file 'compressed.dfl' weighs 54 bytes. + End Sub + + Private Sub CreateFileToCompress() + Using writer = New StreamWriter(OriginalFileName) + writer.Write($"This is the content saved inside the {OriginalFileName} file.") + End Using + End Sub + + Private Sub CompressFile() + Using originalFileStream As FileStream = File.Open(OriginalFileName, FileMode.Open) + Using compressedFileStream As FileStream = File.Create(CompressedFileName) + Using deflateStream = New DeflateStream(compressedFileStream, CompressionLevel.Fastest) + originalFileStream.CopyTo(deflateStream) + End Using + End Using + End Using + End Sub + + Private Sub PrintResults() + Dim originalSize As Long = New FileInfo(OriginalFileName).Length + Dim compressedSize As Long = New FileInfo(CompressedFileName).Length + Console.WriteLine($"The original file '{OriginalFileName}' weighs {originalSize} bytes. Contents: ""{File.ReadAllText(OriginalFileName)}""") + Console.WriteLine($"The compressed file '{CompressedFileName}' weighs {compressedSize} bytes.") + End Sub + + Private Sub DeleteFiles() + File.Delete(OriginalFileName) + File.Delete(CompressedFileName) + End Sub +End Module +' diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb new file mode 100644 index 00000000000..10bb1867524 --- /dev/null +++ b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb @@ -0,0 +1,64 @@ +' +Imports System.IO +Imports System.IO.Compression + +Module FileCompressDecompressCompressionModeExample + Private Const OriginalFileName As String = "original.txt" + Private Const CompressedFileName As String = "compressed.dfl" + Private Const DecompressedFileName As String = "decompressed.txt" + + Sub Main() + CreateFileToCompress() + CompressFile() + DecompressFile() + PrintResults() + DeleteFiles() + + 'Output: + ' The original file 'original.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." + ' The compressed file 'compressed.dfl' weighs 52 bytes. + ' The decompressed file 'decompressed.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." + End Sub + + Private Sub CreateFileToCompress() + Using writer = New StreamWriter(OriginalFileName) + writer.Write($"This is the content saved inside the {OriginalFileName} file.") + End Using + End Sub + + Private Sub CompressFile() + Using originalFileStream As FileStream = File.Open(OriginalFileName, FileMode.Open) + Using compressedFileStream As FileStream = File.Create(CompressedFileName) + Using deflateStream = New DeflateStream(compressedFileStream, CompressionMode.Compress) + originalFileStream.CopyTo(deflateStream) + End Using + End Using + End Using + End Sub + + Private Sub DecompressFile() + Using compressedFileStream As FileStream = File.Open(CompressedFileName, FileMode.Open) + Using outputFileStream As FileStream = File.Create(DecompressedFileName) + Using deflateStream = New DeflateStream(compressedFileStream, CompressionMode.Decompress) + deflateStream.CopyTo(outputFileStream) + End Using + End Using + End Using + End Sub + + Private Sub PrintResults() + Dim originalSize As Long = New FileInfo(OriginalFileName).Length + Dim compressedSize As Long = New FileInfo(CompressedFileName).Length + Dim decompressedSize As Long = 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)}""") + End Sub + + Private Sub DeleteFiles() + File.Delete(OriginalFileName) + File.Delete(CompressedFileName) + File.Delete(DecompressedFileName) + End Sub +End Module +' diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb b/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb new file mode 100644 index 00000000000..4c094c0f558 --- /dev/null +++ b/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb @@ -0,0 +1,38 @@ +' +Imports System.IO +Imports System.IO.Compression +Imports System.Text + +Module MemoryWriteReadExample + Private Const Message As String = "example text to compress and decompress" + Private ReadOnly s_messageBytes As Byte() = Encoding.ASCII.GetBytes(Message) + + Sub Main() + Console.WriteLine($"The original string length is {s_messageBytes.Length} bytes.") + + Using stream = New MemoryStream() + CompressBytesToStream(stream) + Console.WriteLine($"The compressed stream length is {stream.Length} bytes.") + Dim decompressedLength As Integer = DecompressStreamToBytes(stream) + Console.WriteLine($"The decompressed string length is {decompressedLength} bytes, same as the original length.") + End Using + + End Sub + + Private Sub CompressBytesToStream(ByVal stream As Stream) + Using compressor = New DeflateStream(stream, CompressionMode.Compress, leaveOpen:=True) + compressor.Write(s_messageBytes, 0, s_messageBytes.Length) + End Using + End Sub + + Private Function DecompressStreamToBytes(ByVal stream As Stream) As Integer + stream.Position = 0 + Dim bufferSize As Integer = 512 + Dim decompressedBytes As Byte() = New Byte(bufferSize - 1) {} + Using decompressor = New DeflateStream(stream, CompressionMode.Decompress) + Dim length As Integer = decompressor.Read(decompressedBytes, 0, bufferSize) + Return length + End Using + End Function +End Module +' diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR/IO.Compression.Deflate1/VB/deflatetest.vb b/samples/snippets/visualbasic/VS_Snippets_CLR/IO.Compression.Deflate1/VB/deflatetest.vb deleted file mode 100644 index 2dd7f02ed34..00000000000 --- a/samples/snippets/visualbasic/VS_Snippets_CLR/IO.Compression.Deflate1/VB/deflatetest.vb +++ /dev/null @@ -1,50 +0,0 @@ -' -Imports System.IO -Imports System.IO.Compression - -Public Class Program - Shared directoryPath As String = "c:\temp" - Public Shared Sub Main() - - Dim directorySelected As New DirectoryInfo(directoryPath) - Compress(directorySelected) - - - For Each fileToDecompress As FileInfo In directorySelected.GetFiles("*.cmp") - Decompress(fileToDecompress) - Next - End Sub - - Public Shared Sub Compress(directorySelected As DirectoryInfo) - - For Each file__1 As FileInfo In directorySelected.GetFiles("*.xml") - Using originalFileStream As FileStream = file__1.OpenRead() - If (File.GetAttributes(file__1.FullName) And FileAttributes.Hidden) <> FileAttributes.Hidden And file__1.Extension <> ".cmp" Then - Using compressedFileStream As FileStream = File.Create(file__1.FullName & ".cmp") - Using compressionStream As Compression.DeflateStream = New DeflateStream(compressedFileStream, CompressionMode.Compress) - originalFileStream.CopyTo(compressionStream) - End Using - End Using - - Dim info As New FileInfo(directoryPath & "\" & file__1.Name & ".cmp") - Console.WriteLine("Compressed {0} from {1} to {2} bytes.", file__1.Name, file__1.Length, info.Length) - End If - End Using - Next - End Sub - - Public Shared Sub Decompress(fileToDecompress As FileInfo) - Using originalFileStream As FileStream = fileToDecompress.OpenRead() - Dim currentFileName As String = fileToDecompress.FullName - Dim newFileName As String = currentFileName.Remove(currentFileName.Length - fileToDecompress.Extension.Length) - - Using decompressedFileStream As FileStream = File.Create(newFileName) - Using decompressionStream As New DeflateStream(originalFileStream, CompressionMode.Decompress) - decompressionStream.CopyTo(decompressedFileStream) - Console.WriteLine("Decompressed: {0}", fileToDecompress.Name) - End Using - End Using - End Using - End Sub -End Class -' \ No newline at end of file diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program1.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program1.vb deleted file mode 100644 index dc8ea907684..00000000000 --- a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program1.vb +++ /dev/null @@ -1,29 +0,0 @@ -' -Imports System.IO -Imports System.IO.Compression - -Module Module1 - - Sub Main() - Dim directoryPath As String = "c:\users\public\reports" - Dim directorySelected As DirectoryInfo = New DirectoryInfo(directoryPath) - - For Each fileToCompress As FileInfo In directorySelected.EnumerateFiles() - Compress(fileToCompress) - Next - End Sub - - Public Sub Compress(fileToCompress As FileInfo) - Using originalFileStream As FileStream = fileToCompress.OpenRead() - If ((File.GetAttributes(fileToCompress.FullName) & FileAttributes.Hidden) <> FileAttributes.Hidden And fileToCompress.Extension <> ".cmp") Then - Using compressedFileStream As FileStream = File.Create(fileToCompress.FullName + ".cmp") - Using compressionStream As DeflateStream = New DeflateStream(compressedFileStream, CompressionLevel.Fastest) - originalFileStream.CopyTo(compressionStream) - End Using - End Using - End If - End Using - End Sub - -End Module -' diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program2.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program2.vb deleted file mode 100644 index d04d483789e..00000000000 --- a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program2.vb +++ /dev/null @@ -1,30 +0,0 @@ -' -Imports System.IO -Imports System.IO.Compression - -Module Module1 - - Sub Main() - Dim directoryPath As String = "c:\users\public\reports" - Dim directorySelected As DirectoryInfo = New DirectoryInfo(directoryPath) - - For Each fileToCompress As FileInfo In directorySelected.EnumerateFiles() - Compress(fileToCompress) - Next - End Sub - - Public Sub Compress(fileToCompress As FileInfo) - Using originalFileStream As FileStream = fileToCompress.OpenRead() - If ((File.GetAttributes(fileToCompress.FullName) & FileAttributes.Hidden) <> FileAttributes.Hidden And fileToCompress.Extension <> ".cmp") Then - Using compressedFileStream As FileStream = File.Create(fileToCompress.FullName + ".cmp") - Using compressionStream As DeflateStream = New DeflateStream(compressedFileStream, CompressionLevel.Fastest, True) - originalFileStream.CopyTo(compressionStream) - End Using - Console.WriteLine(String.Format("file compressed to {0} bytes", compressedFileStream.Length)) - End Using - End If - End Using - End Sub - -End Module -' diff --git a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program3.vb b/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program3.vb deleted file mode 100644 index d11c581ee36..00000000000 --- a/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program3.vb +++ /dev/null @@ -1,30 +0,0 @@ -' -Imports System.IO -Imports System.IO.Compression -Imports System.Text - -Module Module1 - - Sub Main() - Dim uniEncode As UnicodeEncoding = New UnicodeEncoding() - - Dim bytesToCompress = uniEncode.GetBytes("example text to compress and decompress") - Console.WriteLine("starting with: " + uniEncode.GetString(bytesToCompress)) - - Using fileToCompress As FileStream = File.Create("examplefile.gz") - Using compressionStream As DeflateStream = New DeflateStream(fileToCompress, CompressionMode.Compress) - compressionStream.Write(bytesToCompress, 0, bytesToCompress.Length) - End Using - End Using - - Dim decompressedBytes(bytesToCompress.Length - 1) As Byte - Using fileToDecompress As FileStream = File.Open("examplefile.gz", FileMode.Open) - Using decompressionStream As DeflateStream = New DeflateStream(fileToDecompress, CompressionMode.Decompress) - decompressionStream.Read(decompressedBytes, 0, bytesToCompress.Length) - End Using - End Using - - Console.WriteLine("ending with: " + uniEncode.GetString(decompressedBytes)) - End Sub -End Module -' \ No newline at end of file diff --git a/xml/System.IO.Compression/DeflateStream.xml b/xml/System.IO.Compression/DeflateStream.xml index 73d5b1ce016..a1a0730d7b1 100644 --- a/xml/System.IO.Compression/DeflateStream.xml +++ b/xml/System.IO.Compression/DeflateStream.xml @@ -105,21 +105,15 @@ One of the enumeration values that indicates whether to emphasize speed or compression efficiency when compressing the stream. Initializes a new instance of the class by using the specified stream and compression level. - class. - - This constructor overload uses the compression mode . To set the compression mode to another value, use the or overload. -## Examples - The following example shows how to set the compression level when creating a object. - - :::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program1.cs" id="Snippet1"::: - :::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program1.vb" id="Snippet1"::: - - ]]> +[!INCLUDE[remarks](~/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md)] + + ]]> is . @@ -232,7 +226,11 @@ class, and whether to leave the stream object open after disposing the object. + +[!INCLUDE[remarks](~/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md)] ]]> @@ -284,7 +282,7 @@ @@ -1221,8 +1219,8 @@ This method read a maximum of `buffer.Length` bytes from the current stream and ## Examples The following example shows how to compress and decompress bytes by using the and methods. - :::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program3.cs" id="Snippet3"::: - :::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program3.vb" id="Snippet3"::: + :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/WriteReadExample.cs" id="Snippet3"::: + :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/WriteReadExample.vb" id="Snippet3"::: ]]> @@ -1579,8 +1577,8 @@ If the write operation is successful, the position within the Deflate stream adv ## Examples The following example shows how to compress and decompress bytes by using the and methods. - :::code language="csharp" source="~/samples/snippets/csharp/VS_Snippets_CLR_System/system.io.compression.deflatestream/cs/program3.cs" id="Snippet3"::: - :::code language="vb" source="~/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.deflatestream/vb/program3.vb" id="Snippet3"::: + :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/WriteReadExample.cs" id="Snippet3"::: + :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/WriteReadExample.vb" id="Snippet3"::: ]]> From b47678c41a9472a0e65160dabd278121c1ab3caf Mon Sep 17 00:00:00 2001 From: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com> Date: Sun, 3 Oct 2021 08:17:15 -0700 Subject: [PATCH 2/5] Apply suggestions from code review --- xml/System.IO.Compression/DeflateStream.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xml/System.IO.Compression/DeflateStream.xml b/xml/System.IO.Compression/DeflateStream.xml index a1a0730d7b1..2c6d80a5e6e 100644 --- a/xml/System.IO.Compression/DeflateStream.xml +++ b/xml/System.IO.Compression/DeflateStream.xml @@ -1219,8 +1219,8 @@ This method read a maximum of `buffer.Length` bytes from the current stream and ## Examples The following example shows how to compress and decompress bytes by using the and methods. - :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/WriteReadExample.cs" id="Snippet3"::: - :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/WriteReadExample.vb" id="Snippet3"::: + :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs" id="Snippet3"::: + :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb" id="Snippet3"::: ]]> @@ -1577,8 +1577,8 @@ If the write operation is successful, the position within the Deflate stream adv ## Examples The following example shows how to compress and decompress bytes by using the and methods. - :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/WriteReadExample.cs" id="Snippet3"::: - :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/WriteReadExample.vb" id="Snippet3"::: + :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs" id="Snippet3"::: + :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb" id="Snippet3"::: ]]> From b1004ec4776f57e58b8bee6a5d2a1cfa0cdbc47d Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Lopez <1175054+carlossanlop@users.noreply.github.com> Date: Sun, 3 Oct 2021 15:19:40 -0700 Subject: [PATCH 3/5] Improvements --- .../.ctor_Stream_CompressionLevel.md | 4 +- .../.ctor_Stream_CompressionMode.md | 4 +- .../DeflateStream/DeflateStream.md | 4 +- .../Deflate/Deflate.csproj | 2 +- ...ompressDecompressCompressionModeExample.cs | 67 ------------------ ...mple.cs => FileCompressionLevelExample.cs} | 20 +++--- .../Deflate/FileCompressionModeExample.cs | 68 +++++++++++++++++++ .../Deflate/MemoryWriteReadExample.cs | 8 ++- ...ompressDecompressCompressionModeExample.vb | 64 ----------------- ...mple.vb => FileCompressionLevelExample.vb} | 18 ++--- .../Deflate/FileCompressionModeExample.vb | 68 +++++++++++++++++++ .../Deflate/MemoryWriteReadExample.vb | 7 +- 12 files changed, 173 insertions(+), 161 deletions(-) delete mode 100644 samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs rename samples/snippets/csharp/System.IO.Compression/Deflate/{FileCompressCompressionLevelExample.cs => FileCompressionLevelExample.cs} (54%) create mode 100644 samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionModeExample.cs delete mode 100644 samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb rename samples/snippets/visualbasic/System.IO.Compression/Deflate/{FileCompressCompressionLevelExample.vb => FileCompressionLevelExample.vb} (56%) create mode 100644 samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb diff --git a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md index 8a58b99ca5c..c2e206a6e8e 100644 --- a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md +++ b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md @@ -4,5 +4,5 @@ This constructor overload uses the compression mode object and how to leave the stream open. -:::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs" id="Snippet2"::: -:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb" id="Snippet2"::: +:::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionLevelExample.cs" id="Snippet2"::: +:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionLevelExample.vb" id="Snippet2"::: diff --git a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md index d939138003a..4ee0f585911 100644 --- a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md +++ b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md @@ -10,6 +10,6 @@ By default, the compression level is set to class to compress and decompress a file. -:::code language="csharp" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs" id="Snippet1"::: -:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb" id="Snippet1"::: +:::code language="csharp" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.cs" id="Snippet1"::: +:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb" id="Snippet1"::: diff --git a/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md b/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md index 9ad0f0d62e9..dc5f29b4095 100644 --- a/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md +++ b/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md @@ -10,5 +10,5 @@ The compression functionality in and The following example shows how to use the class to compress and decompress a file. -:::code language="csharp" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs" id="Snippet1"::: -:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb" id="Snippet1"::: +:::code language="csharp" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.cs" id="Snippet1"::: +:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb" id="Snippet1"::: diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj b/samples/snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj index 0492920ba76..c32f9c0eba6 100644 --- a/samples/snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj +++ b/samples/snippets/csharp/System.IO.Compression/Deflate/Deflate.csproj @@ -4,7 +4,7 @@ Exe net6.0 enable - MemoryWriteReadExample + FileCompressionModeExample diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs deleted file mode 100644 index c2296dd32b4..00000000000 --- a/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.cs +++ /dev/null @@ -1,67 +0,0 @@ -// -using System; -using System.IO; -using System.IO.Compression; - -public static class FileCompressDecompressCompressionModeExample -{ - private const string OriginalFileName = "original.txt"; - private const string CompressedFileName = "compressed.dfl"; - private const string DecompressedFileName = "decompressed.txt"; - - public static void Main() - { - CreateFileToCompress(); - CompressFile(); - DecompressFile(); - PrintResults(); - DeleteFiles(); - - /* - Output: - The original file 'original.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." - The compressed file 'compressed.dfl' weighs 52 bytes. - The decompressed file 'decompressed.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." - */ - } - - private static void CreateFileToCompress() - { - using var writer = new StreamWriter(OriginalFileName); - writer.Write($"This is the content saved inside the {OriginalFileName} file."); - } - - private static void CompressFile() - { - using FileStream originalFileStream = File.Open(OriginalFileName, FileMode.Open); - using FileStream compressedFileStream = File.Create(CompressedFileName); - using var deflateStream = new DeflateStream(compressedFileStream, CompressionMode.Compress); - originalFileStream.CopyTo(deflateStream); - } - - private static void DecompressFile() - { - using FileStream compressedFileStream = File.Open(CompressedFileName, FileMode.Open); - using FileStream outputFileStream = File.Create(DecompressedFileName); - using var deflateStream = new DeflateStream(compressedFileStream, CompressionMode.Decompress); - deflateStream.CopyTo(outputFileStream); - } - - 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)}\""); - } - - private static void DeleteFiles() - { - File.Delete(OriginalFileName); - File.Delete(CompressedFileName); - File.Delete(DecompressedFileName); - } -} -// diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionLevelExample.cs similarity index 54% rename from samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs rename to samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionLevelExample.cs index a051abb39e0..99397a2ad77 100644 --- a/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.cs +++ b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionLevelExample.cs @@ -3,8 +3,9 @@ using System.IO; using System.IO.Compression; -public static class FileCompressCompressionLevelExample +public static class FileCompressionLevelExample { + 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 const string OriginalFileName = "original.txt"; private const string CompressedFileName = "compressed.dfl"; @@ -17,30 +18,27 @@ public static void Main() /* Output: - The original file 'original.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." - The compressed file 'compressed.dfl' weighs 54 bytes. + The original file 'original.txt' weighs 445 bytes. + The compressed file 'compressed.dfl' weighs 259 bytes. */ } - private static void CreateFileToCompress() - { - using var writer = new StreamWriter(OriginalFileName); - writer.Write($"This is the content saved inside the {OriginalFileName} file."); - } + private static void CreateFileToCompress() => File.WriteAllText(OriginalFileName, Message); private static void CompressFile() { using FileStream originalFileStream = File.Open(OriginalFileName, FileMode.Open); using FileStream compressedFileStream = File.Create(CompressedFileName); - using var deflateStream = new DeflateStream(compressedFileStream, CompressionLevel.Fastest); - originalFileStream.CopyTo(deflateStream); + using var compressor = new DeflateStream(compressedFileStream, CompressionLevel.Fastest); + originalFileStream.CopyTo(compressor); } 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. Contents: \"{File.ReadAllText(OriginalFileName)}\""); + + Console.WriteLine($"The original file '{OriginalFileName}' weighs {originalSize} bytes."); Console.WriteLine($"The compressed file '{CompressedFileName}' weighs {compressedSize} bytes."); } diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionModeExample.cs b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionModeExample.cs new file mode 100644 index 00000000000..0470bc09d54 --- /dev/null +++ b/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionModeExample.cs @@ -0,0 +1,68 @@ +// +using System; +using System.IO; +using System.IO.Compression; + +public static class FileCompressionModeExample +{ + 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 const string OriginalFileName = "original.txt"; + private const string CompressedFileName = "compressed.dfl"; + private const string DecompressedFileName = "decompressed.txt"; + + public static void Main() + { + CreateFileToCompress(); + CompressFile(); + DecompressFile(); + PrintResults(); + DeleteFiles(); + + /* + 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 compressed file 'compressed.dfl' weighs 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." + */ + } + + private static void CreateFileToCompress() => File.WriteAllText(OriginalFileName, Message); + + private static void CompressFile() + { + using FileStream originalFileStream = File.Open(OriginalFileName, FileMode.Open); + using FileStream compressedFileStream = File.Create(CompressedFileName); + using var compressor = new DeflateStream(compressedFileStream, CompressionMode.Compress); + originalFileStream.CopyTo(compressor); + } + + private static void DecompressFile() + { + using FileStream compressedFileStream = File.Open(CompressedFileName, FileMode.Open); + using FileStream outputFileStream = File.Create(DecompressedFileName); + using var decompressor = new DeflateStream(compressedFileStream, CompressionMode.Decompress); + decompressor.CopyTo(outputFileStream); + } + + 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)}\""); + } + + private static void DeleteFiles() + { + File.Delete(OriginalFileName); + File.Delete(CompressedFileName); + File.Delete(DecompressedFileName); + } +} +// diff --git a/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs b/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs index dfed639cad1..dcea395fccd 100644 --- a/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs +++ b/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs @@ -6,7 +6,7 @@ public static class MemoryWriteReadExample { - private const string Message = "example text to compress and decompress"; + 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() @@ -17,6 +17,12 @@ public static void Main() Console.WriteLine($"The compressed stream length is {stream.Length} bytes."); int decompressedLength = DecompressStreamToBytes(stream); Console.WriteLine($"The decompressed string length is {decompressedLength} bytes, same as the original length."); + /* + Output: + The original string length is 445 bytes. + The compressed stream length is 265 bytes. + The decompressed string length is 445 bytes, same as the original length. + */ } private static void CompressBytesToStream(Stream stream) diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb deleted file mode 100644 index 10bb1867524..00000000000 --- a/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressDecompressCompressionModeExample.vb +++ /dev/null @@ -1,64 +0,0 @@ -' -Imports System.IO -Imports System.IO.Compression - -Module FileCompressDecompressCompressionModeExample - Private Const OriginalFileName As String = "original.txt" - Private Const CompressedFileName As String = "compressed.dfl" - Private Const DecompressedFileName As String = "decompressed.txt" - - Sub Main() - CreateFileToCompress() - CompressFile() - DecompressFile() - PrintResults() - DeleteFiles() - - 'Output: - ' The original file 'original.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." - ' The compressed file 'compressed.dfl' weighs 52 bytes. - ' The decompressed file 'decompressed.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." - End Sub - - Private Sub CreateFileToCompress() - Using writer = New StreamWriter(OriginalFileName) - writer.Write($"This is the content saved inside the {OriginalFileName} file.") - End Using - End Sub - - Private Sub CompressFile() - Using originalFileStream As FileStream = File.Open(OriginalFileName, FileMode.Open) - Using compressedFileStream As FileStream = File.Create(CompressedFileName) - Using deflateStream = New DeflateStream(compressedFileStream, CompressionMode.Compress) - originalFileStream.CopyTo(deflateStream) - End Using - End Using - End Using - End Sub - - Private Sub DecompressFile() - Using compressedFileStream As FileStream = File.Open(CompressedFileName, FileMode.Open) - Using outputFileStream As FileStream = File.Create(DecompressedFileName) - Using deflateStream = New DeflateStream(compressedFileStream, CompressionMode.Decompress) - deflateStream.CopyTo(outputFileStream) - End Using - End Using - End Using - End Sub - - Private Sub PrintResults() - Dim originalSize As Long = New FileInfo(OriginalFileName).Length - Dim compressedSize As Long = New FileInfo(CompressedFileName).Length - Dim decompressedSize As Long = 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)}""") - End Sub - - Private Sub DeleteFiles() - File.Delete(OriginalFileName) - File.Delete(CompressedFileName) - File.Delete(DecompressedFileName) - End Sub -End Module -' diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionLevelExample.vb similarity index 56% rename from samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb rename to samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionLevelExample.vb index bfe424725b3..3423d2f6624 100644 --- a/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressCompressionLevelExample.vb +++ b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionLevelExample.vb @@ -2,7 +2,8 @@ Imports System.IO Imports System.IO.Compression -Module FileCompressCompressionLevelExample +Module FileCompressionLevelExample + Private Const Message As String = "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 Const OriginalFileName As String = "original.txt" Private Const CompressedFileName As String = "compressed.dfl" @@ -13,21 +14,19 @@ Module FileCompressCompressionLevelExample DeleteFiles() 'Output: - ' The original file 'original.txt' weighs 55 bytes. Contents: "This is the content saved inside the original.txt file." - ' The compressed file 'compressed.dfl' weighs 54 bytes. + ' The original file 'original.txt' weighs 445 bytes. + ' The compressed file 'compressed.dfl' weighs 259 bytes. End Sub Private Sub CreateFileToCompress() - Using writer = New StreamWriter(OriginalFileName) - writer.Write($"This is the content saved inside the {OriginalFileName} file.") - End Using + File.WriteAllText(OriginalFileName, Message) End Sub Private Sub CompressFile() Using originalFileStream As FileStream = File.Open(OriginalFileName, FileMode.Open) Using compressedFileStream As FileStream = File.Create(CompressedFileName) - Using deflateStream = New DeflateStream(compressedFileStream, CompressionLevel.Fastest) - originalFileStream.CopyTo(deflateStream) + Using compressor = New DeflateStream(compressedFileStream, CompressionLevel.Fastest) + originalFileStream.CopyTo(compressor) End Using End Using End Using @@ -36,7 +35,8 @@ Module FileCompressCompressionLevelExample Private Sub PrintResults() Dim originalSize As Long = New FileInfo(OriginalFileName).Length Dim compressedSize As Long = New FileInfo(CompressedFileName).Length - Console.WriteLine($"The original file '{OriginalFileName}' weighs {originalSize} bytes. Contents: ""{File.ReadAllText(OriginalFileName)}""") + + Console.WriteLine($"The original file '{OriginalFileName}' weighs {originalSize} bytes.") Console.WriteLine($"The compressed file '{CompressedFileName}' weighs {compressedSize} bytes.") End Sub diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb new file mode 100644 index 00000000000..215bf3ca6e4 --- /dev/null +++ b/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb @@ -0,0 +1,68 @@ +' +Imports System.IO +Imports System.IO.Compression + +Module FileCompressionModeExample + Private Const Message As String = "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 Const OriginalFileName As String = "original.txt" + Private Const CompressedFileName As String = "compressed.dfl" + Private Const DecompressedFileName As String = "decompressed.txt" + + Sub Main() + CreateFileToCompress() + CompressFile() + DecompressFile() + PrintResults() + DeleteFiles() + + '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 compressed file 'compressed.dfl' weighs 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." + + End Sub + + Private Sub CreateFileToCompress() + File.WriteAllText(OriginalFileName, Message) + End Sub + + Private Sub CompressFile() + Using originalFileStream As FileStream = File.Open(OriginalFileName, FileMode.Open) + Using compressedFileStream As FileStream = File.Create(CompressedFileName) + Using compressor = New DeflateStream(compressedFileStream, CompressionMode.Compress) + originalFileStream.CopyTo(compressor) + End Using + End Using + End Using + End Sub + + Private Sub DecompressFile() + Using compressedFileStream As FileStream = File.Open(CompressedFileName, FileMode.Open) + Using outputFileStream As FileStream = File.Create(DecompressedFileName) + Using decompressor = New DeflateStream(compressedFileStream, CompressionMode.Decompress) + decompressor.CopyTo(outputFileStream) + End Using + End Using + End Using + End Sub + + Private Sub PrintResults() + Dim originalSize As Long = New FileInfo(OriginalFileName).Length + Dim compressedSize As Long = New FileInfo(CompressedFileName).Length + Dim decompressedSize As Long = 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)}""") + End Sub + + Private Sub DeleteFiles() + File.Delete(OriginalFileName) + File.Delete(CompressedFileName) + File.Delete(DecompressedFileName) + End Sub +End Module +' diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb b/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb index 4c094c0f558..344bfc68499 100644 --- a/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb +++ b/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb @@ -4,7 +4,7 @@ Imports System.IO.Compression Imports System.Text Module MemoryWriteReadExample - Private Const Message As String = "example text to compress and decompress" + Private Const Message As String = "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 ReadOnly s_messageBytes As Byte() = Encoding.ASCII.GetBytes(Message) Sub Main() @@ -16,7 +16,10 @@ Module MemoryWriteReadExample Dim decompressedLength As Integer = DecompressStreamToBytes(stream) Console.WriteLine($"The decompressed string length is {decompressedLength} bytes, same as the original length.") End Using - + ' Output: + ' The original string length is 445 bytes. + ' The compressed stream length is 265 bytes. + ' The decompressed string length is 445 bytes, same as the original length. End Sub Private Sub CompressBytesToStream(ByVal stream As Stream) From c4f7c470009805f2af6fb3b0cdc1bbedb547346e Mon Sep 17 00:00:00 2001 From: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com> Date: Sun, 3 Oct 2021 15:22:25 -0700 Subject: [PATCH 4/5] Update samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj --- .../visualbasic/System.IO.Compression/Deflate/Deflate.vbproj | 1 - 1 file changed, 1 deletion(-) diff --git a/samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj b/samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj index abdf9830e49..38c40ed3d30 100644 --- a/samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj +++ b/samples/snippets/visualbasic/System.IO.Compression/Deflate/Deflate.vbproj @@ -3,7 +3,6 @@ Exe net6.0 - enable Deflate.MemoryWriteReadExample From fa4628bdfe4b7692fb827be3b8d8515b9c16c2d0 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com> Date: Mon, 4 Oct 2021 11:36:02 -0700 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: Genevieve Warren <24882762+gewarren@users.noreply.github.com> --- .../DeflateStream/.ctor_Stream_CompressionLevel.md | 4 ++-- .../DeflateStream/.ctor_Stream_CompressionMode.md | 2 +- .../System.IO.Compression/DeflateStream/DeflateStream.md | 2 +- xml/System.IO.Compression/DeflateStream.xml | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md index c2e206a6e8e..d89c9f86da4 100644 --- a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md +++ b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionLevel.md @@ -4,5 +4,5 @@ This constructor overload uses the compression mode object and how to leave the stream open. -:::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionLevelExample.cs" id="Snippet2"::: -:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionLevelExample.vb" id="Snippet2"::: +:::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionLevelExample.cs" id="Snippet1"::: +:::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionLevelExample.vb" id="Snippet1"::: diff --git a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md index 4ee0f585911..420acbe55d9 100644 --- a/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md +++ b/includes/remarks/System.IO.Compression/DeflateStream/.ctor_Stream_CompressionMode.md @@ -10,6 +10,6 @@ By default, the compression level is set to class to compress and decompress a file. -:::code language="csharp" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.cs" id="Snippet1"::: +:::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionModeExample.cs" id="Snippet1"::: :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb" id="Snippet1"::: diff --git a/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md b/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md index dc5f29b4095..f03b3570f99 100644 --- a/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md +++ b/includes/remarks/System.IO.Compression/DeflateStream/DeflateStream.md @@ -10,5 +10,5 @@ The compression functionality in and The following example shows how to use the class to compress and decompress a file. -:::code language="csharp" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.cs" id="Snippet1"::: +:::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/FileCompressionModeExample.cs" id="Snippet1"::: :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/FileCompressionModeExample.vb" id="Snippet1"::: diff --git a/xml/System.IO.Compression/DeflateStream.xml b/xml/System.IO.Compression/DeflateStream.xml index 2c6d80a5e6e..9e525a23c28 100644 --- a/xml/System.IO.Compression/DeflateStream.xml +++ b/xml/System.IO.Compression/DeflateStream.xml @@ -1219,8 +1219,8 @@ This method read a maximum of `buffer.Length` bytes from the current stream and ## Examples The following example shows how to compress and decompress bytes by using the and methods. - :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs" id="Snippet3"::: - :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb" id="Snippet3"::: + :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs" id="Snippet1"::: + :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb" id="Snippet1"::: ]]> @@ -1577,8 +1577,8 @@ If the write operation is successful, the position within the Deflate stream adv ## Examples The following example shows how to compress and decompress bytes by using the and methods. - :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs" id="Snippet3"::: - :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb" id="Snippet3"::: + :::code language="csharp" source="~/samples/snippets/csharp/System.IO.Compression/Deflate/MemoryWriteReadExample.cs" id="Snippet1"::: + :::code language="vb" source="~/samples/snippets/visualbasic/System.IO.Compression/Deflate/MemoryWriteReadExample.vb" id="Snippet1"::: ]]>