Skip to content

Commit

Permalink
Remove files beyond compare doesnt do a good job handling (#283)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp authored May 13, 2022
1 parent 6f5b144 commit 39057bb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 16 deletions.
4 changes: 2 additions & 2 deletions docs/diff-tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions src/DiffEngine.Tests/DiffEngine.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net5.0;net6.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net5.0;net6.0;netcoreapp3.1;netcoreapp2.1;net48</TargetFrameworks>
<TargetFrameworks>net5.0;net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net5.0;net6.0;netcoreapp3.1;net48</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<NoWarn>SYSLIB0012</NoWarn>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/DiffEngine.Tests/diffTools.include.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
10 changes: 0 additions & 10 deletions src/DiffEngine/Implementation/BeyondCompare.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 39057bb

Please sign in to comment.