fix issues after conflict resolving (#4001)

microsoft · Oct 24, 2022 · c27b8de · c27b8de
1 parent 65dffa8
commit c27b8de
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Agent.Plugins/TfsVCCliManager.cs b/src/Agent.Plugins/TfsVCCliManager.cs
@@ -119,7 +119,7 @@ private string WriteCommandToFile(string command)
             return temporaryName;
         }
 
-        protected async Task<int> RunCommandAsync(FormatFlags formatFlags, bool quiet, bool failOnNonZeroExitCode, params string[] args)
+        protected async Task<int> RunCommandAsync(FormatTags formatFlags, bool quiet, bool failOnNonZeroExitCode, params string[] args)
         {
             // Validation.
             ArgUtil.NotNull(args, nameof(args));
@@ -304,7 +304,7 @@ private void CleanupTfsVCOutput(ref TfsVCPorcelainCommandResult command, string
             command.Output.RemoveAll(item => stringsToRemove.Contains(item));
         }
 
-        private string FormatArguments(FormatFlags formatFlags, params string[] args)
+        private string FormatArguments(FormatTags formatFlags, params string[] args)
         {
             // Validation.
             ArgUtil.NotNull(args, nameof(args));

diff --git a/src/Agent.Worker/Build/TfsVCCommandManager.cs b/src/Agent.Worker/Build/TfsVCCommandManager.cs
@@ -200,7 +200,7 @@ private string WriteCommandToFile(string command)
             return temporaryName;
         }
 
-        protected async Task<TfsVCPorcelainCommandResult> TryRunPorcelainCommandAsync(FormatFlags formatFlags, bool ignoreStderr, params string[] args)
+        protected async Task<TfsVCPorcelainCommandResult> TryRunPorcelainCommandAsync(FormatTags formatFlags, bool ignoreStderr, params string[] args)
         {
             // Validation.
             ArgUtil.NotNull(args, nameof(args));
@@ -285,7 +285,7 @@ private void CleanupTfsVCOutput(ref TfsVCPorcelainCommandResult command, string
             command.Output.RemoveAll(item => stringsToRemove.Contains(item));
         }
 
-        private string FormatArguments(FormatFlags formatFlags, params string[] args)
+        private string FormatArguments(FormatTags formatFlags, params string[] args)
         {
             // Validation.
             ArgUtil.NotNull(args, nameof(args));

diff --git a/src/Agent.Worker/TaskRunner.cs b/src/Agent.Worker/TaskRunner.cs
@@ -575,7 +575,7 @@ private void PublishTelemetry(Definition taskDefinition, HandlerData handlerData
             ArgUtil.NotNull(Task.Reference, nameof(Task.Reference));
             ArgUtil.NotNull(taskDefinition.Data, nameof(taskDefinition.Data));
 
-            var useNode10 = AgentKnobs.UseNode10.GetValue(ExecutionContext).AsString();
+            var useNode10 = AgentKnobs.UseNode16.GetValue(ExecutionContext).AsString();
 
             Dictionary<string, string> telemetryData = new Dictionary<string, string>
             {