Merge pull request #796 from microsoft/DgmlmissingTypesNullFix

DGML fails when there is unresolved dependency
microsoft · Aug 23, 2019 · a45fc2f · a45fc2f
2 parents eb4c558 + c760a4c
commit a45fc2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/lib/Microsoft.Fx.Portability.Reports.DGML/DGMLOutputWriter.cs b/src/lib/Microsoft.Fx.Portability.Reports.DGML/DGMLOutputWriter.cs
@@ -58,7 +58,7 @@ public Task WriteStreamAsync(Stream stream, AnalyzeResponse response)
                     dgml.AddNode(nodeGuid, nodeTitle,
                         nodeCategory,
                         portabilityIndex,
-                        group: missingTypes.Length == 0 ? null : "Collapsed");
+                        group: string.IsNullOrEmpty(missingTypes) ? null : "Collapsed");
 
                     if (dgml.TryGetId(tfm, out Guid frameworkGuid))
                     {

diff --git a/src/lib/Microsoft.Fx.Portability.Reports.DGML/ReferenceNode.cs b/src/lib/Microsoft.Fx.Portability.Reports.DGML/ReferenceNode.cs
@@ -105,6 +105,12 @@ public bool TryGetAPICountFromReferences(int target, out int availAPIs, out int
 
             foreach (var item in Nodes)
             {
+                if (item.UsageData == null)
+                {
+                    // skip the Node with no UsageData
+                    continue;
+                }
+
                 if (!item.TryGetAPICountFromReferences(target, out int refCountAvail, out int refCountUnavail))
                 {
                     // Cycle!