diff --git a/azure-pipelines/vs-insertion-experimental.yml b/azure-pipelines/vs-insertion-experimental.yml
index fe2a1134de5..6cbdac4eaa1 100644
--- a/azure-pipelines/vs-insertion-experimental.yml
+++ b/azure-pipelines/vs-insertion-experimental.yml
@@ -24,6 +24,7 @@ parameters:
displayName: 'Insertion Target Branch (select for manual insertion)'
values:
- main
+ - rel/d18.0
- rel/d17.14
- rel/d17.13
- rel/d17.12
diff --git a/azure-pipelines/vs-insertion.yml b/azure-pipelines/vs-insertion.yml
index f4025af8cc2..913c108c9e0 100644
--- a/azure-pipelines/vs-insertion.yml
+++ b/azure-pipelines/vs-insertion.yml
@@ -44,6 +44,7 @@ parameters:
values:
- auto
- main
+ - rel/d18.0
- rel/d17.14
- rel/d17.13
- rel/d17.12
@@ -65,7 +66,9 @@ parameters:
variables:
# `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
- name: AutoInsertTargetBranch
- ${{ if eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
+ ${{ if eq(variables['Build.SourceBranchName'], 'vs18.0') }}:
+ value: 'rel/d18.0'
+ ${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
value: 'rel/d17.14'
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.13') }}:
value: 'rel/d17.13'
diff --git a/src/Build/Logging/TerminalLogger/TerminalLogger.cs b/src/Build/Logging/TerminalLogger/TerminalLogger.cs
index 24eac40cb55..b64fefb705e 100644
--- a/src/Build/Logging/TerminalLogger/TerminalLogger.cs
+++ b/src/Build/Logging/TerminalLogger/TerminalLogger.cs
@@ -210,6 +210,11 @@ public EvalContext(BuildEventContext context)
///
private bool? _showSummary;
+ ///
+ /// Indicates whether to show the live-updated nodes display.
+ ///
+ private bool _showNodesDisplay = true;
+
private uint? _originalConsoleMode;
///
@@ -422,6 +427,9 @@ private void ApplyParameter(string parameterName, string? parameterValue)
case "NOSUMMARY":
_showSummary = false;
break;
+ case "DISABLENODEDISPLAY":
+ _showNodesDisplay = false;
+ break;
}
}
@@ -488,9 +496,10 @@ public MessageImportance GetMinimumMessageImportance()
///
private void BuildStarted(object sender, BuildStartedEventArgs e)
{
- if (!_manualRefresh)
+ if (!_manualRefresh && _showNodesDisplay)
{
_refresher = new Thread(ThreadProc);
+ _refresher.Name = "Terminal Logger Node Display Refresher";
_refresher.Start();
}
@@ -763,7 +772,10 @@ private void ProjectFinished(object sender, ProjectFinishedEventArgs e)
_buildErrorsCount += project.ErrorCount;
_buildWarningsCount += project.WarningCount;
- DisplayNodes();
+ if (_showNodesDisplay)
+ {
+ DisplayNodes();
+ }
}
finally
{