Support substitution groups

mganss · Jan 1, 2016 · 8431aac · 8431aac
1 parent 8601b8c
commit 8431aac
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 303 deletions.
diff --git a/XmlSchemaClassGenerator.Tests/AssertEx.cs b/XmlSchemaClassGenerator.Tests/AssertEx.cs
@@ -71,7 +71,7 @@ public static void Equal(object o1, object o2)
  }
  else
  {
- foreach (var prop in type1.GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(p => p.CanRead))
+ foreach (var prop in type1.GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(p => p.CanRead && !p.GetIndexParameters().Any()))
  {
  var val1 = prop.GetValue(o1);
  var val2 = prop.GetValue(o2);

diff --git a/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj b/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj
@@ -226,6 +226,10 @@
  <SubType>Designer</SubType>
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  </None>
+ <None Include="xsd\is24immotransfer\is24immotransfer.xsd">
+ <SubType>Designer</SubType>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
  <None Include="xsd\is24\common\common-1.0.xsd">
  <SubType>Designer</SubType>
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/XmlSchemaClassGenerator.Tests/XmlTests.cs b/XmlSchemaClassGenerator.Tests/XmlTests.cs
@@ -136,7 +136,7 @@ private void DeserializeSampleXml(string pattern, Assembly assembly)
 
  set.Compile();
 
- foreach (var rootElement in set.GlobalElements.Values.Cast<XmlSchemaElement>())
+ foreach (var rootElement in set.GlobalElements.Values.Cast<XmlSchemaElement>().Where(e => !e.IsAbstract))
  {
  var type = FindType(assembly, rootElement.QualifiedName);
  var serializer = new XmlSerializer(type);