Also search bin for kdiff (#605)

* Also search bin for kdiff

* Update Directory.Build.props

* Docs changes

---------

Co-authored-by: GitHub Action <[email protected]>

Author: SimonCropp

docs/diff-tool.md

@@ -323,6 +323,9 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
   * Example target on left arguments: `"targetFile.txt" "tempFile.txt" --cs CreateBakFiles=0 `
   * Example target on right arguments: `"tempFile.txt" "targetFile.txt" --cs CreateBakFiles=0 `
   * Scanned paths:
+    * `%ProgramFiles%\KDiff3\bin\kdiff3.exe`
+    * `%ProgramW6432%\KDiff3\bin\kdiff3.exe`
+    * `%ProgramFiles(x86)%\KDiff3\bin\kdiff3.exe`
     * `%ProgramFiles%\KDiff3\kdiff3.exe`
     * `%ProgramW6432%\KDiff3\kdiff3.exe`
     * `%ProgramFiles(x86)%\KDiff3\kdiff3.exe`

src/DiffEngine.Tests/diffTools.include.md

@@ -188,6 +188,9 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
   * Example target on left arguments: `"targetFile.txt" "tempFile.txt" --cs CreateBakFiles=0 `
   * Example target on right arguments: `"tempFile.txt" "targetFile.txt" --cs CreateBakFiles=0 `
   * Scanned paths:
+    * `%ProgramFiles%\KDiff3\bin\kdiff3.exe`
+    * `%ProgramW6432%\KDiff3\bin\kdiff3.exe`
+    * `%ProgramFiles(x86)%\KDiff3\bin\kdiff3.exe`
     * `%ProgramFiles%\KDiff3\kdiff3.exe`
     * `%ProgramW6432%\KDiff3\kdiff3.exe`
     * `%ProgramFiles(x86)%\KDiff3\kdiff3.exe`

src/DiffEngine/Implementation/KDiff3.cs

@@ -19,7 +19,7 @@ public static Definition KDiff3()
                 Windows: new(
                     "kdiff3.exe",
                     launchArguments,
-                    @"%ProgramFiles%\KDiff3\"),
+                    @"%ProgramFiles%\KDiff3\bin\", @"%ProgramFiles%\KDiff3\"),
                 Osx: new(
                     "kdiff3",
                     launchArguments,

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649</NoWarn>
-    <Version>15.9.0</Version>
+    <Version>15.9.1</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>