From 6f096343fe2a30d5c3743244a642bfd607beebf7 Mon Sep 17 00:00:00 2001
From: Michael Ganss <michael.ganss@updatestar.com>
Date: Fri, 22 Nov 2019 18:02:08 +0100
Subject: [PATCH] Fix problem with included schemas

---
 XmlSchemaClassGenerator/ModelBuilder.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/XmlSchemaClassGenerator/ModelBuilder.cs b/XmlSchemaClassGenerator/ModelBuilder.cs
index 46d0c27d..3e90a7d4 100644
--- a/XmlSchemaClassGenerator/ModelBuilder.cs
+++ b/XmlSchemaClassGenerator/ModelBuilder.cs
@@ -44,10 +44,11 @@ public ModelBuilder(GeneratorConfiguration configuration, XmlSchemaSet set)
                 .DistinctBy(g => g.QualifiedName.ToString())
                 .ToDictionary(g => g.QualifiedName);
 
-            List<XmlSchema> dependencyOrder = new List<XmlSchema>();
+            var dependencyOrder = new List<XmlSchema>();
+            var seenSchemas = new HashSet<XmlSchema>();
             foreach (var schema in set.Schemas().Cast<XmlSchema>())
             {
-                ResolveDependencies(schema, dependencyOrder);
+                ResolveDependencies(schema, dependencyOrder, seenSchemas);
             }
 
             foreach (var schema in dependencyOrder)
@@ -59,20 +60,24 @@ public ModelBuilder(GeneratorConfiguration configuration, XmlSchemaSet set)
             }
         }
 
-        private void ResolveDependencies(XmlSchema schema, List<XmlSchema> dependencyOrder)
+        private void ResolveDependencies(XmlSchema schema, List<XmlSchema> dependencyOrder, HashSet<XmlSchema> seenSchemas)
         {
-            if (dependencyOrder.Contains(schema))
+            if (seenSchemas.Contains(schema))
                 return;
 
-            var imports = schema.Includes.OfType<XmlSchemaImport>();
+            seenSchemas.Add(schema);
+
+            var imports = schema.Includes.OfType<XmlSchemaExternal>();
+
             if (imports.Any())
             {
                 foreach (var import in imports)
                 {
                     if (import.Schema != null)
-                        ResolveDependencies(import.Schema, dependencyOrder);
+                        ResolveDependencies(import.Schema, dependencyOrder, seenSchemas);
                 }
             }
+
             dependencyOrder.Add(schema);
         }