fix: Add Names to MsBuild Tasks (#136)

In #131 names were introduced in form of an alias. The names parameter was already supported before but ignored by the MsBuild tasks. This will add the names to the MsBuild tasks Co-authored-by: Carsten Igel <[email protected]>
dspace-group · Feb 14, 2023 · af0b602 · af0b602
1 parent a33c253
commit af0b602
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -290,6 +290,7 @@ The build task consumes the following [items](https://learn.microsoft.com/en-us/
 | DsComTlbExportTlbReferences  | Referenced type library files.                           |
 | DsComTlbExportReferencePaths | Directories containing type libraries to use for export. |
 | DsComTlbExportAssemblyPaths  | Assemblies to add for the export.                        |
+| DsComTlbAliasNames           | Names to use as aliases for types with aliases.          |
 
 ### Example
 

diff --git a/src/dscom.build/TlbExport.cs b/src/dscom.build/TlbExport.cs
@@ -88,6 +88,11 @@ public TlbExport() : this(new DefaultBuildContext())
     /// </summary>
     public ITaskItem[] AssemblyPaths { get; set; } = Array.Empty<ITaskItem>();
 
+    /// <summary>
+    /// Gets or sets the names to map to a new resolved name.
+    /// </summary>
+    public string[] Names { get; set; } = Array.Empty<string>();
+
     /// <inheritdoc cref="Task.Execute()" />
     public override bool Execute()
     {
@@ -171,6 +176,8 @@ private bool ExecuteTask()
         checks.VerifyDirectoriesPresent(settings.TLBRefpath, false, ref result);
         checks.VerifyFilesPresent(settings.ASMPath, false, ref result);
 
+        settings.Names = Names ?? Array.Empty<string>();
+
         // run conversion, if result has been successful.
         result = result && _context.ConvertAssemblyToTypeLib(settings, Log);
 

diff --git a/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.Task.targets b/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.Task.targets
@@ -45,6 +45,7 @@
       SourceAssemblyFile="$(_DsComExportTypeLibraryAssemblyFile)"
       TypeLibraryReferences="@(DsComTlbExportTlbReferences)"
       TypeLibraryReferencePaths="@(DsComTlbExportReferencePaths)"
-      AssemblyPaths="@(DsComTlbExportAssemblyPaths)" />
+      AssemblyPaths="@(DsComTlbExportAssemblyPaths)"
+      Names="@(DsComTlbAliasNames)" />
   </Target>
 </Project>
diff --git a/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.Tools.targets b/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.Tools.targets
@@ -44,13 +44,15 @@
       <_DsComTypeLibraryReferencePaths Condition="@(DsComTlbExportReferencePaths->Count()) &gt; 0">--tlbrefpath "@(DsComTlbExportReferencePaths, '"--tlbrefpath "')"</_DsComTypeLibraryReferencePaths>
       <_DsComAssemblyReferences Condition="@(_DsComTlbExportAssemblyPathsWithoutHintPath->Count()) &gt; 0">--asmpath "@(_DsComTlbExportAssemblyPathsWithoutHintPath, '"--asmpath "')"</_DsComAssemblyReferences>
       <_DsComAssemblyReferences Condition="@(_DsComTlbExportAssemblyPathsWithHintPath->Count()) &gt; 0">--asmpath "@(_DsComTlbExportAssemblyPathsWithHintPath->GetMetadata('HintPath'), '"--asmpath "')"</_DsComAssemblyReferences>
+      <_DsComAliasNames Condition="@(DsComTlbAliasNames->Count() &gt; 0)">--names @(DsComTlbAliasNames, --names)</_DsComAliasNames>
       <_DsComArguments>tlbexport</_DsComArguments>
       <_DsComArguments Condition="'$(DsComTypeLibraryUniqueId)' != '' AND '$(DsComTypeLibraryUniqueId)' != '$([System.Guid]::Empty.ToString())'">$(_DsComArguments) --overridetlbid "$(DsComTypeLibraryUniqueId)"</_DsComArguments>
       <_DsComArguments Condition="'$(DsComToolVerbose)' == 'true'"> $(_DsComArguments) --verbose</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) $(_DsComAssemblyReferences)</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) $(_DsComTypeLibraryReferences)</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) $(_DsComTypeLibraryReferencePaths)</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) $(_DsComExportTypeLibraryAssemblyFile)</_DsComArguments>
+      <_DsComArguments> $(_DsComArguments) $(_DsComAliasNames)</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) --out $(_DsComExportTypeLibraryTargetFile)</_DsComArguments>
     </PropertyGroup>
 

diff --git a/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.props b/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.props
@@ -42,5 +42,6 @@
     <DsComTlbExportTlbReferences Remove="*" />
     <DsComTlbExportReferencePaths Remove="*" />
     <DsComTlbExportAssemblyPaths Remove="*" />
+    <DsComTlbAliasNames Remove="*" />
   </ItemGroup>
 </Project>