Merge branch 'master' into feature/dependabot

Author: aleks-ivanov

src/Agent.Worker/ContainerOperationProvider.cs

@@ -977,7 +977,8 @@ string useDoubleQuotes(string value)
                                 );
                             }
                         }
-                        else if (!useNode20InUnsupportedSystem)
+                        
+                        if (!useNode20InUnsupportedSystem && (useNode24InUnsupportedSystem || container.NeedsNode20Redirect))
                         {
                             var node20 = container.TranslateToContainerPath(Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Externals), NodeHandler.Node20_1Folder, "bin", $"node{IOUtil.ExeExtension}"));
 

src/Agent.Worker/Handlers/NodeHandler.cs

@@ -210,6 +210,7 @@ public async Task RunAsync()
                             supportsNode20 = !node20ResultsInGlibCErrorHost;
                         }
                     }
+                    
                     if (!useNode24InUnsupportedSystem)
                     {
                         if (supportsNode24.HasValue)
@@ -374,7 +375,7 @@ public string GetNodeLocation(bool node20ResultsInGlibCError, bool node24Results
             string useNodeKnob = AgentKnobs.UseNode.GetValue(ExecutionContext).AsString();
 
             string nodeFolder = NodeHandler.NodeFolder;
-            if (taskHasNode24Data)
+            if (taskHasNode24Data && useNode24)
             {
                 Trace.Info($"Task.json has node24 handler data: {taskHasNode24Data}");
                 nodeFolder = GetNodeFolderWithFallback(NodeHandler.Node24Folder, node20ResultsInGlibCError, node24ResultsInGlibCError, inContainer);
@@ -400,12 +401,7 @@ public string GetNodeLocation(bool node20ResultsInGlibCError, bool node24Results
                 nodeFolder = NodeHandler.node10Folder;
             }
 
-            if (useNode24)
-            {
-                Trace.Info($"Found UseNode24 knob, using node24 for node tasks: {useNode24}");
-                nodeFolder = GetNodeFolderWithFallback(NodeHandler.Node24Folder, node20ResultsInGlibCError, node24ResultsInGlibCError, inContainer);
-            }
-            else if (useNode20_1)
+            if (useNode20_1)
             {
                 Trace.Info($"Found UseNode20_1 knob, using node20_1 for node tasks {useNode20_1} node20ResultsInGlibCError = {node20ResultsInGlibCError}");
                 nodeFolder = GetNodeFolderWithFallback(NodeHandler.Node20_1Folder, node20ResultsInGlibCError, node24ResultsInGlibCError, inContainer);

src/Misc/externals.sh

@@ -176,8 +176,12 @@ if [[ "$PACKAGERUNTIME" == "win-x"* ]]; then
         acquireExternalTool "$CONTAINER_URL/azcopy/1/azcopy.zip" azcopy
         acquireExternalTool "$CONTAINER_URL/vstshost/m122_887c6659_binding_redirect_patched/vstshost.zip" vstshost
     fi
+    # Node.js dropped official support for Windows 32-bit (win-x86) starting with Node.js 20
+    # See: https://github.com/nodejs/node/blob/main/BUILDING.md#platform-list
+    # Node 24 is not available for win-x86, so we exclude it for this runtime
     if [[ "$PACKAGERUNTIME" == "win-x86" ]]; then
         INCLUDE_NODE24=false
+        echo "INFO: Node 24 is not available for win-x86. Node-based tasks will fall back to Node 20 or Node 16."
     fi
 
     acquireExternalTool "$CONTAINER_URL/mingit/${MINGIT_VERSION}/MinGit-${MINGIT_VERSION}-${BIT}-bit.zip" git

src/Test/L0/NodeHandlerL0.cs

@@ -71,31 +71,47 @@ public void UseNewNodeForNewNodeHandler(string nodeVersion)
         {
             ResetNodeKnobs();
 
-            // Use a unique test name per data row to avoid sharing the same trace file across parallel runs
-            using (TestHostContext thc = CreateTestHostContext($"{nameof(UseNewNodeForNewNodeHandler)}_{nodeVersion}"))
+            // For node24, set the required knob
+            if (nodeVersion == "node24")
             {
-                thc.SetSingleton(new WorkerCommandManager() as IWorkerCommandManager);
-                thc.SetSingleton(new ExtensionManager() as IExtensionManager);
-
-                NodeHandler nodeHandler = new NodeHandler(nodeHandlerHalper.Object);
+                Environment.SetEnvironmentVariable("AGENT_USE_NODE24", "true");
+            }
 
-                nodeHandler.Initialize(thc);
-                nodeHandler.ExecutionContext = CreateTestExecutionContext(thc);
-                nodeHandler.Data = nodeVersion switch
+            try
+            {
+                // Use a unique test name per data row to avoid sharing the same trace file across parallel runs
+                using (TestHostContext thc = CreateTestHostContext($"{nameof(UseNewNodeForNewNodeHandler)}_{nodeVersion}"))
                 {
-                    "node10" => new Node10HandlerData(),
-                    "node16" => new Node16HandlerData(),
-                    "node20_1" => new Node20_1HandlerData(),
-                    "node24" => new Node24HandlerData(),
-                    _ => throw new Exception("Invalid node version"),
-                };
+                    thc.SetSingleton(new WorkerCommandManager() as IWorkerCommandManager);
+                    thc.SetSingleton(new ExtensionManager() as IExtensionManager);
 
-                string actualLocation = nodeHandler.GetNodeLocation(node20ResultsInGlibCError: false, node24ResultsInGlibCError: false, inContainer: false);
-                string expectedLocation = Path.Combine(thc.GetDirectory(WellKnownDirectory.Externals),
-                    nodeVersion,
-                    "bin",
-                    $"node{IOUtil.ExeExtension}");
-                Assert.Equal(expectedLocation, actualLocation);
+                    NodeHandler nodeHandler = new NodeHandler(nodeHandlerHalper.Object);
+
+                    nodeHandler.Initialize(thc);
+                    nodeHandler.ExecutionContext = CreateTestExecutionContext(thc);
+                    nodeHandler.Data = nodeVersion switch
+                    {
+                        "node10" => new Node10HandlerData(),
+                        "node16" => new Node16HandlerData(),
+                        "node20_1" => new Node20_1HandlerData(),
+                        "node24" => new Node24HandlerData(),
+                        _ => throw new Exception("Invalid node version"),
+                    };
+
+                    string actualLocation = nodeHandler.GetNodeLocation(node20ResultsInGlibCError: false, node24ResultsInGlibCError: false, inContainer: false);
+                    string expectedLocation = Path.Combine(thc.GetDirectory(WellKnownDirectory.Externals),
+                        nodeVersion,
+                        "bin",
+                        $"node{IOUtil.ExeExtension}");
+                    Assert.Equal(expectedLocation, actualLocation);
+                }
+            }
+            finally
+            {
+                if (nodeVersion == "node24")
+                {
+                    Environment.SetEnvironmentVariable("AGENT_USE_NODE24", null);
+                }
             }
         }
 
@@ -477,4 +493,4 @@ private void ResetNodeKnobs()
             Environment.SetEnvironmentVariable("AGENT_USE_NODE24_IN_UNSUPPORTED_SYSTEM", null);
         }
     }
-}
+}