Migrate Tlblmp and AxImp to Multithreaded Execution

src/Tasks.UnitTests/AxTlbBaseTask_Tests.cs

@@ -146,7 +146,7 @@ public void KeyFile()
                 Assert.Equal(badParameterValue, t.KeyFile); // "New KeyFile value should be set"
                 CommandLine.ValidateHasParameter(
                     t,
-                    @"/keyfile:" + badParameterValue,
+                    @"/keyfile:" + Path.GetFullPath(badParameterValue),
                     false /* no response file */);
                 Utilities.ExecuteTaskAndVerifyLogContainsErrorFromResource(t, "AxTlbBaseTask.InvalidKeyFileSpecified", t.KeyFile);
 

src/Tasks.UnitTests/TlbImp_Tests.cs

@@ -41,11 +41,11 @@ public void ReferenceFiles()
             t.ReferenceFiles = new string[] { "File1.dll", "File2.dll" };
             CommandLine.ValidateHasParameter(
                 t,
-                "/reference:File1.dll",
+                "/reference:" + Path.GetFullPath("File1.dll"),
                 false /* no response file */);
             CommandLine.ValidateHasParameter(
                 t,
-                "/reference:File2.dll",
+                "/reference:" + Path.GetFullPath("File2.dll"),
                 false /* no response file */);
         }
         /// <summary>
@@ -61,7 +61,7 @@ public void TypeLibName()
 
             t.TypeLibName = testParameterValue;
             Assert.Equal(testParameterValue, t.TypeLibName); // "New TypeLibName value should be set"
-            CommandLine.ValidateHasParameter(t, testParameterValue, false /* no response file */);
+            CommandLine.ValidateHasParameter(t, Path.GetFullPath(testParameterValue), false /* no response file */);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public void OutputAssembly()
             Assert.Equal(testParameterValue, t.OutputAssembly); // "New OutputAssembly value should be set"
             CommandLine.ValidateHasParameter(
                 t,
-                @"/out:" + testParameterValue,
+                @"/out:" + Path.GetFullPath(testParameterValue),
                 false /* no response file */);
         }
 

src/Tasks/AxTlbBaseTask.cs

@@ -107,14 +107,16 @@ protected internal override void AddCommandLineCommands(CommandLineBuilderExtens
         protected override string GenerateFullPathToTool()
         {
             string pathToTool = SdkToolsPathUtility.GeneratePathToTool(
-                SdkToolsPathUtility.FileInfoExists,
+                f => string.IsNullOrEmpty(f)
+                    ? SdkToolsPathUtility.FileInfoExists(f)
+                    : SdkToolsPathUtility.FileInfoExists(TaskEnvironment.GetAbsolutePath(f)),
                 Utilities.ProcessorArchitecture.CurrentProcessArchitecture,
                 SdkToolsPath,
                 ToolName,
                 Log,
                 true);
 
-            return pathToTool;
+            return string.IsNullOrEmpty(pathToTool) ? pathToTool : TaskEnvironment.GetAbsolutePath(pathToTool).Value;
         }
 
         /// <summary>
@@ -125,8 +127,8 @@ protected override bool ValidateParameters()
         {
             // Verify that a path for the tool exists -- if the tool doesn't exist in it
             // we'll worry about that later
-            if ((String.IsNullOrEmpty(ToolPath) || !FileSystems.Default.DirectoryExists(ToolPath)) &&
-                (String.IsNullOrEmpty(SdkToolsPath) || !FileSystems.Default.DirectoryExists(SdkToolsPath)))
+            if ((string.IsNullOrEmpty(ToolPath) || !FileSystems.Default.DirectoryExists(TaskEnvironment.GetAbsolutePath(ToolPath))) &&
+                (string.IsNullOrEmpty(SdkToolsPath) || !FileSystems.Default.DirectoryExists(TaskEnvironment.GetAbsolutePath(SdkToolsPath))))
             {
                 Log.LogErrorWithCodeFromResources("AxTlbBaseTask.SdkOrToolPathNotSpecifiedOrInvalid", SdkToolsPath ?? "", ToolPath ?? "");
                 return false;
@@ -155,13 +157,14 @@ private void AddStrongNameOptions(CommandLineBuilderExtension commandLine)
             // throw an error.
             //
             // So use /publickey if that's all our KeyFile contains, but KeyFile otherwise.
+            string absoluteKeyFile = string.IsNullOrEmpty(KeyFile) ? KeyFile : TaskEnvironment.GetAbsolutePath(KeyFile).Value;
             if (_delaySigningAndKeyFileOnlyContainsPublicKey)
             {
-                commandLine.AppendSwitchIfNotNull("/publickey:", KeyFile);
+                commandLine.AppendSwitchIfNotNull("/publickey:", absoluteKeyFile);
             }
             else
             {
-                commandLine.AppendSwitchIfNotNull("/keyfile:", KeyFile);
+                commandLine.AppendSwitchIfNotNull("/keyfile:", absoluteKeyFile);
             }
 
             commandLine.AppendSwitchIfNotNull("/keycontainer:", KeyContainer);
@@ -179,7 +182,7 @@ private bool ValidateStrongNameParameters()
             // Make sure that if KeyFile is defined, it's a real file.
             if (!String.IsNullOrEmpty(KeyFile))
             {
-                if (FileSystems.Default.FileExists(KeyFile))
+                if (FileSystems.Default.FileExists(TaskEnvironment.GetAbsolutePath(KeyFile)))
                 {
                     keyFileExists = true;
                 }
@@ -216,7 +219,8 @@ private bool ValidateStrongNameParameters()
 
                 try
                 {
-                    StrongNameUtils.GetStrongNameKey(Log, KeyFile, KeyContainer, out keyPair, out publicKey);
+                    string keyFileForRead = string.IsNullOrEmpty(KeyFile) ? KeyFile : TaskEnvironment.GetAbsolutePath(KeyFile).Value;
+                    StrongNameUtils.GetStrongNameKey(Log, keyFileForRead, KeyContainer, out keyPair, out publicKey);
                 }
                 catch (StrongNameException e)
                 {

src/Tasks/TlbImp.cs

@@ -3,6 +3,8 @@
 
 using System;
 
+using Microsoft.Build.Framework;
+
 #nullable disable
 
 namespace Microsoft.Build.Tasks
@@ -40,6 +42,7 @@ internal enum TlbImpTransformFlags
         /// Defines the "TlbImp" MSBuild task, which enables using TlbImp.exe
         /// to generate assemblies from type libraries.
         /// </summary>
+        [MSBuildMultiThreadableTask]
         internal class TlbImp : AxTlbBaseTask
         {
             #region Properties
@@ -236,15 +239,15 @@ public string[] ReferenceFiles
             protected internal override void AddCommandLineCommands(CommandLineBuilderExtension commandLine)
             {
                 // .ocx file being imported
-                commandLine.AppendFileNameIfNotNull(TypeLibName);
+                commandLine.AppendFileNameIfNotNull(AbsolutizeIfNotEmpty(TypeLibName));
 
                 // options
                 commandLine.AppendSwitchIfNotNull("/asmversion:", AssemblyVersion?.ToString());
                 commandLine.AppendSwitchIfNotNull("/namespace:", AssemblyNamespace);
                 commandLine.AppendSwitchIfNotNull("/machine:", Machine);
                 commandLine.AppendWhenTrue("/noclassmembers", Bag, "PreventClassMembers");
                 commandLine.AppendWhenTrue("/nologo", Bag, "NoLogo");
-                commandLine.AppendSwitchIfNotNull("/out:", OutputAssembly);
+                commandLine.AppendSwitchIfNotNull("/out:", AbsolutizeIfNotEmpty(OutputAssembly));
                 commandLine.AppendWhenTrue("/silent", Bag, "Silent");
                 commandLine.AppendWhenTrue("/sysarray", Bag, "SafeArrayAsSystemArray");
                 commandLine.AppendSwitchIfNotNull("/transform:", ConvertTransformFlagsToCommandLineCommand(Transform));
@@ -253,13 +256,21 @@ protected internal override void AddCommandLineCommands(CommandLineBuilderExtens
                 {
                     foreach (var referenceFile in ReferenceFiles)
                     {
-                        commandLine.AppendSwitchIfNotNull("/reference:", referenceFile);
+                        commandLine.AppendSwitchIfNotNull("/reference:", AbsolutizeIfNotEmpty(referenceFile));
                     }
                 }
 
                 base.AddCommandLineCommands(commandLine);
             }
 
+            /// <summary>
+            /// Returns the absolutized form of <paramref name="path"/> when it is non-empty,
+            /// or the original value when null/empty (preserves prior null/empty handling of
+            /// the CommandLineBuilderExtension Append*IfNotNull helpers).
+            /// </summary>
+            private string AbsolutizeIfNotEmpty(string path)
+                => string.IsNullOrEmpty(path) ? path : TaskEnvironment.GetAbsolutePath(path).Value;
+
             /// <summary>
             /// Validates the parameters passed to the task
             /// </summary>