cleanup

Author: SimonCropp

src/DiffEngine.Tests/InlineApplierUnixTests.cs

@@ -21,14 +21,14 @@ public class InlineApplierUnixTests :
     public async Task A_symlinked_source_is_followed_to_the_file_it_names()
     {
         var real = Path.Combine(directory, "Real.cs");
-        File.WriteAllText(real, source);
+        await File.WriteAllTextAsync(real, source);
         var link = Path.Combine(directory, "Link.cs");
         File.CreateSymbolicLink(link, real);
 
         var result = InlineApplier.Apply(Patch(link));
 
         await Assert.That(result.Status).IsEqualTo(InlineApplyStatus.Applied);
-        await Assert.That(File.ReadAllText(real)).Contains("\"new\"");
+        await Assert.That(await File.ReadAllTextAsync(real)).Contains("\"new\"");
         // Still a link, rather than a regular file holding the patch while the real one holds the
         // snapshot that failed
         await Assert.That(new FileInfo(link).LinkTarget).IsNotNull();
@@ -45,7 +45,7 @@ public async Task A_symlinked_source_is_followed_to_the_file_it_names()
     public async Task The_file_keeps_the_permissions_it_had()
     {
         var path = Path.Combine(directory, "Sample.cs");
-        File.WriteAllText(path, source);
+        await File.WriteAllTextAsync(path, source);
         const UnixFileMode mode = UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute |
                                   UnixFileMode.GroupRead | UnixFileMode.GroupExecute |
                                   UnixFileMode.OtherRead | UnixFileMode.OtherExecute;

src/DiffEngine.Tests/MaxInstanceReplacementTests.cs

@@ -20,14 +20,14 @@ public async Task RelaunchingTheSamePairIsNotANewInstance()
         LimitTo(1);
 
         ProcessCleanup.Refresh();
-        var first = DiffRunner.Launch(temp, target);
+        var first = await DiffRunner.LaunchAsync(temp, target);
         await Assert.That(first).IsEqualTo(LaunchResult.StartedNewInstance);
 
         await WaitForRunning();
         ProcessCleanup.Refresh();
 
         // The slot is spent, but this pair is already open - so this is a replacement
-        var second = DiffRunner.Launch(temp, target);
+        var second = await DiffRunner.LaunchAsync(temp, target);
         await Assert.That(second).IsEqualTo(LaunchResult.StartedNewInstance);
     }
 
@@ -40,10 +40,10 @@ public async Task ADifferentPairStillHitsTheLimit()
         LimitTo(1);
 
         ProcessCleanup.Refresh();
-        await Assert.That(DiffRunner.Launch(temp, target)).IsEqualTo(LaunchResult.StartedNewInstance);
+        await Assert.That(await DiffRunner.LaunchAsync(temp, target)).IsEqualTo(LaunchResult.StartedNewInstance);
 
         ProcessCleanup.Refresh();
-        await Assert.That(DiffRunner.Launch(otherTemp, otherTarget)).IsEqualTo(LaunchResult.TooManyRunningDiffTools);
+        await Assert.That(await DiffRunner.LaunchAsync(otherTemp, otherTarget)).IsEqualTo(LaunchResult.TooManyRunningDiffTools);
     }
 
     /// <summary>

src/DiffEngine.Tests/PendingFilesFallbackTests.cs

@@ -41,7 +41,7 @@ public async Task ADeadPiperFallsThroughToTheQueueOwner()
             DiffEngineTray.IsRunning = true;
             Environment.SetEnvironmentVariable(ViewerClient.PortVariable, server.Port.ToString());
 
-            PendingFiles.AddMove("temp.txt", "target.txt", null, null, false, null);
+            await PendingFiles.AddMoveAsync("temp.txt", "target.txt", null, null, false, null, cancel.Token);
             await PendingFilesAddDelete("gone.txt");
 
             await Assert.That(heard).Contains(_ => _.StartsWith("Move:", StringComparison.Ordinal));

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>20.0.0-beta.30</Version>
+    <Version>20.0.0-beta.31</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>