diff --git a/src/DiffEngine.Tests/WindowsProcessTests.cs b/src/DiffEngine.Tests/WindowsProcessTests.cs index 59b3f279..87659e0b 100644 --- a/src/DiffEngine.Tests/WindowsProcessTests.cs +++ b/src/DiffEngine.Tests/WindowsProcessTests.cs @@ -68,7 +68,7 @@ public async Task TryTerminateProcess_WithWindowedProcess_GracefullyCloses() Arguments = "--windowed", UseShellExecute = false, CreateNoWindow = true - }); + })!; await Assert.That(process).IsNotNull(); diff --git a/src/DiffEngineTray.Tests/LockedFilesFormTests.Default.verified.png b/src/DiffEngineTray.Tests/LockedFilesFormTests.Default.verified.png index 15aaa41c..f72f052d 100644 Binary files a/src/DiffEngineTray.Tests/LockedFilesFormTests.Default.verified.png and b/src/DiffEngineTray.Tests/LockedFilesFormTests.Default.verified.png differ diff --git a/src/DiffEngineTray.Tests/OptionsFormTests.Default.verified.png b/src/DiffEngineTray.Tests/OptionsFormTests.Default.verified.png index fcc67c35..02a359a6 100644 Binary files a/src/DiffEngineTray.Tests/OptionsFormTests.Default.verified.png and b/src/DiffEngineTray.Tests/OptionsFormTests.Default.verified.png differ diff --git a/src/DiffEngineTray.Tests/OptionsFormTests.WithKeys.verified.png b/src/DiffEngineTray.Tests/OptionsFormTests.WithKeys.verified.png index 605f5968..d04e7995 100644 Binary files a/src/DiffEngineTray.Tests/OptionsFormTests.WithKeys.verified.png and b/src/DiffEngineTray.Tests/OptionsFormTests.WithKeys.verified.png differ diff --git a/src/DiffEngineTray.Tests/PiperTest.SendOnly.verified.txt b/src/DiffEngineTray.Tests/PiperTest.SendOnly.verified.txt index 9afd9c8e..23ac00b0 100644 --- a/src/DiffEngineTray.Tests/PiperTest.SendOnly.verified.txt +++ b/src/DiffEngineTray.Tests/PiperTest.SendOnly.verified.txt @@ -1,5 +1,5 @@ -[ -Failed to send payload to DiffEngineTray. +[ + Failed to send payload to DiffEngineTray. Payload: { @@ -16,9 +16,8 @@ System.Net.Sockets.SocketException (10061): No connection could be made because at System.Net.Sockets.Socket.AwaitableSocketAsyncEventArgs.System.Threading.Tasks.Sources.IValueTaskSource.GetResult(Int16 token) at System.Threading.Tasks.ValueTask.ValueTaskSourceAsTask.<>c.<.cctor>b__4_0(Object state) --- End of stack trace from previous location --- - at System.Net.Sockets.TcpClient.CompleteConnectAsync(Task task) - -Failed to send payload to DiffEngineTray. + at System.Net.Sockets.TcpClient.CompleteConnectAsync(Task task), + Failed to send payload to DiffEngineTray. Payload: { diff --git a/src/DiffEngineTray/Settings/OptionsForm.Designer.cs b/src/DiffEngineTray/Settings/OptionsForm.Designer.cs index f84b425e..f4e13760 100644 --- a/src/DiffEngineTray/Settings/OptionsForm.Designer.cs +++ b/src/DiffEngineTray/Settings/OptionsForm.Designer.cs @@ -235,8 +235,7 @@ void InitializeComponent() this.alwaysKillCheckBox.Padding = new System.Windows.Forms.Padding(5, 4, 5, 4); this.alwaysKillCheckBox.Size = new System.Drawing.Size(520, 27); this.alwaysKillCheckBox.TabIndex = 10; - this.alwaysKillCheckBox.Text = "Always kill processes locking files when accepting. When disabled, a prompt is s" + - "hown"; + this.alwaysKillCheckBox.Text = "Kill processes locking files when accepting."; this.alwaysKillCheckBox.UseVisualStyleBackColor = true; // // maxInstancesGroupBox