Skip to content

Commit

Permalink
add extra rider path
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Mar 18, 2021
1 parent e5d5057 commit cad5687
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions docs/diff-tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
1 change: 1 addition & 0 deletions src/DiffEngine.Tests/diffTools.include.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
3 changes: 2 additions & 1 deletion src/DiffEngine/Implementation/Rider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;CS0649</NoWarn>
<Version>6.6.0-beta.1</Version>
<Version>6.6.0-beta.2</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>
Expand Down

0 comments on commit cad5687

Please sign in to comment.