Diff util (#57)

Author: SimonCropp

Diff for: docs/diff-tool.custom.md

@@ -23,7 +23,7 @@ var resolvedTool = DiffTools.AddTool(
     exePath: diffToolPath,
     binaryExtensions: new[] {"jpg"})!;
 ```
-<sup><a href='/src/Tests/DiffToolsTest.cs#L23-L34' title='File snippet `addtool` was extracted from'>snippet source</a> | <a href='#snippet-addtool' title='Navigate to start of snippet `addtool`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L24-L35' title='File snippet `addtool` was extracted from'>snippet source</a> | <a href='#snippet-addtool' title='Navigate to start of snippet `addtool`'>anchor</a></sup>
 <!-- endSnippet -->
 
 Add a tool based on existing resolved tool:
@@ -36,7 +36,7 @@ var resolvedTool = DiffTools.AddToolBasedOn(
     name: "MyCustomDiffTool",
     arguments: (temp, target) => $"\"custom args {temp}\" \"{target}\"");
 ```
-<sup><a href='/src/Tests/DiffToolsTest.cs#L64-L69' title='File snippet `addtoolbasedon` was extracted from'>snippet source</a> | <a href='#snippet-addtoolbasedon' title='Navigate to start of snippet `addtoolbasedon`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L65-L70' title='File snippet `addtoolbasedon` was extracted from'>snippet source</a> | <a href='#snippet-addtoolbasedon' title='Navigate to start of snippet `addtoolbasedon`'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -47,9 +47,9 @@ New tools are added to the top of the order, the last tool added will resolve be
 <!-- snippet: DiffRunnerLaunch -->
 <a id='snippet-diffrunnerlaunch'></a>
 ```cs
-DiffRunner.Launch(tempFile, targetFile);
+await DiffRunner.Launch(tempFile, targetFile);
 ```
-<sup><a href='/src/Tests/DiffRunnerTests.cs#L46-L50' title='File snippet `diffrunnerlaunch` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerlaunch' title='Navigate to start of snippet `diffrunnerlaunch`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L46-L50' title='File snippet `diffrunnerlaunch` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerlaunch' title='Navigate to start of snippet `diffrunnerlaunch`'>anchor</a></sup>
 <!-- endSnippet -->
 
 Alternatively the instance  returned from `AddTool*` can be used to explicitly launch that tool.
@@ -62,9 +62,9 @@ var resolvedTool = DiffTools.AddToolBasedOn(
     name: "MyCustomDiffTool",
     arguments: (temp, target) => $"\"custom args {temp}\" \"{target}\"");
 
-DiffRunner.Launch(resolvedTool!, "PathToTempFile", "PathToTargetFile");
+await DiffRunner.Launch(resolvedTool!, "PathToTempFile", "PathToTargetFile");
 ```
-<sup><a href='/src/Tests/DiffToolsTest.cs#L78-L85' title='File snippet `addtoolandlaunch` was extracted from'>snippet source</a> | <a href='#snippet-addtoolandlaunch' title='Navigate to start of snippet `addtoolandlaunch`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L79-L86' title='File snippet `addtoolandlaunch` was extracted from'>snippet source</a> | <a href='#snippet-addtoolandlaunch' title='Navigate to start of snippet `addtoolandlaunch`'>anchor</a></sup>
 <!-- endSnippet -->
 
 

Diff for: docs/diff-tool.md

@@ -61,7 +61,7 @@ Setting the `DiffEngine.MaxInstances` environment variable to the number of inst
 ```cs
 DiffRunner.MaxInstancesToLaunch(10);
 ```
-<sup><a href='/src/Tests/DiffToolsTest.cs#L12-L16' title='File snippet `maxinstancestolaunch` was extracted from'>snippet source</a> | <a href='#snippet-maxinstancestolaunch' title='Navigate to start of snippet `maxinstancestolaunch`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L13-L17' title='File snippet `maxinstancestolaunch` was extracted from'>snippet source</a> | <a href='#snippet-maxinstancestolaunch' title='Navigate to start of snippet `maxinstancestolaunch`'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -98,7 +98,7 @@ ReSharper | Options | Tools | Unit Testing | Test Runner
 
 ## Supported Tools:
 
- <!-- include: diffTools. path: /src/Tests/diffTools.include.md -->
+ <!-- include: diffTools. path: /src/DiffEngine.Tests/diffTools.include.md -->
 ## [AraxisMerge](https://www.araxis.com/merge)
 
   * Is MDI: True

Diff for: docs/diff-tool.order.md

@@ -10,7 +10,7 @@ To change this file edit the source file and then run MarkdownSnippets.
 
 ## Default
 
- * [BeyondCompare](/docs/diff-tool.md#beyondcompare) <!-- include: defaultOrder. path: /src/Tests/defaultOrder.include.md -->
+ * [BeyondCompare](/docs/diff-tool.md#beyondcompare) <!-- include: defaultOrder. path: /src/DiffEngine.Tests/defaultOrder.include.md -->
  * [P4Merge](/docs/diff-tool.md#p4merge)
  * [AraxisMerge](/docs/diff-tool.md#araxismerge)
  * [Meld](/docs/diff-tool.md#meld)
@@ -52,5 +52,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/Tests/DiffToolsTest.cs#L115-L117' title='File snippet `useorder` was extracted from'>snippet source</a> | <a href='#snippet-useorder' title='Navigate to start of snippet `useorder`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffToolsTest.cs#L116-L118' title='File snippet `useorder` was extracted from'>snippet source</a> | <a href='#snippet-useorder' title='Navigate to start of snippet `useorder`'>anchor</a></sup>
 <!-- endSnippet -->

Diff for: readme.md

@@ -46,7 +46,7 @@ Part of the <a href='https://dotnetfoundation.org' alt=''>.NET Foundation</a>
 
 ## [Supported Tools](/docs/diff-tool.md#supported-tools)
 
- * [AraxisMerge](/docs/diff-tool.md#araxismerge) <!-- include: diffToolList. path: /src/Tests/diffToolList.include.md -->
+ * [AraxisMerge](/docs/diff-tool.md#araxismerge) <!-- include: diffToolList. path: /src/DiffEngine.Tests/diffToolList.include.md -->
  * [BeyondCompare](/docs/diff-tool.md#beyondcompare)
  * [CodeCompare](/docs/diff-tool.md#codecompare)
  * [DeltaWalker](/docs/diff-tool.md#deltawalker)
@@ -78,9 +78,9 @@ A tool can be launched using the following:
 <!-- snippet: DiffRunnerLaunch -->
 <a id='snippet-diffrunnerlaunch'></a>
 ```cs
-DiffRunner.Launch(tempFile, targetFile);
+await DiffRunner.Launch(tempFile, targetFile);
 ```
-<sup><a href='/src/Tests/DiffRunnerTests.cs#L46-L50' title='File snippet `diffrunnerlaunch` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerlaunch' title='Navigate to start of snippet `diffrunnerlaunch`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L46-L50' title='File snippet `diffrunnerlaunch` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerlaunch' title='Navigate to start of snippet `diffrunnerlaunch`'>anchor</a></sup>
 <!-- endSnippet -->
 
 Note that this method will respect the above [difference behavior](/docs/diff-tool.md#detected-difference-behavior) in terms of Auto refresh and MDI behaviors.
@@ -95,7 +95,7 @@ A tool can be closed using the following:
 ```cs
 DiffRunner.Kill(file1, file2);
 ```
-<sup><a href='/src/Tests/DiffRunnerTests.cs#L58-L60' title='File snippet `diffrunnerkill` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerkill' title='Navigate to start of snippet `diffrunnerkill`'>anchor</a></sup>
+<sup><a href='/src/DiffEngine.Tests/DiffRunnerTests.cs#L58-L60' title='File snippet `diffrunnerkill` was extracted from'>snippet source</a> | <a href='#snippet-diffrunnerkill' title='Navigate to start of snippet `diffrunnerkill`'>anchor</a></sup>
 <!-- endSnippet -->
 
 Note that this method will respect the above [difference behavior](/docs/diff-tool.md#detected-difference-behavior) in terms of MDI behavior.

Diff for: src/Tests/AssemblyLocation.cs renamed to src/DiffEngine.Tests/AssemblyLocation.cs

@@ -0,0 +1,18 @@
+using DiffEngine;
+using Xunit;
+using Xunit.Abstractions;
+
+public class DiffEngineTrayTest :
+    XunitContextBase
+{
+    [Fact]
+    public void IsRunning()
+    {
+        Assert.False(DiffEngineTray.IsRunning);
+    }
+
+    public DiffEngineTrayTest(ITestOutputHelper output) :
+        base(output)
+    {
+    }
+}

Diff for: src/Tests/DefinitionsTest.cs renamed to src/DiffEngine.Tests/DefinitionsTest.cs

@@ -22,11 +22,11 @@ public async Task MaxInstancesToLaunch()
         {
             await Task.Delay(500);
             ProcessCleanup.Refresh();
-            var result = DiffRunner.Launch(file1, "fake.txt");
+            var result = await DiffRunner.Launch(file1, "fake.txt");
             await Task.Delay(300);
             Assert.Equal(LaunchResult.StartedNewInstance, result);
             ProcessCleanup.Refresh();
-            result = DiffRunner.Launch(file2, "fake.txt");
+            result = await DiffRunner.Launch(file2, "fake.txt");
             Assert.Equal(LaunchResult.TooManyRunningDiffTools, result);
             ProcessCleanup.Refresh();
             DiffRunner.Kill(file1, "fake.txt");
@@ -38,37 +38,37 @@ public async Task MaxInstancesToLaunch()
         }
     }
 
-    void Launch()
+    async Task Launch()
     {
         string targetFile = "";
         string tempFile = "";
 
         #region DiffRunnerLaunch
 
-        DiffRunner.Launch(tempFile, targetFile);
+        await DiffRunner.Launch(tempFile, targetFile);
 
         #endregion
     }
 
     [Fact(Skip = "Explicit")]
-    public void Kill()
+    public async Task Kill()
     {
-        DiffRunner.Launch(file1, file2);
+        await DiffRunner.Launch(file1, file2);
         ProcessCleanup.Refresh();
         #region DiffRunnerKill
         DiffRunner.Kill(file1, file2);
         #endregion
     }
 
     [Fact]
-    public void LaunchAndKillDisabled()
+    public async Task LaunchAndKillDisabled()
     {
         DiffRunner.Disabled = true;
         try
         {
             Assert.False(IsRunning());
             Assert.False(ProcessCleanup.IsRunning(command));
-            var result = DiffRunner.Launch(file1, file2);
+            var result = await DiffRunner.Launch(file1, file2);
             Assert.Equal(LaunchResult.Disabled, result);
             Thread.Sleep(500);
             ProcessCleanup.Refresh();
@@ -87,11 +87,11 @@ public void LaunchAndKillDisabled()
     }
 
     [Fact]
-    public void LaunchAndKill()
+    public async Task LaunchAndKill()
     {
         Assert.False(IsRunning());
         Assert.False(ProcessCleanup.IsRunning(command));
-        var result = DiffRunner.Launch(file1, file2);
+        var result = await DiffRunner.Launch(file1, file2);
         Assert.Equal(LaunchResult.StartedNewInstance, result);
         Thread.Sleep(500);
         ProcessCleanup.Refresh();

Diff for: src/Tests/Tests.csproj renamed to src/DiffEngine.Tests/DiffEngine.Tests.csproj

@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Threading.Tasks;
 using DiffEngine;
 using Xunit;
 using Xunit.Abstractions;
@@ -73,35 +74,35 @@ public void AddToolBasedOn()
         Assert.Equal("\"custom args foo\" \"bar\"", resolvedTool!.Arguments("foo", "bar"));
     }
 #endif
-    void AddToolAndLaunch()
+    async Task AddToolAndLaunch()
     {
         #region AddToolAndLaunch
         var resolvedTool = DiffTools.AddToolBasedOn(
             DiffTool.VisualStudio,
             name: "MyCustomDiffTool",
             arguments: (temp, target) => $"\"custom args {temp}\" \"{target}\"");
 
-        DiffRunner.Launch(resolvedTool!, "PathToTempFile", "PathToTargetFile");
+        await DiffRunner.Launch(resolvedTool!, "PathToTempFile", "PathToTargetFile");
         #endregion
     }
 
     //[Fact]
-    //public void LaunchImageDiff()
+    //public Task LaunchImageDiff()
     //{
     //    foreach (var tool in DiffTools.Resolved)
     //    {
-    //        DiffRunner.Launch(tool,
+    //        await DiffRunner.Launch(tool,
     //            Path.Combine(SourceDirectory, "input.file1.png"),
     //            Path.Combine(SourceDirectory, "input.file2.png"));
     //    }
     //}
 
     //[Fact]
-    //public void LaunchTextDiff()
+    //public Task LaunchTextDiff()
     //{
     //    foreach (var tool in DiffTools.Resolved)
     //    {
-    //        DiffRunner.Launch(tool,
+    //        await DiffRunner.Launch(tool,
     //            Path.Combine(SourceDirectory, "input.file1.txt"),
     //            Path.Combine(SourceDirectory, "input.file2.txt"));
     //    }

Diff for: src/DiffEngine.Tests/DiffEngineTrayTest.cs

@@ -16,10 +16,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeDiffTool", "FakeDiffToo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiffEngine", "DiffEngine\DiffEngine.csproj", "{F494B6C2-29B4-4D73-8533-AF197D882970}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{58DF5836-41EC-450B-9AAA-AFA4B79169EA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2B054DB2-42A0-4F3E-87CC-30D6E926D0D9} = {2B054DB2-42A0-4F3E-87CC-30D6E926D0D9}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiffEngineTray", "DiffEngineTray\DiffEngineTray.csproj", "{E3C93E88-603E-4AA3-8AAF-0B5F7497012C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiffEngine.Tests", "DiffEngine.Tests\DiffEngine.Tests.csproj", "{A7B838DE-86BF-4C57-8563-7295D583C93A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiffEngineTray.Tests", "DiffEngineTray.Tests\DiffEngineTray.Tests.csproj", "{E339AB28-21B2-47DB-B995-EB2C4CE8BA99}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +36,18 @@ Global
 		{F494B6C2-29B4-4D73-8533-AF197D882970}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F494B6C2-29B4-4D73-8533-AF197D882970}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F494B6C2-29B4-4D73-8533-AF197D882970}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58DF5836-41EC-450B-9AAA-AFA4B79169EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58DF5836-41EC-450B-9AAA-AFA4B79169EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58DF5836-41EC-450B-9AAA-AFA4B79169EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58DF5836-41EC-450B-9AAA-AFA4B79169EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3C93E88-603E-4AA3-8AAF-0B5F7497012C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3C93E88-603E-4AA3-8AAF-0B5F7497012C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3C93E88-603E-4AA3-8AAF-0B5F7497012C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3C93E88-603E-4AA3-8AAF-0B5F7497012C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7B838DE-86BF-4C57-8563-7295D583C93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7B838DE-86BF-4C57-8563-7295D583C93A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7B838DE-86BF-4C57-8563-7295D583C93A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7B838DE-86BF-4C57-8563-7295D583C93A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E339AB28-21B2-47DB-B995-EB2C4CE8BA99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E339AB28-21B2-47DB-B995-EB2C4CE8BA99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E339AB28-21B2-47DB-B995-EB2C4CE8BA99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E339AB28-21B2-47DB-B995-EB2C4CE8BA99}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE