huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-04-02 10:35:48 -07:00
parent 12642be5f6 6d4a632b96
commit 5bec83c5c9
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dotnet-watch/Internal/ProcessRunner.cs
View File

@ -105,9 +105,23 @@ namespace Microsoft.DotNet.Watcher.Internal
{ {
_process = process; _process = process;
_process.Exited += OnExited; _process.Exited += OnExited;
Task = _tcs.Task.ContinueWith(_ =>
{
// We need to use two WaitForExit calls to ensure that all of the output/events are processed. Previously
// this code used Process.Exited, which could result in us missing some output due to the ordering of
// events.
//
// See the remarks here: https://docs.microsoft.com/en-us/dotnet/api/system.diagnostics.process.waitforexit#System_Diagnostics_Process_WaitForExit_System_Int32_
if (!process.WaitForExit(Int32.MaxValue))
{
throw new TimeoutException();
}
process.WaitForExit();
});
} }
public Task Task => _tcs.Task; public Task Task { get; }
public void TryKill() public void TryKill()
{ {

2
test/dotnet-watch.FunctionalTests/AwaitableProcess.cs
View File

@ -116,6 +116,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
private void OnExit(object sender, EventArgs args) private void OnExit(object sender, EventArgs args)
{ {
// Wait to ensure the process has exited and all output consumed
_process.WaitForExit();
_source.Complete(); _source.Complete();
} }

8
test/dotnet-watch.FunctionalTests/Scenario/WatchableApp.cs
View File

@ -18,6 +18,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
private const string StartedMessage = "Started"; private const string StartedMessage = "Started";
private const string ExitingMessage = "Exiting"; private const string ExitingMessage = "Exiting";
private const string WatchExitedMessage = "watch : Exited";
private readonly ITestOutputHelper _logger; private readonly ITestOutputHelper _logger;
private string _appName; private string _appName;
@ -42,8 +43,11 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
public Task HasRestarted() public Task HasRestarted()
=> Process.GetOutputLineAsync(StartedMessage, DefaultMessageTimeOut); => Process.GetOutputLineAsync(StartedMessage, DefaultMessageTimeOut);
public Task HasExited() public async Task HasExited()
=> Process.GetOutputLineAsync(ExitingMessage, DefaultMessageTimeOut); {
await Process.GetOutputLineAsync(ExitingMessage, DefaultMessageTimeOut);
await Process.GetOutputLineAsync(WatchExitedMessage, DefaultMessageTimeOut);
}
public bool UsePollingWatcher { get; set; } public bool UsePollingWatcher { get; set; }