cleanup

src/DiffEngineTray.Tests/AsyncTimerTests.cs

@@ -9,7 +9,7 @@ public async Task It_calls_error_callback()
     {
         var errorCallbackInvoked = new TaskCompletionSource<bool>();
 
-        AsyncTimer timer = new(
+        var timer = new AsyncTimer(
             callback: (_, _) => throw new("Simulated!"),
             interval: TimeSpan.Zero,
             errorCallback: _ => { errorCallbackInvoked.SetResult(true); });
@@ -24,7 +24,7 @@ public async Task It_continues_to_run_after_an_error()
 
         var fail = true;
         var exceptionThrown = false;
-        AsyncTimer timer = new(
+        var timer = new AsyncTimer(
             callback: (_, _) =>
             {
                 if (fail)
@@ -48,7 +48,7 @@ public async Task Stop_cancels_token_while_waiting()
     {
         var waitCanceled = false;
         var delayStarted = new TaskCompletionSource<bool>();
-        AsyncTimer timer = new(
+        var timer = new AsyncTimer(
             callback: (_, _) => throw new("Simulated!"),
             interval: TimeSpan.FromDays(7),
             delayStrategy: async (delayTime, token) =>
@@ -76,7 +76,7 @@ public async Task Stop_cancels_token_while_in_callback()
         var callbackCanceled = false;
         var callbackStarted = new TaskCompletionSource<bool>();
         var stopInitiated = new TaskCompletionSource<bool>();
-        AsyncTimer timer = new(
+        var timer = new AsyncTimer(
             callback: async (_, token) =>
             {
                 callbackStarted.SetResult(true);
@@ -100,7 +100,7 @@ public async Task Stop_waits_for_callback_to_complete()
     {
         var callbackCompleted = new TaskCompletionSource<bool>();
         var callbackTaskStarted = new TaskCompletionSource<bool>();
-        AsyncTimer timer = new(
+        var timer = new  AsyncTimer(
             callback: (_, _) =>
             {
                 callbackTaskStarted.SetResult(true);

src/DiffEngineTray.Tests/OptionsFormTests.cs

@@ -35,7 +35,7 @@ public OptionsFormTests(ITestOutputHelper output) :
     [Fact]
     public async Task WithKeys()
     {
-        using OptionsForm form = new(
+        using var form = new OptionsForm(
             new()
             {
                 AcceptAllHotKey = new()
@@ -51,7 +51,7 @@ public async Task WithKeys()
     [Fact]
     public async Task Default()
     {
-        using OptionsForm form = new(
+        using var form = new OptionsForm(
             new(),
             _ => Task.FromResult<IReadOnlyList<string>>(new List<string>()));
         await Verifier.Verify(form);

src/DiffEngineTray/PiperClient.cs

@@ -59,7 +59,7 @@ public static Task SendMoveAsync(
 
     static string BuildMovePayload(string tempFile, string targetFile, string? exe, string? arguments, bool canKill, int? processId)
     {
-        StringBuilder builder = new($@"{{
+        var builder = new StringBuilder($@"{{
 ""Type"":""Move"",
 ""Temp"":""{tempFile.JsonEscape()}"",
 ""Target"":""{targetFile.JsonEscape()}"",
@@ -126,7 +126,7 @@ static void InnerSend(string payload)
         {
             client.Connect(endpoint);
             using var stream = client.GetStream();
-            using StreamWriter writer = new(stream);
+            using var writer = new StreamWriter(stream);
             writer.Write(payload);
         }
         finally
@@ -144,10 +144,10 @@ static async Task InnerSendAsync(string payload)
             await client.ConnectAsync(endpoint.Address, endpoint.Port);
 #if NETCOREAPP || netstandard21
             await using var stream = client.GetStream();
-            await using StreamWriter writer = new(stream);
+            await using var writer = new StreamWriter(stream);
 #else
             using var stream = client.GetStream();
-            using StreamWriter writer = new(stream);
+            using var writer = new StreamWriter(stream);
 #endif
             await writer.WriteAsync(payload);
         }

src/DiffEngineTray/Settings/OptionsFormLauncher.cs

@@ -8,7 +8,7 @@ static class OptionsFormLauncher
     public static async Task Launch(KeyRegister keyRegister, Tracker tracker)
     {
         var settings = await SettingsHelper.Read();
-        using OptionsForm form = new(settings, async newSettings => await Save(keyRegister, tracker, newSettings));
+        using var form = new OptionsForm(settings, async newSettings => await Save(keyRegister, tracker, newSettings));
         form.ShowDialog();
     }
 

src/DiffEngineTray/Updater.cs

@@ -9,7 +9,7 @@ public static void Run()
     {
         var psCommandBytes = Encoding.Unicode.GetBytes("dotnet tool update diffenginetray --global; diffenginetray");
         var psCommandBase64 = Convert.ToBase64String(psCommandBytes);
-        ProcessStartInfo info = new(
+        var info = new ProcessStartInfo(
             "powershell.exe",
             $"-NoProfile -ExecutionPolicy unrestricted -EncodedCommand {psCommandBase64}")
         {