Skip to content

Commit 7353174

Browse files
authored
[automated] Merge branch 'vs18.0' => 'main' (#12592)
I detected changes in the vs18.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR. This PR merges commits made on vs18.0 by the following committers: * @github-actions[bot] ## Instructions for merging from UI This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, *not* a squash or rebase commit. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. ## Instructions for merging via command line Run these commands to merge this pull request from the command line. ``` sh git fetch git checkout vs18.0 git pull --ff-only git checkout main git pull --ff-only git merge --no-ff vs18.0 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/msbuild HEAD:merge/vs18.0-to-main ``` <details> <summary>or if you are using SSH</summary> ``` git push [email protected]:dotnet/msbuild HEAD:merge/vs18.0-to-main ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs18.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/vs18.0-to-main origin/main git pull https://github.com/dotnet/msbuild merge/vs18.0-to-main (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs18.0-to-main ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs18.0-to-main origin/main git pull [email protected]:dotnet/msbuild merge/vs18.0-to-main (make changes) git commit -m "Updated PR with my changes" git push [email protected]:dotnet/msbuild HEAD:merge/vs18.0-to-main ``` </details> Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
2 parents 338e820 + ac9a3ef commit 7353174

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

azure-pipelines/vs-insertion-experimental.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ parameters:
2424
displayName: 'Insertion Target Branch (select for manual insertion)'
2525
values:
2626
- main
27+
- rel/d18.0
2728
- rel/d17.14
2829
- rel/d17.13
2930
- rel/d17.12

azure-pipelines/vs-insertion.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
values:
4545
- auto
4646
- main
47+
- rel/d18.0
4748
- rel/d17.14
4849
- rel/d17.13
4950
- rel/d17.12
@@ -65,7 +66,9 @@ parameters:
6566
variables:
6667
# `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
6768
- name: AutoInsertTargetBranch
68-
${{ if eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
69+
${{ if eq(variables['Build.SourceBranchName'], 'vs18.0') }}:
70+
value: 'rel/d18.0'
71+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
6972
value: 'rel/d17.14'
7073
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.13') }}:
7174
value: 'rel/d17.13'

src/Build/Logging/TerminalLogger/TerminalLogger.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,11 @@ public EvalContext(BuildEventContext context)
210210
/// </summary>
211211
private bool? _showSummary;
212212

213+
/// <summary>
214+
/// Indicates whether to show the live-updated nodes display.
215+
/// </summary>
216+
private bool _showNodesDisplay = true;
217+
213218
private uint? _originalConsoleMode;
214219

215220
/// <summary>
@@ -422,6 +427,9 @@ private void ApplyParameter(string parameterName, string? parameterValue)
422427
case "NOSUMMARY":
423428
_showSummary = false;
424429
break;
430+
case "DISABLENODEDISPLAY":
431+
_showNodesDisplay = false;
432+
break;
425433
}
426434
}
427435

@@ -488,9 +496,10 @@ public MessageImportance GetMinimumMessageImportance()
488496
/// </summary>
489497
private void BuildStarted(object sender, BuildStartedEventArgs e)
490498
{
491-
if (!_manualRefresh)
499+
if (!_manualRefresh && _showNodesDisplay)
492500
{
493501
_refresher = new Thread(ThreadProc);
502+
_refresher.Name = "Terminal Logger Node Display Refresher";
494503
_refresher.Start();
495504
}
496505

@@ -763,7 +772,10 @@ private void ProjectFinished(object sender, ProjectFinishedEventArgs e)
763772
_buildErrorsCount += project.ErrorCount;
764773
_buildWarningsCount += project.WarningCount;
765774

766-
DisplayNodes();
775+
if (_showNodesDisplay)
776+
{
777+
DisplayNodes();
778+
}
767779
}
768780
finally
769781
{

0 commit comments

Comments
 (0)