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

- Fix a NullRef exception that was happening when projects have resx files 

- Print the changed file name in all cases
This commit is contained in:
Victor Hurdugaci 2016-07-15 11:53:45 -07:00
parent c769d8dee9
commit ed91ba0c2f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.DotNet.Watcher.Core/DotNetWatcher.cs
View File

@ -93,6 +93,7 @@ namespace Microsoft.DotNet.Watcher.Core
cancellationToken.ThrowIfCancellationRequested();
string changedFile;
if (finishedTaskIndex == 0)
{
// This is the dotnet task
@ -109,13 +110,17 @@ namespace Microsoft.DotNet.Watcher.Core
_logger.LogInformation("Waiting for a file to change before restarting dotnet...");
// Now wait for a file to change before restarting dotnet
await WaitForProjectFileToChangeAsync(projectFile, cancellationToken);
changedFile = await WaitForProjectFileToChangeAsync(projectFile, cancellationToken);
}
else
{
// This is a file watcher task
string changedFile = fileWatchingTask.Result;
_logger.LogInformation($"File changed: {fileWatchingTask.Result}");
changedFile = fileWatchingTask.Result;
}
if (!string.IsNullOrEmpty(changedFile))
{
_logger.LogInformation($"File changed: {changedFile}");
}
}
}

3
src/Microsoft.DotNet.Watcher.Core/Internal/Implementation/Project.cs
View File

@ -35,7 +35,8 @@ namespace Microsoft.DotNet.Watcher.Core.Internal
}
else
{
filesToWatch.AddRange(runtimeProject.Files.ResourceFiles.Values);
// For resource files the key is the name of the file, not the value
filesToWatch.AddRange(runtimeProject.Files.ResourceFiles.Keys);
}
filesToWatch.AddRange(runtimeProject.Files.SharedFiles);