Merge pull request #64 from wwwDayDream/fix_critical-msbuild-error

Secondary Fix
wwwDayDream · May 18, 2024 · 5de1458 · 5de1458
2 parents 821f352 + bf2ecbe
commit 5de1458
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/CessilCellsCeaChells.MSBuild/MergeTask.cs b/CessilCellsCeaChells.MSBuild/MergeTask.cs
@@ -36,6 +36,7 @@ public class MergeTask : Task {
     private const string FileNameMetadata = "FileName";
     private const string NuGetPackageIdMetadata = "NuGetPackageId";
     private const string FullPathMetadata = "HintPath";
+    private const string FullPathMetadataAlt = "FullPath";
 
     public override bool Execute()
     {
@@ -168,5 +169,10 @@ private static string ByteArrayToString(IReadOnlyCollection<byte> data)
 
         return builder.ToString();
     }
-    private static string FilePathFromTask(ITaskItem taskItem) => taskItem.GetMetadata(FullPathMetadata);
+    private static string FilePathFromTask(ITaskItem taskItem)
+    {
+        var fullPath = taskItem.GetMetadata(FullPathMetadata);
+        fullPath = string.IsNullOrEmpty(fullPath) ? taskItem.GetMetadata(FullPathMetadataAlt) : fullPath;
+        return fullPath;
+    }
 }