Warn if retrieving the NuGetPackageId does not work

0xced · Mar 12, 2024 · 3a03786 · 3a03786
1 parent b329b90
commit 3a03786
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/Chisel/ChiselTask.cs b/src/Chisel/ChiselTask.cs
@@ -96,7 +96,7 @@ public override bool Execute()
     {
         try
         {
-            var resolvedPackages = new HashSet<string>(RuntimeAssemblies.Select(e => e.GetMetadata("NuGetPackageId")).Concat(NativeLibraries.Select(e => e.GetMetadata("NuGetPackageId"))));
+            var resolvedPackages = new HashSet<string>(RuntimeAssemblies.Select(NuGetPackageId).Concat(NativeLibraries.Select(NuGetPackageId)));
             var graph = new DependencyGraph(resolvedPackages, ProjectAssetsFile, TargetFramework, RuntimeIdentifier, ChiselIgnores.Select(e => e.ItemSpec));
             var (removed, notFound, removedRoots) = graph.Remove(ChiselPackages.Select(e => e.ItemSpec));
 
@@ -110,8 +110,8 @@ public override bool Execute()
                 Log.LogWarning($"The package {packageName} (defined in ChiselPackages) can't be removed from the dependency graph because it's a root");
             }
 
-            RemoveRuntimeAssemblies = RuntimeAssemblies.Where(item => removed.Contains(item.GetMetadata("NuGetPackageId"))).ToArray();
-            RemoveNativeLibraries = NativeLibraries.Where(item => removed.Contains(item.GetMetadata("NuGetPackageId"))).ToArray();
+            RemoveRuntimeAssemblies = RuntimeAssemblies.Where(item => removed.Contains(NuGetPackageId(item))).ToArray();
+            RemoveNativeLibraries = NativeLibraries.Where(item => removed.Contains(NuGetPackageId(item))).ToArray();
 
             if (string.IsNullOrEmpty(Graph) || Graph.Equals("false", StringComparison.OrdinalIgnoreCase))
             {
@@ -163,4 +163,15 @@ public override bool Execute()
             return false;
         }
     }
+
+    private string NuGetPackageId(ITaskItem item)
+    {
+        var packageId = item.GetMetadata("NuGetPackageId");
+        if (string.IsNullOrEmpty(packageId))
+        {
+            var metadataNames = string.Join(", ", item.MetadataNames.OfType<string>().Select(e => $"\"{e}\""));
+            Log.LogWarning($"\"{item.ItemSpec}\" should contain \"NuGetPackageId\" metadata but contains {metadataNames}");
+        }
+        return packageId;
+    }
 }