|
5 | 5 | using System.Collections;
|
6 | 6 | using System.Diagnostics;
|
7 | 7 | using Microsoft.Build.Graph;
|
| 8 | +using Microsoft.Build.Framework; |
8 | 9 | using Microsoft.DotNet.Watcher.Internal;
|
9 | 10 | using Microsoft.Extensions.Tools.Internal;
|
10 | 11 |
|
@@ -52,41 +53,61 @@ public async ValueTask HandleFileChangesAsync(IReadOnlyList<ChangedFile> files,
|
52 | 53 | }
|
53 | 54 | }
|
54 | 55 |
|
55 |
| - var logger = reporter.IsVerbose ? new[] { new Build.Logging.ConsoleLogger() } : null; |
| 56 | + if (!hasApplicableFiles) |
| 57 | + { |
| 58 | + return; |
| 59 | + } |
| 60 | + |
| 61 | + var logger = reporter.IsVerbose ? new[] { new Build.Logging.ConsoleLogger(LoggerVerbosity.Minimal) } : null; |
56 | 62 |
|
57 |
| - var tasks = projectsToRefresh.Select(async projectNode => |
| 63 | + var buildTasks = projectsToRefresh.Select(projectNode => Task.Run(() => |
58 | 64 | {
|
59 |
| - if (!projectNode.ProjectInstance.DeepCopy().Build(BuildTargetName, logger)) |
| 65 | + try |
60 | 66 | {
|
61 |
| - return false; |
| 67 | + if (!projectNode.ProjectInstance.DeepCopy().Build(BuildTargetName, logger)) |
| 68 | + { |
| 69 | + return null; |
| 70 | + } |
62 | 71 | }
|
63 |
| - |
64 |
| - if (browserConnector.TryGetRefreshServer(projectNode, out var browserRefreshServer)) |
| 72 | + catch (Exception e) |
65 | 73 | {
|
66 |
| - await HandleBrowserRefresh(browserRefreshServer, projectNode.ProjectInstance.FullPath, cancellationToken); |
| 74 | + reporter.Error($"[{projectNode.GetDisplayName()}] Target {BuildTargetName} failed to build: {e}"); |
| 75 | + return null; |
67 | 76 | }
|
68 | 77 |
|
69 |
| - return true; |
70 |
| - }); |
| 78 | + return projectNode; |
| 79 | + })); |
71 | 80 |
|
72 |
| - var results = await Task.WhenAll(tasks).WaitAsync(cancellationToken); |
| 81 | + var buildResults = await Task.WhenAll(buildTasks).WaitAsync(cancellationToken); |
73 | 82 |
|
74 |
| - if (hasApplicableFiles) |
| 83 | + var browserRefreshTasks = buildResults.Where(p => p != null)!.GetTransitivelyReferencingProjects().Select(async projectNode => |
75 | 84 | {
|
76 |
| - var successfulCount = results.Sum(r => r ? 1 : 0); |
77 |
| - |
78 |
| - if (successfulCount == results.Length) |
79 |
| - { |
80 |
| - reporter.Output("Hot reload of scoped css succeeded.", emoji: "🔥"); |
81 |
| - } |
82 |
| - else if (successfulCount > 0) |
| 85 | + if (browserConnector.TryGetRefreshServer(projectNode, out var browserRefreshServer)) |
83 | 86 | {
|
84 |
| - reporter.Output($"Hot reload of scoped css partially succeeded: {successfulCount} project(s) out of {results.Length} were updated.", emoji: "🔥"); |
| 87 | + reporter.Verbose($"[{projectNode.GetDisplayName()}] Refreshing browser."); |
| 88 | + await HandleBrowserRefresh(browserRefreshServer, projectNode.ProjectInstance.FullPath, cancellationToken); |
85 | 89 | }
|
86 | 90 | else
|
87 | 91 | {
|
88 |
| - reporter.Output("Hot reload of scoped css failed.", emoji: "🔥"); |
| 92 | + reporter.Verbose($"[{projectNode.GetDisplayName()}] No refresh server."); |
89 | 93 | }
|
| 94 | + }); |
| 95 | + |
| 96 | + await Task.WhenAll(browserRefreshTasks).WaitAsync(cancellationToken); |
| 97 | + |
| 98 | + var successfulCount = buildResults.Sum(r => r != null ? 1 : 0); |
| 99 | + |
| 100 | + if (successfulCount == buildResults.Length) |
| 101 | + { |
| 102 | + reporter.Output("Hot reload of scoped css succeeded.", emoji: "🔥"); |
| 103 | + } |
| 104 | + else if (successfulCount > 0) |
| 105 | + { |
| 106 | + reporter.Output($"Hot reload of scoped css partially succeeded: {successfulCount} project(s) out of {buildResults.Length} were updated.", emoji: "🔥"); |
| 107 | + } |
| 108 | + else |
| 109 | + { |
| 110 | + reporter.Output("Hot reload of scoped css failed.", emoji: "🔥"); |
90 | 111 | }
|
91 | 112 | }
|
92 | 113 |
|
|
0 commit comments