Updated dependency inspector to use the new XML metadata format.

bonsai-rx · Oct 1, 2019 · d161591 · d161591
1 parent 12506b3
commit d161591
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/Bonsai/DependencyInspector.cs b/Bonsai/DependencyInspector.cs
@@ -63,7 +63,9 @@ Configuration.PackageReference[] GetWorkflowPackageDependencies(string[] fileNam
             var assemblies = new HashSet<Assembly>();
             foreach (var path in fileNames)
             {
-                using (var reader = XmlReader.Create(path))
+                var metadata = WorkflowBuilder.ReadMetadata(path);
+                using (var markupReader = new StringReader(metadata.WorkflowMarkup))
+                using (var reader = XmlReader.Create(markupReader))
                 {
                     reader.ReadToFollowing(WorkflowElementName);
                     using (var workflowReader = reader.ReadSubtree())
@@ -87,22 +89,11 @@ Configuration.PackageReference[] GetWorkflowPackageDependencies(string[] fileNam
                             }
                         }
                     }
-
-                    reader.ReadToFollowing(ExtensionTypeElementName);
-                    reader.ReadStartElement();
-
-                    assemblies.Add(typeof(WorkflowBuilder).Assembly);
-                    while (reader.ReadToNextSibling(TypeElementName))
-                    {
-                        var typeName = reader.ReadElementString();
-                        var type = Type.GetType(typeName, false);
-                        if (type != null)
-                        {
-                            assemblies.Add(type.Assembly);
-                        }
-                    }
                 }
 
+                assemblies.Add(typeof(WorkflowBuilder).Assembly);
+                assemblies.AddRange(metadata.GetExtensionTypes().Select(type => type.Assembly));
+
                 var layoutPath = Path.ChangeExtension(path, BonsaiExtension + LayoutExtension);
                 if (File.Exists(layoutPath))
                 {