Merge pull request #227 from JoeSchimo/master

Correct order propery to correctly increment on recusion
mganss · Oct 20, 2020 · d40150d · d40150d
2 parents 561d75c + 1345d0b
commit d40150d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/XmlSchemaClassGenerator/ModelBuilder.cs b/XmlSchemaClassGenerator/ModelBuilder.cs
@@ -665,10 +665,9 @@ private IEnumerable<PropertyModel> CreatePropertiesForAttributes(Uri source, Typ
  return properties;
  }
 
- private IEnumerable<PropertyModel> CreatePropertiesForElements(Uri source, TypeModel typeModel, XmlSchemaParticle particle, IEnumerable<Particle> items)
+ private IEnumerable<PropertyModel> CreatePropertiesForElements(Uri source, TypeModel typeModel, XmlSchemaParticle particle, IEnumerable<Particle> items, int order = 0)
  {
  var properties = new List<PropertyModel>();
- var order = 0;
 
  foreach (var item in items)
  {
@@ -755,7 +754,11 @@ private IEnumerable<PropertyModel> CreatePropertiesForElements(Uri source, TypeM
  }
 
  var groupItems = GetElements(groupRef.Particle);
- var groupProperties = CreatePropertiesForElements(source, typeModel, item.XmlParticle, groupItems);
+ var groupProperties = CreatePropertiesForElements(source, typeModel, item.XmlParticle, groupItems, order).ToList();
+ if (_configuration.EmitOrder)
+ {
+ order += groupProperties.Count;
+ }
  properties.AddRange(groupProperties);
  }
  }