Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/diff-tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 3 additions & 1 deletion src/DiffEngine.Tests/diffTools.include.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 4 additions & 0 deletions src/DiffEngine/Implementation/BeyondCompare.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ static string RightOsxLinuxArguments(string temp, string target) =>
".ear",
".war",
".bcpkg",
".nupkg",
".kmz"
],
OsSupport: new(
Windows: new(
Expand All @@ -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.
""");
}
}
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;CS0649;NU1608;NU1109</NoWarn>
<Version>16.3.0</Version>
<Version>16.4.0</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
<Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>
Expand Down
Loading