From 689645844096bbc02ca3e7c6d5b90131de7b6839 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 13 Aug 2023 12:21:07 +1000 Subject: [PATCH 1/2] Change rider detection to new install locations --- docs/diff-tool.md | 11 +---------- src/DiffEngine.Tests/diffTools.include.md | 11 +---------- src/DiffEngine/Implementation/Rider.cs | 11 ++--------- 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/docs/diff-tool.md b/docs/diff-tool.md index c5cddbd5..2cbd0dbe 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -403,11 +403,7 @@ 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: @@ -415,9 +411,6 @@ 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: - * `%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` @@ -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/) diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index baf2457d..6858155a 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -290,11 +290,7 @@ 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: @@ -302,9 +298,6 @@ 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: - * `%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` @@ -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/) diff --git a/src/DiffEngine/Implementation/Rider.cs b/src/DiffEngine/Implementation/Rider.cs index 15e4651e..1282aa77 100644 --- a/src/DiffEngine/Implementation/Rider.cs +++ b/src/DiffEngine/Implementation/Rider.cs @@ -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"); } } \ No newline at end of file From 8d4b7b6707d07049e8da6d8f8973af3def6fad82 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 13 Aug 2023 12:42:58 +1000 Subject: [PATCH 2/2] Update Directory.Build.props --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 3a48233b..83b49570 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;CS0649 - 12.0.0 + 12.1.0 1.0.0 Testing, Snapshot, Diff, Compare Launches diff tools based on file extensions. Designed to be consumed by snapshot testing libraries.