Change rider detection to new install locations (#377)

* Change rider detection to new install locations

* Update Directory.Build.props

Author: SimonCropp

docs/diff-tool.md

@@ -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`
 
@@ -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/)

src/DiffEngine.Tests/diffTools.include.md

@@ -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`
 
@@ -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/)

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");
     }
 }

src/Directory.Build.props

@@ -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>