Merge branch 'main' into add-bin-support

Author: SimonCropp

docs/diff-tool.md

@@ -298,9 +298,9 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
    "tempFile.txt" "targetFile.txt" /nh /diffonly /dn1:tempFile.txt /dn2:targetFile.txt
    ```
   * Scanned paths:
-    * `%ProgramFiles%\ExamDiff Pro\ExamDiff.exe`
-    * `%ProgramW6432%\ExamDiff Pro\ExamDiff.exe`
-    * `%ProgramFiles(x86)%\ExamDiff Pro\ExamDiff.exe`
+    * `%ProgramFiles%\ExamDiff Pro*\ExamDiff.exe`
+    * `%ProgramW6432%\ExamDiff Pro*\ExamDiff.exe`
+    * `%ProgramFiles(x86)%\ExamDiff Pro*\ExamDiff.exe`
     * `%PATH%ExamDiff.exe`
 
 ### [Guiffy](https://www.guiffy.com/)

src/DiffEngine.Tests/diffTools.include.md

@@ -163,9 +163,9 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
    "tempFile.txt" "targetFile.txt" /nh /diffonly /dn1:tempFile.txt /dn2:targetFile.txt
    ```
   * Scanned paths:
-    * `%ProgramFiles%\ExamDiff Pro\ExamDiff.exe`
-    * `%ProgramW6432%\ExamDiff Pro\ExamDiff.exe`
-    * `%ProgramFiles(x86)%\ExamDiff Pro\ExamDiff.exe`
+    * `%ProgramFiles%\ExamDiff Pro*\ExamDiff.exe`
+    * `%ProgramW6432%\ExamDiff Pro*\ExamDiff.exe`
+    * `%ProgramFiles(x86)%\ExamDiff Pro*\ExamDiff.exe`
     * `%PATH%ExamDiff.exe`
 
 ### [Guiffy](https://www.guiffy.com/)

src/DiffEngine/Implementation/ExamDiff.cs

@@ -30,7 +30,7 @@ static string RightArguments(string temp, string target)
                 Windows: new(
                     "ExamDiff.exe",
                     new(LeftArguments, RightArguments),
-                    @"%ProgramFiles%\ExamDiff Pro\")),
+                    @"%ProgramFiles%\ExamDiff Pro*\")),
             Notes: """
                  * [Command line reference](https://www.prestosoft.com/ps.asp?page=htmlhelp/edp/command_line_options)
                  * `/nh`: do not add files or directories to comparison history

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;NU1608;NU1109</NoWarn>
-    <Version>16.6.0</Version>
+    <Version>16.7.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>

src/Directory.Packages.props

@@ -10,7 +10,7 @@
     <PackageVersion Include="Fody" Version="6.9.3" />
     <PackageVersion Include="MarkdownSnippets.MsBuild" Version="28.0.0-beta.2" />
     <PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Polyfill" Version="9.0.0-beta.9" />
     <PackageVersion Include="ProjectDefaults" Version="1.0.161" />
     <PackageVersion Include="Resourcer.Fody" Version="1.8.1" />