From e4194b70fa87f780047970abf364454180237f6a Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Thu, 13 May 2021 09:51:20 +1000 Subject: [PATCH 1/2] add missing rider path --- docs/diff-tool.custom.md | 6 +++--- docs/diff-tool.md | 3 ++- docs/diff-tool.order.md | 2 +- src/DiffEngine.Tests/diffTools.include.md | 1 + src/DiffEngine/Implementation/Rider.cs | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/diff-tool.custom.md b/docs/diff-tool.custom.md index acbf42c6..b2a5f108 100644 --- a/docs/diff-tool.custom.md +++ b/docs/diff-tool.custom.md @@ -22,7 +22,7 @@ var resolvedTool = DiffTools.AddTool( exePath: diffToolPath, binaryExtensions: new[] {"jpg"})!; ``` -snippet source | anchor +snippet source | anchor Add a tool based on existing resolved tool: @@ -35,7 +35,7 @@ var resolvedTool = DiffTools.AddToolBasedOn( name: "MyCustomDiffTool", arguments: (temp, target) => $"\"custom args {temp}\" \"{target}\""); ``` -snippet source | anchor +snippet source | anchor @@ -63,7 +63,7 @@ var resolvedTool = DiffTools.AddToolBasedOn( await DiffRunner.LaunchAsync(resolvedTool!, "PathToTempFile", "PathToTargetFile"); ``` -snippet source | anchor +snippet source | anchor diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 460729c3..41de7178 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -61,7 +61,7 @@ Setting the `DiffEngine_MaxInstances` environment variable to the number of inst ```cs DiffRunner.MaxInstancesToLaunch(10); ``` -snippet source | anchor +snippet source | anchor @@ -421,6 +421,7 @@ ReSharper | Options | Tools | Unit Testing | Test Runner * Example arguments: `diff "tempFile" "targetFile"` * 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` diff --git a/docs/diff-tool.order.md b/docs/diff-tool.order.md index 85af01ff..5ed7c7b0 100644 --- a/docs/diff-tool.order.md +++ b/docs/diff-tool.order.md @@ -52,5 +52,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o ```cs DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge); ``` -snippet source | anchor +snippet source | anchor diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index fa09f764..2785e992 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -321,6 +321,7 @@ * Example arguments: `diff "tempFile" "targetFile"` * 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` diff --git a/src/DiffEngine/Implementation/Rider.cs b/src/DiffEngine/Implementation/Rider.cs index 9ddf3630..4a9f8f38 100644 --- a/src/DiffEngine/Implementation/Rider.cs +++ b/src/DiffEngine/Implementation/Rider.cs @@ -18,6 +18,7 @@ static string Arguments(string temp, string target) => binaryExtensions: Array.Empty(), windows: new( Arguments, + @"%LOCALAPPDATA%\JetBrains\Installations\Rider*\bin\rider64.exe", @"%ProgramFiles%\JetBrains\JetBrains Rider *\bin\rider64.exe", @"%JetBrains Rider%\rider64.exe", @"%LOCALAPPDATA%\JetBrains\Toolbox\apps\Rider\*\*\bin\rider64.exe"), From 1372c4448e6b79d7e8274b8f89b3fcdca058b9fa Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 12 May 2021 23:52:10 +0000 Subject: [PATCH 2/2] Docs changes --- docs/diff-tool.custom.md | 6 +++--- docs/diff-tool.md | 2 +- docs/diff-tool.order.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/diff-tool.custom.md b/docs/diff-tool.custom.md index b2a5f108..acbf42c6 100644 --- a/docs/diff-tool.custom.md +++ b/docs/diff-tool.custom.md @@ -22,7 +22,7 @@ var resolvedTool = DiffTools.AddTool( exePath: diffToolPath, binaryExtensions: new[] {"jpg"})!; ``` -snippet source | anchor +snippet source | anchor Add a tool based on existing resolved tool: @@ -35,7 +35,7 @@ var resolvedTool = DiffTools.AddToolBasedOn( name: "MyCustomDiffTool", arguments: (temp, target) => $"\"custom args {temp}\" \"{target}\""); ``` -snippet source | anchor +snippet source | anchor @@ -63,7 +63,7 @@ var resolvedTool = DiffTools.AddToolBasedOn( await DiffRunner.LaunchAsync(resolvedTool!, "PathToTempFile", "PathToTargetFile"); ``` -snippet source | anchor +snippet source | anchor diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 41de7178..44220287 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -61,7 +61,7 @@ Setting the `DiffEngine_MaxInstances` environment variable to the number of inst ```cs DiffRunner.MaxInstancesToLaunch(10); ``` -snippet source | anchor +snippet source | anchor diff --git a/docs/diff-tool.order.md b/docs/diff-tool.order.md index 5ed7c7b0..85af01ff 100644 --- a/docs/diff-tool.order.md +++ b/docs/diff-tool.order.md @@ -52,5 +52,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o ```cs DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge); ``` -snippet source | anchor +snippet source | anchor