From faa8f402a0734b40d5b19c37ddf41800f70633c6 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Fri, 13 May 2022 16:22:21 +1000 Subject: [PATCH 1/2] Update DiffEngine.Tests.csproj --- src/DiffEngine.Tests/DiffEngine.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DiffEngine.Tests/DiffEngine.Tests.csproj b/src/DiffEngine.Tests/DiffEngine.Tests.csproj index a9a4d388..9efd6217 100644 --- a/src/DiffEngine.Tests/DiffEngine.Tests.csproj +++ b/src/DiffEngine.Tests/DiffEngine.Tests.csproj @@ -1,8 +1,8 @@  - net5.0;net6.0;netcoreapp3.1;netcoreapp2.1 - net5.0;net6.0;netcoreapp3.1;netcoreapp2.1;net48 + net5.0;net6.0;netcoreapp3.1 + net5.0;net6.0;netcoreapp3.1;net48 true SYSLIB0012 From 774b8c6b55e9b33f554e3c6ebcde48b85c5efb5f Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Fri, 13 May 2022 16:22:30 +1000 Subject: [PATCH 2/2] . --- docs/diff-tool.md | 4 ++-- src/DiffEngine.Tests/diffTools.include.md | 4 ++-- src/DiffEngine/Implementation/BeyondCompare.cs | 10 ---------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 814fd069..70220856 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -124,7 +124,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a * Is MDI: False * Supports auto-refresh: True * Supports text files: True - * Supported binaries: mp3, xls, xlsm, xlsx, doc, docm, docx, dot, dotm, dotx, pdf, bmp, gif, ico, jpg, jpeg, png, tif, tiff, rtf + * Supported binaries: pdf, bmp, gif, ico, jpg, jpeg, png, tif, tiff, rtf #### Notes: @@ -636,7 +636,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a #### Notes: - * [Command line reference](https://www.devart.com/codecompare/docs/index.html?comparing_via_command_line.htm) + * [Command line reference](https://docs.devart.com/code-compare/using-command-line/comparing-via-command-line.html) #### Windows settings: diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index 41024639..7eaf8b5b 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -13,7 +13,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a * Is MDI: False * Supports auto-refresh: True * Supports text files: True - * Supported binaries: mp3, xls, xlsm, xlsx, doc, docm, docx, dot, dotm, dotx, pdf, bmp, gif, ico, jpg, jpeg, png, tif, tiff, rtf + * Supported binaries: pdf, bmp, gif, ico, jpg, jpeg, png, tif, tiff, rtf #### Notes: @@ -525,7 +525,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a #### Notes: - * [Command line reference](https://www.devart.com/codecompare/docs/index.html?comparing_via_command_line.htm) + * [Command line reference](https://docs.devart.com/code-compare/using-command-line/comparing-via-command-line.html) #### Windows settings: diff --git a/src/DiffEngine/Implementation/BeyondCompare.cs b/src/DiffEngine/Implementation/BeyondCompare.cs index 316abd19..89bdccf5 100644 --- a/src/DiffEngine/Implementation/BeyondCompare.cs +++ b/src/DiffEngine/Implementation/BeyondCompare.cs @@ -34,16 +34,6 @@ static string TargetRightOsxLinuxArguments(string temp, string target) requiresTarget: true, binaryExtensions: new[] { - "mp3", //? - "xls", - "xlsm", - "xlsx", - "doc", - "docm", - "docx", - "dot", - "dotm", - "dotx", "pdf", "bmp", "gif",