Merge branch 'master' into users/surajitshil-03/test

Author: surajitshil-03

src/Agent.Listener/Configuration.Windows/AutoLogonManager.cs

@@ -208,7 +208,26 @@ private void RestartBasedOnUserInput(CommandSettings command)
                 //ExecuteAsync API of ProcessInvoker waits for the process to exit
                 var args = $@"-r -t 15 -c ""{msg}""";
                 Trace.Info($"Shutdown.exe path: {shutdownExePath}. Arguments: {args}");
-                Process.Start(shutdownExePath, $@"{args}");
+
+                try
+                {
+                    Process.Start(shutdownExePath, $@"{args}");
+                }
+                catch (System.ComponentModel.Win32Exception w32Ex)
+                {
+                    Trace.Error($"Failed to start shutdown process: Win32 error {w32Ex.NativeErrorCode}: {w32Ex.Message}");
+                    _terminal.WriteError($"Failed to restart machine automatically. Please restart manually. Error: {w32Ex.Message}");
+                }
+                catch (FileNotFoundException fnfEx)
+                {
+                    Trace.Error($"Shutdown executable not found at '{shutdownExePath}': {fnfEx.Message}");
+                    _terminal.WriteError($"Cannot find shutdown.exe. Please restart machine manually.");
+                }
+                catch (Exception ex)
+                {
+                    Trace.Error($"Unexpected error starting shutdown process: {ex.Message} {ex}");
+                    _terminal.WriteError($"Failed to restart machine automatically. Please restart manually. Error: {ex.Message}");
+                }
             }
             else
             {

src/Agent.Listener/Configuration/ConfigurationManager.cs

@@ -244,7 +244,7 @@ public async Task ConfigureAsync(CommandSettings command)
             while (true)
             {
                 agentSettings.AgentName = command.GetAgentName();
-                Trace.Info($"Agent registration attempt - Name: '{agentSettings.AgentName}', Pool: '{agentSettings.PoolName}' (ID: {agentSettings.PoolId}), ReplaceMode: {command.GetReplace()}");
+                Trace.Info($"Agent registration attempt - Name: '{agentSettings.AgentName}', Pool: '{agentSettings.PoolName}' (ID: {agentSettings.PoolId})");
 
                 // Get the system capabilities.
                 // TODO: Hook up to ctrl+c cancellation token.

src/Agent.Listener/Configuration/ConfigurationProvider.cs

@@ -369,6 +369,16 @@ private async Task<string> GetAzureSubscriptionIdAsync()
                         azureSubscriptionId = string.Empty;
                     }
                 }
+                catch (HttpRequestException httpEx)
+                {
+                    azureSubscriptionId = string.Empty;
+                    Trace.Info($"HTTP error accessing Azure IMDS: {httpEx.Message}");
+                }
+                catch (TaskCanceledException tcEx) when (tcEx.InnerException is System.TimeoutException)
+                {
+                    azureSubscriptionId = string.Empty;
+                    Trace.Info($"Timeout accessing Azure IMDS (not running on Azure): {tcEx.Message}");
+                }
                 catch (SocketException ex)
                 {
                     azureSubscriptionId = string.Empty;
@@ -379,6 +389,7 @@ private async Task<string> GetAzureSubscriptionIdAsync()
                     // An exception will be thrown if the Agent Machine is a non-Azure VM.
                     azureSubscriptionId = string.Empty;
                     Trace.Info($"GetAzureSubscriptionId ex: {ex.Message}");
+                    Trace.Info(ex.ToString());
                 }
             }
 

src/Agent.Listener/JobDispatcher.cs

@@ -1193,6 +1193,7 @@ await processChannel.SendAsync(
             catch (Exception ex)
             {
                 Trace.Warning($"Failed to send flush logs request to worker: {ex.Message}");
+                Trace.Warning(ex.ToString());
             }
 
             // Now wait for the additional 1 minute log flushing period

src/Agent.Listener/MessageListener.cs

@@ -8,6 +8,7 @@
 using Microsoft.VisualStudio.Services.Common;
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;

src/Agent.Listener/Program.cs

@@ -68,6 +68,7 @@ private static async Task<int> MainAsync(IHostContext context, string[] args)
                 {
                     terminal.WriteError(StringUtil.Loc("ErrorOccurred", e.Message));
                     trace.Error(StringUtil.Format($"Directory permission validation failed - insufficient permissions - {0}", e.Message));
+                    trace.Error(e);
                     return Constants.Agent.ReturnCode.TerminatedError;
                 }
 

src/Agent.Plugins/TFCliManager.cs

@@ -38,9 +38,7 @@ public override TfsVCFeatures Features
 
         public static readonly int RetriesOnFailure = 3;
 
-        private string TfPath => AgentKnobs.InstallLegacyTfExe.GetValue(ExecutionContext).AsBoolean()
-            ? Path.Combine(ExecutionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", "tf-legacy")
-            : Path.Combine(ExecutionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", "tf");
+        private string TfPath => VarUtil.GetTfDirectoryPath(ExecutionContext);
 
         public string FilePath => Path.Combine(TfPath, "tf.exe");
 

src/Agent.Plugins/TfsVCSourceProvider.cs

@@ -101,8 +101,8 @@ public async Task GetSourceAsync(
             if (PlatformUtil.RunningOnWindows)
             {
                 // Set TFVC_BUILDAGENT_POLICYPATH
-                string tfDirectoryName = AgentKnobs.InstallLegacyTfExe.GetValue(executionContext).AsBoolean() ? "tf-legacy" : "tf";
-                string policyDllPath = Path.Combine(executionContext.Variables.GetValueOrDefault("Agent.HomeDirectory")?.Value, "externals", tfDirectoryName, "Microsoft.TeamFoundation.VersionControl.Controls.dll");
+                string TfPath = VarUtil.GetTfDirectoryPath(executionContext);
+                string policyDllPath = Path.Combine(TfPath, "Microsoft.TeamFoundation.VersionControl.Controls.dll");
                 ArgUtil.File(policyDllPath, nameof(policyDllPath));
                 const string policyPathEnvKey = "TFVC_BUILDAGENT_POLICYPATH";
                 executionContext.Output(StringUtil.Loc("SetEnvVar", policyPathEnvKey));

src/Agent.Sdk/CommandPlugin.cs

@@ -28,7 +28,7 @@ public interface IAgentCommandPlugin
         Task ProcessCommandAsync(AgentCommandPluginExecutionContext executionContext, CancellationToken token);
     }
 
-    public class AgentCommandPluginExecutionContext : ITraceWriter
+    public class AgentCommandPluginExecutionContext : ITraceWriter, IKnobValueContext
     {
         private VssConnection _connection;
         private readonly object _stdoutLock = new object();
@@ -69,7 +69,7 @@ public void Verbose(string message, [CallerMemberName] string operation = "")
 #if DEBUG
             Debug(message);
 #else
-            string vstsAgentTrace = AgentKnobs.TraceVerbose.GetValue(UtilKnobValueContext.Instance()).AsString();
+            string vstsAgentTrace = AgentKnobs.TraceVerbose.GetValue(this).AsString();
             if (!string.IsNullOrEmpty(vstsAgentTrace))
             {
                 Debug(message);
@@ -212,5 +212,15 @@ private AgentWebProxySettings GetProxyConfiguration()
                 return null;
             }
         }
+
+        string IKnobValueContext.GetVariableValueOrDefault(string variableName)
+        {
+            return Variables.GetValueOrDefault(variableName)?.Value;
+        }
+
+        IScopedEnvironment IKnobValueContext.GetScopedEnvironment()
+        {
+            return new SystemEnvironment();
+        }
     }
 }

src/Agent.Sdk/ContainerInfo.cs

@@ -94,6 +94,7 @@ public ContainerInfo(Pipelines.ContainerResource container, Boolean isJobContain
         public bool IsJobContainer { get; set; }
         public bool MapDockerSocket { get; set; }
         public bool NeedsNode16Redirect { get; set; }
+        public bool NeedsNode20Redirect { get; set; }
         public PlatformUtil.OS ImageOS
         {
             get