Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change rider detection to new install locations #377

Merged
merged 3 commits into from
Aug 13, 2023
Merged

Change rider detection to new install locations #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6896458
Change rider detection to new install locations
SimonCropp Aug 13, 2023
fa5da25
Merge branch 'main' into Change-rider-detection-to-new-install-locations
SimonCropp Aug 13, 2023
8d4b7b6
Update Directory.Build.props
SimonCropp Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions docs/diff-tool.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,21 +403,14 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* Example target on left arguments: `diff "targetFile.txt" "tempFile.txt" `
* Example target on right arguments: `diff "tempFile.txt" "targetFile.txt" `
* Scanned paths:
* `%LOCALAPPDATA%\JetBrains\Installations\Rider*\bin\rider64.exe`
* `%ProgramFiles%\JetBrains\JetBrains Rider *\bin\rider64.exe`
* `%ProgramW6432%\JetBrains\JetBrains Rider *\bin\rider64.exe`
* `%ProgramFiles(x86)%\JetBrains\JetBrains Rider *\bin\rider64.exe`
* `%LOCALAPPDATA%\JetBrains\Toolbox\apps\Rider\*\*\bin\rider64.exe`
* `%LOCALAPPDATA%\Programs\Rider\bin\rider64.exe`
* `%PATH%rider64.exe`

#### OSX settings:

* Example target on left arguments: `diff "targetFile.txt" "tempFile.txt" `
* Example target on right arguments: `diff "tempFile.txt" "targetFile.txt" `
* Scanned paths:
* `%HOME%/Library/Application Support/JetBrains/Toolbox/apps/Rider/*/*/Rider EAP.app/Contents/MacOS/rider`
* `%HOME%/Library/Application Support/JetBrains/Toolbox/apps/Rider/*/*/Rider.app/Contents/MacOS/rider`
* `/Applications/Rider EAP.app/Contents/MacOS/rider`
* `/Applications/Rider.app/Contents/MacOS/rider`
* `%PATH%rider`

Expand All @@ -427,8 +420,6 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* Example target on right arguments: `diff "tempFile.txt" "targetFile.txt" `
* Scanned paths:
* `%HOME%/.local/share/JetBrains/Toolbox/apps/Rider/*/*/bin/rider.sh`
* `/opt/jetbrains/rider/bin/rider.sh`
* `/usr/share/rider/bin/rider.sh`
* `%PATH%rider.sh`

### [TkDiff](https://sourceforge.net/projects/tkdiff/)
Expand Down
11 changes: 1 addition & 10 deletions src/DiffEngine.Tests/diffTools.include.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,21 +290,14 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* Example target on left arguments: `diff "targetFile.txt" "tempFile.txt" `
* Example target on right arguments: `diff "tempFile.txt" "targetFile.txt" `
* Scanned paths:
* `%LOCALAPPDATA%\JetBrains\Installations\Rider*\bin\rider64.exe`
* `%ProgramFiles%\JetBrains\JetBrains Rider *\bin\rider64.exe`
* `%ProgramW6432%\JetBrains\JetBrains Rider *\bin\rider64.exe`
* `%ProgramFiles(x86)%\JetBrains\JetBrains Rider *\bin\rider64.exe`
* `%LOCALAPPDATA%\JetBrains\Toolbox\apps\Rider\*\*\bin\rider64.exe`
* `%LOCALAPPDATA%\Programs\Rider\bin\rider64.exe`
* `%PATH%rider64.exe`

#### OSX settings:

* Example target on left arguments: `diff "targetFile.txt" "tempFile.txt" `
* Example target on right arguments: `diff "tempFile.txt" "targetFile.txt" `
* Scanned paths:
* `%HOME%/Library/Application Support/JetBrains/Toolbox/apps/Rider/*/*/Rider EAP.app/Contents/MacOS/rider`
* `%HOME%/Library/Application Support/JetBrains/Toolbox/apps/Rider/*/*/Rider.app/Contents/MacOS/rider`
* `/Applications/Rider EAP.app/Contents/MacOS/rider`
* `/Applications/Rider.app/Contents/MacOS/rider`
* `%PATH%rider`

Expand All @@ -314,8 +307,6 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* Example target on right arguments: `diff "tempFile.txt" "targetFile.txt" `
* Scanned paths:
* `%HOME%/.local/share/JetBrains/Toolbox/apps/Rider/*/*/bin/rider.sh`
* `/opt/jetbrains/rider/bin/rider.sh`
* `/usr/share/rider/bin/rider.sh`
* `%PATH%rider.sh`

### [TkDiff](https://sourceforge.net/projects/tkdiff/)
Expand Down
11 changes: 2 additions & 9 deletions src/DiffEngine/Implementation/Rider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,15 @@ public static Definition Rider()
Windows: new(
"rider64.exe",
launchArguments,
@"%LOCALAPPDATA%\JetBrains\Installations\Rider*\bin\",
@"%ProgramFiles%\JetBrains\JetBrains Rider *\bin\",
@"%LOCALAPPDATA%\JetBrains\Toolbox\apps\Rider\*\*\bin\"),
@"%LOCALAPPDATA%\Programs\Rider\bin\"),
Osx: new(
"rider",
launchArguments,
"%HOME%/Library/Application Support/JetBrains/Toolbox/apps/Rider/*/*/Rider EAP.app/Contents/MacOS/",
"%HOME%/Library/Application Support/JetBrains/Toolbox/apps/Rider/*/*/Rider.app/Contents/MacOS/",
"/Applications/Rider EAP.app/Contents/MacOS/",
"/Applications/Rider.app/Contents/MacOS/"),
Linux: new(
"rider.sh",
launchArguments,
"%HOME%/.local/share/JetBrains/Toolbox/apps/Rider/*/*/bin/",
"/opt/jetbrains/rider/bin/",
"/usr/share/rider/bin/")),
"%HOME%/.local/share/JetBrains/Toolbox/apps/Rider/*/*/bin/")),
Notes: " * https://www.jetbrains.com/help/rider/Command_Line_Differences_Viewer.html");
}
}
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;CS0649</NoWarn>
<Version>12.0.0</Version>
<Version>12.1.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>
Expand Down