From 54b0b1354dbbbe8580019a5b4e99edf9a10b918e Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Wed, 10 Sep 2025 20:37:57 +1000 Subject: [PATCH] Add nupkg and kmz support to beyond compare --- docs/diff-tool.md | 4 +++- src/DiffEngine.Tests/diffTools.include.md | 4 +++- src/DiffEngine/Implementation/BeyondCompare.cs | 4 ++++ src/Directory.Build.props | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 150400f5..f643b62e 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -147,12 +147,14 @@ 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: .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 + * Supported binaries: .7z, .bcpkg, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .wim, .xz, .zip, .zipx #### Notes: * [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html) * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`. + * For `.kmz`, and `.nupkg` Beyond Compare needs to be configured to treat them as zip. + Tools > Options > Archive Types. Scroll down to Zip, then add extra extension to the semicolon delimited list. #### Windows settings: diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index b96f4413..4dc4dd28 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -12,12 +12,14 @@ 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: .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 + * Supported binaries: .7z, .bcpkg, .bmp, .bz, .bz2, .cab, .chm, .deb, .ear, .gif, .gz, .ico, .img, .iso, .iso, .jar, .jpeg, .jpg, .kmz, .nupkg, .pdf, .png, .rar, .rpm, .rtf, .svg, .swm, .tar, .tbz, .tbz2, .tbz2, .tgz, .tif, .tiff, .war, .wim, .xz, .zip, .zipx #### Notes: * [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html) * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`. + * For `.kmz`, and `.nupkg` Beyond Compare needs to be configured to treat them as zip. + `Tools > Options > Archive Types`. Scroll down to Zip, then add extra extension to the semicolon delimited list. #### Windows settings: diff --git a/src/DiffEngine/Implementation/BeyondCompare.cs b/src/DiffEngine/Implementation/BeyondCompare.cs index 7245d3ba..f9f4c064 100644 --- a/src/DiffEngine/Implementation/BeyondCompare.cs +++ b/src/DiffEngine/Implementation/BeyondCompare.cs @@ -64,6 +64,8 @@ static string RightOsxLinuxArguments(string temp, string target) => ".ear", ".war", ".bcpkg", + ".nupkg", + ".kmz" ], OsSupport: new( Windows: new( @@ -88,6 +90,8 @@ static string RightOsxLinuxArguments(string temp, string target) => Notes: """ * [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html) * Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`. + * For `.kmz`, and `.nupkg` Beyond Compare needs to be configured to treat them as zip. + `Tools > Options > Archive Types`. Scroll down to Zip, then add extra extension to the semicolon delimited list. """); } } \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 2296e31e..f648fb12 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;CS0649;NU1608;NU1109 - 16.3.0 + 16.4.0 1.0.0 Testing, Snapshot, Diff, Compare Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.