Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0818ef4
ProofOfConcept
Forgind May 18, 2023
3798ad9
Add CommandLine switch
Forgind May 22, 2023
9c6392b
Implement the rest
Forgind May 22, 2023
8ba0ef8
Fix bugs
Forgind May 23, 2023
9ee3de6
un-public BRD
Forgind May 23, 2023
3af2613
Switch to json format
Forgind May 24, 2023
81cf59e
Progress on tests
Forgind May 24, 2023
1870e84
Add JsonOutputFormatter
Forgind Jun 2, 2023
3fa8dc4
Resolve issues and use new class
Forgind Jun 2, 2023
631eb22
Use STJ
Forgind Jun 6, 2023
034ae13
Remove XMake garbage
Forgind Jun 6, 2023
41e2b4a
Add comment
Forgind Jun 6, 2023
bf0e8f3
Suppress build finished message
Forgind Jun 8, 2023
8259a4b
Suppress BuildFinished for getTargetResult
Forgind Jun 9, 2023
8b65f88
Support simple format
Forgind Jun 16, 2023
8c3db88
Do not fail hard when the user passes an invalid project
Forgind Jun 16, 2023
4f849ba
Push all logging to stderr
Forgind Jun 16, 2023
d0a1b38
Cleanup_1
Forgind Jun 19, 2023
a7a3c33
PR comments
Forgind Jun 19, 2023
fa46143
Add using
Forgind Jun 19, 2023
41d3091
Do not use custom loggers
Forgind Jun 29, 2023
db6210a
Merge branch 'main' into get-eval-results-2
Forgind Jul 5, 2023
241e5b9
remove test no longer relevant to design
Forgind Jul 10, 2023
0089832
Merge branch 'main' of https://github.com/dotnet/msbuild into get-eva…
Forgind Jul 20, 2023
20c07c7
PR feedback
Forgind Jul 20, 2023
cad93f2
Remove duplicate check
Forgind Jul 20, 2023
b1aab93
Continue PR feedback
Forgind Jul 21, 2023
71a8c93
Merge branch 'main' into get-eval-results-2
Forgind Jul 21, 2023
0c30abd
Delete duplicate usings
Forgind Jul 26, 2023
ccf6731
Most PR comments
Forgind Jul 27, 2023
e843f03
Merge branch 'main' of https://github.com/dotnet/msbuild into get-eva…
Forgind Jul 27, 2023
52a57fa
Move comment
Forgind Jul 27, 2023
d33d9de
PR comments
Forgind Aug 4, 2023
b9826c1
Extend ExecuteAppWithGetPropertyAndItem
Forgind Aug 4, 2023
131f614
Create local variable
Forgind Aug 7, 2023
6cb6dab
Output binlog
Forgind Aug 8, 2023
5c38ef4
Permit "Build succeeded" in binlog
Forgind Aug 8, 2023
6d6052f
PR feedback
Forgind Aug 9, 2023
d5e7d13
Do not permit duplicate additions to eval results
Forgind Aug 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Suppress build finished message
  • Loading branch information
Forgind committed Jun 8, 2023
commit bf0e8f338717ac514b7bb2bc172e5e8539d27e81
23 changes: 19 additions & 4 deletions src/Build/BackEnd/BuildManager/BuildManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,13 @@ private enum BuildManagerState
Idle,

/// <summary>
/// This is the state the BuildManager is in after <see cref="BeginBuild(BuildParameters)"/> has been called but before <see cref="EndBuild"/> has been called.
/// <see cref="BuildManager.PendBuildRequest(Microsoft.Build.Execution.BuildRequestData)"/>, <see cref="BuildManager.BuildRequest(Microsoft.Build.Execution.BuildRequestData)"/>, <see cref="BuildManager.PendBuildRequest(GraphBuildRequestData)"/>, <see cref="BuildManager.BuildRequest(GraphBuildRequestData)"/>, and <see cref="BuildManager.EndBuild"/> may be called in this state.
/// This is the state the BuildManager is in after <see cref="BeginBuild(BuildParameters)"/> has been called but before <see cref="EndBuild()"/> has been called.
/// <see cref="BuildManager.PendBuildRequest(Microsoft.Build.Execution.BuildRequestData)"/>, <see cref="BuildManager.BuildRequest(Microsoft.Build.Execution.BuildRequestData)"/>, <see cref="BuildManager.PendBuildRequest(GraphBuildRequestData)"/>, <see cref="BuildManager.BuildRequest(GraphBuildRequestData)"/>, and <see cref="BuildManager.EndBuild()"/> may be called in this state.
/// </summary>
Building,

/// <summary>
/// This is the state the BuildManager is in after <see cref="BuildManager.EndBuild"/> has been called but before all existing submissions have completed.
/// This is the state the BuildManager is in after <see cref="BuildManager.EndBuild()"/> has been called but before all existing submissions have completed.
/// </summary>
WaitingForBuildToComplete
}
Expand Down Expand Up @@ -909,6 +909,18 @@ public BuildResult BuildRequest(BuildRequestData requestData)
/// </remarks>
/// <exception cref="InvalidOperationException">Thrown if there is no build in progress.</exception>
public void EndBuild()
{
EndBuild(false);
}

/// <summary>
/// Signals that no more build requests are expected (or allowed) and the BuildManager may clean up.
/// </summary>
/// <remarks>
/// This call blocks until all currently pending requests are complete.
/// </remarks>
/// <exception cref="InvalidOperationException">Thrown if there is no build in progress.</exception>
public void EndBuild(bool skipLoggingBuildFinished)
{
lock (_syncLock)
{
Expand Down Expand Up @@ -1018,7 +1030,10 @@ public void EndBuild()
_overallBuildSuccess = false;
}

loggingService.LogBuildFinished(_overallBuildSuccess);
if (!skipLoggingBuildFinished)
{
loggingService.LogBuildFinished(_overallBuildSuccess);
}

if (_buildTelemetry != null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/MSBuild/XMake.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1496,7 +1496,7 @@ internal static bool BuildProject(
}
finally
{
buildManager.EndBuild();
buildManager.EndBuild(saveProject);
}
}
catch (Exception ex)
Expand Down