Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions docs/diff-tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* Is MDI: True
* Supports auto-refresh: True
* Supports text files: True
* Use shell execute: True
* Use shell execute: False
* Environment variable for custom install location: `DiffEngine_VisualStudioCode`
* Supported binaries: .svg

Expand All @@ -793,11 +793,11 @@ 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%\Programs\Microsoft VS Code\code.exe`
* `%ProgramFiles%\Microsoft VS Code\code.exe`
* `%ProgramW6432%\Microsoft VS Code\code.exe`
* `%ProgramFiles(x86)%\Microsoft VS Code\code.exe`
* `%PATH%code.exe`
* `%LocalAppData%\Programs\Microsoft VS Code\bin\code.cmd`
* `%ProgramFiles%\Microsoft VS Code\bin\code.cmd`
* `%ProgramW6432%\Microsoft VS Code\bin\code.cmd`
* `%ProgramFiles(x86)%\Microsoft VS Code\bin\code.cmd`
* `%PATH%code.cmd`

#### OSX settings:

Expand Down
2 changes: 1 addition & 1 deletion docs/diff-tool.order.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ For example `VisualStudio,Meld` will result in VisualStudio then Meld then all o
```cs
DiffTools.UseOrder(DiffTool.VisualStudio, DiffTool.AraxisMerge);
```
<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L177-L181' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L183-L187' title='Snippet source file'>snippet source</a> | <a href='#snippet-UseOrder' title='Start of snippet'>anchor</a></sup>
<!-- endSnippet -->
8 changes: 7 additions & 1 deletion src/DiffEngine.Tests/DiffToolsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,14 @@ static async Task AddToolAndLaunch()

#endregion
}

/**

[Fact]
public Task LaunchSpecificTextDiff() =>
DiffRunner.LaunchAsync(DiffTool.VisualStudioCode,
Path.Combine(SourceDirectory, "input.temp.txt"),
Path.Combine(SourceDirectory, "input.target.txt"));

[Fact]
public Task LaunchSpecificImageDiff() =>
DiffRunner.LaunchAsync(DiffTool.P4Merge,
Expand Down
12 changes: 6 additions & 6 deletions src/DiffEngine.Tests/diffTools.include.md
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a
* Is MDI: True
* Supports auto-refresh: True
* Supports text files: True
* Use shell execute: True
* Use shell execute: False
* Environment variable for custom install location: `DiffEngine_VisualStudioCode`
* Supported binaries: .svg

Expand All @@ -658,11 +658,11 @@ 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%\Programs\Microsoft VS Code\code.exe`
* `%ProgramFiles%\Microsoft VS Code\code.exe`
* `%ProgramW6432%\Microsoft VS Code\code.exe`
* `%ProgramFiles(x86)%\Microsoft VS Code\code.exe`
* `%PATH%code.exe`
* `%LocalAppData%\Programs\Microsoft VS Code\bin\code.cmd`
* `%ProgramFiles%\Microsoft VS Code\bin\code.cmd`
* `%ProgramW6432%\Microsoft VS Code\bin\code.cmd`
* `%ProgramFiles(x86)%\Microsoft VS Code\bin\code.cmd`
* `%PATH%code.cmd`

#### OSX settings:

Expand Down
8 changes: 4 additions & 4 deletions src/DiffEngine/Implementation/VsCode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ public static Definition VisualStudioCode()
AutoRefresh: true,
IsMdi: true,
SupportsText: true,
UseShellExecute: true,
UseShellExecute: false,
RequiresTarget: true,
Cost: "Free",
BinaryExtensions: [".svg"],
OsSupport: new(
Windows: new(
"code.exe",
"code.cmd",
launchArguments,
@"%LocalAppData%\Programs\Microsoft VS Code\",
@"%ProgramFiles%\Microsoft VS Code\"),
@"%LocalAppData%\Programs\Microsoft VS Code\bin\",
@"%ProgramFiles%\Microsoft VS Code\bin\"),
Linux: new(
"code",
launchArguments),
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>15.11.0</Version>
<Version>15.11.1</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