Merge in 'release/7.0.1xx' changes

This commit is contained in:
dotnet-bot 2022-10-31 14:21:14 +00:00
commit 7fdf4794ae
2 changed files with 2 additions and 2 deletions

View file

@ -24,7 +24,7 @@ public class DotNetWatchTests : SmokeTests
workingDirectory: projectDirectory,
additionalProcessConfigCallback: processConfigCallback,
expectedExitCode: null, // The exit code does not reflect whether or not dotnet watch is working properly
millisecondTimeout: 30000);
millisecondTimeout: 60000);
Assert.True(outputChanged);

View file

@ -70,7 +70,7 @@ internal static class ExecuteHelper
if (!process.HasExited)
{
outputHelper.WriteLine($"Killing: {fileName} {args}");
outputHelper.WriteLine($"Process did not exit. Killing {fileName} {args} after waiting {millisecondTimeout} milliseconds.");
process.Kill(true);
process.WaitForExit();
}