From cad568755913059934a33d5e9475eaccaee8d3d9 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Thu, 18 Mar 2021 18:41:35 +1100 Subject: [PATCH] add extra rider path --- docs/diff-tool.md | 1 + src/DiffEngine.Tests/diffTools.include.md | 1 + src/DiffEngine/Implementation/Rider.cs | 3 ++- src/Directory.Build.props | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 8adc16de..972cd731 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -444,6 +444,7 @@ ReSharper | Options | Tools | Unit Testing | Test Runner * `%HOME%/.local/share/JetBrains/Toolbox/apps/Rider/*/*/bin/rider.sh` * `/opt/jetbrains/rider/bin/rider.sh` + * `/usr/share/rider/bin/rider.sh` ## [SublimeMerge](https://www.sublimemerge.com/) diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index cd336496..456d3ac7 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -344,6 +344,7 @@ * `%HOME%/.local/share/JetBrains/Toolbox/apps/Rider/*/*/bin/rider.sh` * `/opt/jetbrains/rider/bin/rider.sh` + * `/usr/share/rider/bin/rider.sh` ## [SublimeMerge](https://www.sublimemerge.com/) diff --git a/src/DiffEngine/Implementation/Rider.cs b/src/DiffEngine/Implementation/Rider.cs index 2dc51b98..9ddf3630 100644 --- a/src/DiffEngine/Implementation/Rider.cs +++ b/src/DiffEngine/Implementation/Rider.cs @@ -30,7 +30,8 @@ static string Arguments(string temp, string target) => linux: new( Arguments, "%HOME%/.local/share/JetBrains/Toolbox/apps/Rider/*/*/bin/rider.sh", - "/opt/jetbrains/rider/bin/rider.sh"), + "/opt/jetbrains/rider/bin/rider.sh", + "/usr/share/rider/bin/rider.sh"), notes: @" * https://www.jetbrains.com/help/rider/Command_Line_Differences_Viewer.html"); } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6f8bf4f9..56c494d7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;CS0649 - 6.6.0-beta.1 + 6.6.0-beta.2 1.0.0 Testing, Snapshot, Diff, Compare Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.