From 3e39e14a2f68755fd42b5122674678587ca51292 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Thu, 4 Sep 2025 22:33:45 +1000 Subject: [PATCH 1/2] add archive extensions to BeyondCompare --- src/DiffEngine.Tests/diffTools.include.md | 2 +- .../Implementation/BeyondCompare.cs | 28 ++++++++++++++++++- src/Directory.Build.props | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index fc7380eb..b96f4413 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -12,7 +12,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a * Supports text files: True * Use shell execute: True * Environment variable for custom install location: `DiffEngine_BeyondCompare` - * Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .pdf, .png, .rtf, .svg, .tif, .tiff + * Supported binaries: .7z, .bcpkg, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .wim, .xz, .zip, .zipx #### Notes: diff --git a/src/DiffEngine/Implementation/BeyondCompare.cs b/src/DiffEngine/Implementation/BeyondCompare.cs index 5d2c1ac8..7245d3ba 100644 --- a/src/DiffEngine/Implementation/BeyondCompare.cs +++ b/src/DiffEngine/Implementation/BeyondCompare.cs @@ -37,7 +37,33 @@ static string RightOsxLinuxArguments(string temp, string target) => ".png", ".tif", ".tiff", - ".rtf" + ".rtf", + ".7z", + ".bz", + ".bz2", + ".tbz", + ".tbz2", + ".tbz2", + ".chm", + ".deb", + ".img", + ".iso", + ".iso", + ".gz", + ".tgz", + ".cab", + ".rar", + ".rpm", + ".tar", + ".wim", + ".swm", + ".xz", + ".zip", + ".zipx", + ".jar", + ".ear", + ".war", + ".bcpkg", ], OsSupport: new( Windows: new( diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fefeb7e8..2296e31e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;CS0649;NU1608;NU1109 - 16.2.3 + 16.3.0 1.0.0 Testing, Snapshot, Diff, Compare Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries. From 4648387dbeb5c8da58b9a2eeeb99a1d6c581b18e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 4 Sep 2025 12:34:09 +0000 Subject: [PATCH 2/2] Docs changes --- docs/diff-tool.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index dcfa1b53..150400f5 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -147,7 +147,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a * Supports text files: True * Use shell execute: True * Environment variable for custom install location: `DiffEngine_BeyondCompare` - * Supported binaries: .bmp, .gif, .ico, .jpeg, .jpg, .pdf, .png, .rtf, .svg, .tif, .tiff + * Supported binaries: .7z, .bcpkg, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .wim, .xz, .zip, .zipx #### Notes: