Resolve net task host params from the project properties

src/Build.UnitTests/BackEnd/BuildManager_Tests.cs

@@ -1725,7 +1725,7 @@ public void CancelledBuildWithDelay40_WithThreatSwap()
         /// A canceled build which waits for the task to get started before canceling.  Because it is a 12.0 task, we should
         /// cancel the task and exit out after a short period wherein we wait for the task to exit cleanly.
         /// </summary>
-        [Fact]
+        [WindowsFullFrameworkOnlyFact]
         public void CancelledBuildInTaskHostWithDelay40()
         {
             string contents = CleanupFileContents(@$"
@@ -4384,7 +4384,7 @@ public override bool Execute()
             }
         }
 
-        [Theory]
+        [WindowsFullFrameworkOnlyTheory]
         [InlineData("", false)] // regular task host, input logging disabled
         [InlineData("", true)] // regular task host, input logging enabled
         [InlineData("TaskHostFactory", false)] // OOP task host, input logging disabled

src/Build.UnitTests/BackEnd/TaskHostConfiguration_Tests.cs

@@ -38,6 +38,7 @@ public void ConstructorWithNullName()
             Assert.Throws<InternalErrorException>(() =>
             {
                 TaskHostConfiguration config = new TaskHostConfiguration(
+                    runtime: "TaskHost",
                     nodeId: 1,
                     startupDirectory: Directory.GetCurrentDirectory(),
                     buildProcessEnvironment: null,
@@ -73,6 +74,7 @@ public void ConstructorWithEmptyName()
             Assert.Throws<InternalErrorException>(() =>
             {
                 TaskHostConfiguration config = new TaskHostConfiguration(
+                    runtime: "TaskHost",
                     nodeId: 1,
                     startupDirectory: Directory.GetCurrentDirectory(),
                     buildProcessEnvironment: null,
@@ -108,6 +110,7 @@ public void ConstructorWithNullLocation()
             Assert.Throws<InternalErrorException>(() =>
             {
                 TaskHostConfiguration config = new TaskHostConfiguration(
+                    runtime: "TaskHost",
                     nodeId: 1,
                     startupDirectory: Directory.GetCurrentDirectory(),
                     buildProcessEnvironment: null,
@@ -145,6 +148,7 @@ public void ConstructorWithEmptyLocation()
             Assert.Throws<InternalErrorException>(() =>
             {
                 TaskHostConfiguration config = new TaskHostConfiguration(
+                    runtime: "TaskHost",
                     nodeId: 1,
                     startupDirectory: Directory.GetCurrentDirectory(),
                     buildProcessEnvironment: null,
@@ -180,6 +184,7 @@ public void ConstructorWithEmptyLocation()
         public void TestValidConstructors()
         {
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -206,6 +211,7 @@ public void TestValidConstructors()
                 warningsAsMessages: null);
 
             TaskHostConfiguration config2 = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -233,6 +239,7 @@ public void TestValidConstructors()
 
             IDictionary<string, object> parameters = new Dictionary<string, object>();
             TaskHostConfiguration config3 = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -265,6 +272,7 @@ public void TestValidConstructors()
             parameters2.Add("ItemArray", new ITaskItem[] { new TaskItem("DEF"), new TaskItem("GHI"), new TaskItem("JKL") });
 
             TaskHostConfiguration config4 = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -297,6 +305,7 @@ public void TestValidConstructors()
             WarningsAsErrors.Add("MSB1237");
 
             TaskHostConfiguration config5 = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -336,6 +345,7 @@ public void TestTranslationWithNullDictionary()
             };
 
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -387,6 +397,7 @@ public void TestTranslationWithAppDomainSetup(byte[] configBytes)
             AppDomainSetup setup = new AppDomainSetup();
 
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -433,6 +444,7 @@ public void TestTranslationWithAppDomainSetup(byte[] configBytes)
         public void TestTranslationWithEmptyDictionary()
         {
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -484,6 +496,7 @@ public void TestTranslationWithValueTypesInDictionary()
             parameters.Add("Text", "Foo");
             parameters.Add("BoolValue", false);
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -533,6 +546,7 @@ public void TestTranslationWithITaskItemInDictionary()
             IDictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("TaskItemValue", new TaskItem("Foo"));
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -581,6 +595,7 @@ public void TestTranslationWithITaskItemArrayInDictionary()
             IDictionary<string, object> parameters = new Dictionary<string, object>();
             parameters.Add("TaskItemArrayValue", new ITaskItem[] { new TaskItem("Foo"), new TaskItem("Baz") });
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -636,6 +651,7 @@ public void TestTranslationWithWarningsAsErrors()
             WarningsAsErrors.Add("MSB1236");
             WarningsAsErrors.Add("MSB1237");
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,
@@ -686,6 +702,7 @@ public void TestTranslationWithWarningsAsMessages()
             WarningsAsMessages.Add("MSB1236");
             WarningsAsMessages.Add("MSB1237");
             TaskHostConfiguration config = new TaskHostConfiguration(
+                runtime: "TaskHost",
                 nodeId: 1,
                 startupDirectory: Directory.GetCurrentDirectory(),
                 buildProcessEnvironment: null,

src/Build.UnitTests/BackEnd/TaskHostFactory_Tests.cs

@@ -4,11 +4,13 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
 using Microsoft.Build.Execution;
 using Microsoft.Build.Framework;
 using Microsoft.Build.UnitTests;
 using Microsoft.Build.UnitTests.BackEnd;
-
+using Microsoft.Build.UnitTests.Shared;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
 using Shouldly;
 using Xunit;
 using Xunit.Abstractions;
@@ -21,12 +23,9 @@ public sealed class TaskHostFactory_Tests
     {
         private ITestOutputHelper _output;
 
-        public TaskHostFactory_Tests(ITestOutputHelper testOutputHelper)
-        {
-            _output = testOutputHelper;
-        }
+        public TaskHostFactory_Tests(ITestOutputHelper testOutputHelper) => _output = testOutputHelper;
 
-        [Fact]
+        [WindowsFullFrameworkOnlyFact]
         public void TaskNodesDieAfterBuild()
         {
             using (TestEnvironment env = TestEnvironment.Create())
@@ -40,6 +39,7 @@ public void TaskNodesDieAfterBuild()
         </ProcessIdTask>
     </Target>
 </Project>";
+
                 TransientTestFile project = env.CreateFile("testProject.csproj", pidTaskProject);
                 ProjectInstance projectInstance = new(project.Path);
                 projectInstance.Build().ShouldBeTrue();
@@ -60,7 +60,7 @@ public void TaskNodesDieAfterBuild()
             }
         }
 
-        [Fact]
+        [WindowsFullFrameworkOnlyFact]
         private void VariousParameterTypesCanBeTransmittedToAndReceivedFromTaskHost()
         {
             using TestEnvironment env = TestEnvironment.Create(_output);

src/Build.UnitTests/EscapingInProjects_Tests.cs

@@ -106,7 +106,7 @@ public void SemicolonInPropertyPassedIntoStringParam()
         /// Make sure I can define a property with escaped characters and pass it into
         /// a string parameter of a task, in this case the Message task.
         /// </summary>
-        [Fact]
+        [WindowsFullFrameworkOnlyFact]
         public void SemicolonInPropertyPassedIntoStringParam_UsingTaskHost()
         {
             MockLogger logger = Helpers.BuildProjectWithNewOMExpectSuccess(@"
@@ -603,7 +603,7 @@ public void ItemTransformContainingSemicolon()
         /// Do an item transform, where the transform expression contains an unescaped semicolon as well
         /// as an escaped percent sign.
         /// </summary>
-        [Fact]
+        [WindowsFullFrameworkOnlyFact]
         public void ItemTransformContainingSemicolon_InTaskHost()
         {
             MockLogger logger = Helpers.BuildProjectWithNewOMExpectSuccess(@"
@@ -730,7 +730,7 @@ public void EscapedWildcardsShouldNotBeExpanded()
         /// If %2A (escaped '*') or %3F (escaped '?') is in an item's Include, it should be treated
         /// literally, not as a wildcard
         /// </summary>
-        [Fact]
+        [WindowsFullFrameworkOnlyFact]
         public void EscapedWildcardsShouldNotBeExpanded_InTaskHost()
         {
             MockLogger logger = new();

src/Build.UnitTests/Instance/TaskItem_Tests.cs

@@ -288,7 +288,7 @@ public void Escaping1()
         /// <summary>
         /// Flushing an item through a task run in the task host also should not mess up special characters on the metadata.
         /// </summary>
-        [Fact]
+        [WindowsFullFrameworkOnlyFact]
         public void Escaping2()
         {
             string content = ObjectModelHelpers.CleanupFileContents(@"
@@ -342,7 +342,7 @@ public void Escaping2()
         /// <summary>
         /// Flushing an item through a task run in the task host also should not mess up the escaping of the itemspec either.
         /// </summary>
-        [Fact]
+        [WindowsFullFrameworkOnlyFact]
         public void Escaping3()
         {
             string content = ObjectModelHelpers.CleanupFileContents(@"

src/Build/BackEnd/Client/MSBuildClientPacketPump.cs

@@ -203,8 +203,8 @@ private void RunReadLoop(Stream localStream, ManualResetEvent localPacketPumpShu
                 bool continueReading = true;
                 do
                 {
-                    // Ordering of the wait handles is important. The first signalled wait handle in the array
-                    // will be returned by WaitAny if multiple wait handles are signalled. We prefer to have the
+                    // Ordering of the wait handles is important. The first signaled wait handle in the array
+                    // will be returned by WaitAny if multiple wait handles are signaled. We prefer to have the
                     // terminate event triggered so that we cannot get into a situation where packets are being
                     // spammed to the client and it never gets an opportunity to shutdown.
                     WaitHandle[] handles =

src/Build/BackEnd/Components/Communications/NodeLauncher.cs

@@ -38,12 +38,12 @@ public void ShutdownComponent()
         public Process Start(string msbuildLocation, string commandLineArgs, int nodeId)
         {
             // Disable MSBuild server for a child process.
-            // In case of starting msbuild server it prevents an infinite recurson. In case of starting msbuild node we also do not want this variable to be set.
+            // In case of starting msbuild server it prevents an infinite recursion. In case of starting msbuild node we also do not want this variable to be set.
             return DisableMSBuildServer(() => StartInternal(msbuildLocation, commandLineArgs));
         }
 
         /// <summary>
-        /// Creates a new MSBuild process
+        /// Creates new MSBuild or dotnet process.
         /// </summary>
         private Process StartInternal(string msbuildLocation, string commandLineArgs)
         {

src/Build/BackEnd/Components/Communications/NodeProviderOutOfProcBase.cs

@@ -183,7 +183,8 @@ protected void ShutdownAllNodes(bool nodeReuse, NodeContextTerminateDelegate ter
         /// <summary>
         /// Finds or creates a child processes which can act as a node.
         /// </summary>
-        protected IList<NodeContext> GetNodes(string msbuildLocation,
+        protected IList<NodeContext> GetNodes(
+            string msbuildLocation,
             string commandLineArgs,
             int nextNodeId,
             INodePacketFactory factory,
@@ -335,6 +336,7 @@ bool StartNewNode(int nodeId)
                     // Create the node process
                     INodeLauncher nodeLauncher = (INodeLauncher)_componentHost.GetComponent(BuildComponentType.NodeLauncher);
                     Process msbuildProcess = nodeLauncher.Start(msbuildLocation, commandLineArgs, nodeId);
+
                     _processesToIgnore.TryAdd(GetProcessesToIgnoreKey(hostHandshake, msbuildProcess.Id), default);
 
                     // Note, when running under IMAGEFILEEXECUTIONOPTIONS registry key to debug, the process ID
@@ -397,7 +399,7 @@ void CreateNodeContext(int nodeId, Process nodeToReuse, Stream nodeStream)
         {
             if (String.IsNullOrEmpty(msbuildLocation))
             {
-                msbuildLocation = "MSBuild.exe";
+                msbuildLocation = Constants.MSBuildExecutableName;
             }
 
             var expectedProcessName = Path.GetFileNameWithoutExtension(CurrentHost.GetCurrentHost() ?? msbuildLocation);
@@ -507,11 +509,11 @@ internal static void ConnectToPipeStream(NamedPipeClientStream nodeStream, strin
             }
 #endif
 
-            int[] handshakeComponents = handshake.RetrieveHandshakeComponents();
+            KeyValuePair<string, int>[] handshakeComponents = handshake.RetrieveHandshakeComponents();
             for (int i = 0; i < handshakeComponents.Length; i++)
             {
                 CommunicationsUtilities.Trace("Writing handshake part {0} ({1}) to pipe {2}", i, handshakeComponents[i], pipeName);
-                nodeStream.WriteIntForHandshake(handshakeComponents[i]);
+                nodeStream.WriteIntForHandshake(handshakeComponents[i].Value);
             }
 
             // This indicates that we have finished all the parts of our handshake; hopefully the endpoint has as well.
@@ -753,13 +755,20 @@ static async Task SendDataCoreAsync(Task _, object state)
                             // clear the buffer but keep the underlying capacity to avoid reallocations
                             writeStream.SetLength(0);
 
-                            ITranslator writeTranslator = BinaryTranslator.GetWriteTranslator(writeStream);
+                            NodePacketType packetType = packet.Type;
+                            ITranslator writeTranslator = BinaryTranslator.GetWriteTranslator(writeStream, PacketTypeExtensions.PacketVersion);
                             try
                             {
-                                writeStream.WriteByte((byte)packet.Type);
+                                // Write packet type with extended header.
+                                byte rawPackageType = PacketTypeExtensions.CreateExtendedHeaderType(packetType);
+                                writeStream.WriteByte(rawPackageType);
 
                                 // Pad for the packet length
                                 WriteInt32(writeStream, 0);
+
+                                // Write extended header with version
+                                PacketTypeExtensions.WriteVersion(writeStream, PacketTypeExtensions.PacketVersion);
+
                                 packet.Translate(writeTranslator);
 
                                 int writeStreamLength = (int)writeStream.Position;