Skip to content

Commit 0edfb51

Browse files
authored
Add nupkg and kmz support to beyond compare (#645)
1 parent 9f8bed3 commit 0edfb51

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

docs/diff-tool.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,14 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
147147
* Supports text files: True
148148
* Use shell execute: True
149149
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
150-
* 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
150+
* 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
151151

152152
#### Notes:
153153

154154
* [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html)
155155
* Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`.
156+
* For `.kmz`, and `.nupkg` Beyond Compare needs to be configured to treat them as zip.
157+
Tools > Options > Archive Types. Scroll down to Zip, then add extra extension to the semicolon delimited list.
156158

157159
#### Windows settings:
158160

src/DiffEngine.Tests/diffTools.include.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
1212
* Supports text files: True
1313
* Use shell execute: True
1414
* Environment variable for custom install location: `DiffEngine_BeyondCompare`
15-
* 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
15+
* 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
1616

1717
#### Notes:
1818

1919
* [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html)
2020
* Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`.
21+
* For `.kmz`, and `.nupkg` Beyond Compare needs to be configured to treat them as zip.
22+
`Tools > Options > Archive Types`. Scroll down to Zip, then add extra extension to the semicolon delimited list.
2123

2224
#### Windows settings:
2325

src/DiffEngine/Implementation/BeyondCompare.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ static string RightOsxLinuxArguments(string temp, string target) =>
6464
".ear",
6565
".war",
6666
".bcpkg",
67+
".nupkg",
68+
".kmz"
6769
],
6870
OsSupport: new(
6971
Windows: new(
@@ -88,6 +90,8 @@ static string RightOsxLinuxArguments(string temp, string target) =>
8890
Notes: """
8991
* [Command line reference](https://www.scootersoftware.com/v4help/index.html?command_line_reference.html)
9092
* Enable [Automatically reload unless changes will be discarded](https://www.scootersoftware.com/v4help/optionstweak.html) in `Tools > Options > Tweaks > File Operations`.
93+
* For `.kmz`, and `.nupkg` Beyond Compare needs to be configured to treat them as zip.
94+
`Tools > Options > Archive Types`. Scroll down to Zip, then add extra extension to the semicolon delimited list.
9195
""");
9296
}
9397
}

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<NoWarn>CS1591;CS0649;NU1608;NU1109</NoWarn>
5-
<Version>16.3.0</Version>
5+
<Version>16.4.0</Version>
66
<AssemblyVersion>1.0.0</AssemblyVersion>
77
<PackageTags>Testing, Snapshot, Diff, Compare</PackageTags>
88
<Description>Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.</Description>

0 commit comments

Comments
 (0)