Skip to content

Commit e44cd71

Browse files
committed
Fix #531
1 parent 1ae624e commit e44cd71

File tree

2 files changed

+45
-28
lines changed

2 files changed

+45
-28
lines changed

XmlSchemaClassGenerator.Tests/xsd/simple/any.xsd

+44-27
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,48 @@
77
xmlns:mstns="http://tempuri.org/default.xsd"
88
xmlns:xs="http://www.w3.org/2001/XMLSchema"
99
>
10-
<xs:complexType name="AnyTest_ExtendedString">
11-
<xs:simpleContent>
12-
<xs:extension base="xs:string">
13-
<xs:anyAttribute namespace="##any" processContents="lax"/>
14-
</xs:extension>
15-
</xs:simpleContent>
16-
</xs:complexType>
17-
18-
<xs:complexType name="AnyTest_Type">
19-
<xs:sequence/>
20-
<xs:anyAttribute namespace="##any" processContents="lax"/>
21-
</xs:complexType>
22-
23-
<xs:complexType name="AnyTest_ExtendedTypeWithAnyAttr">
24-
<xs:complexContent>
25-
<xs:extension base="AnyTest_Type">
26-
<xs:anyAttribute namespace="##any" processContents="lax"/>
27-
</xs:extension>
28-
</xs:complexContent>
29-
</xs:complexType>
30-
31-
<xs:complexType name="AnyTest_ExtendedTypeWithoutAnyAttr">
32-
<xs:complexContent>
33-
<xs:extension base="AnyTest_Type" />
34-
</xs:complexContent>
35-
</xs:complexType>
36-
10+
<xs:complexType name="AnyTest_ExtendedString">
11+
<xs:simpleContent>
12+
<xs:extension base="xs:string">
13+
<xs:anyAttribute namespace="##any" processContents="lax"/>
14+
</xs:extension>
15+
</xs:simpleContent>
16+
</xs:complexType>
17+
18+
<xs:complexType name="AnyTest_Type">
19+
<xs:sequence/>
20+
<xs:anyAttribute namespace="##any" processContents="lax"/>
21+
</xs:complexType>
22+
23+
<xs:complexType name="AnyTest_ExtendedTypeWithAnyAttr">
24+
<xs:complexContent>
25+
<xs:extension base="AnyTest_Type">
26+
<xs:anyAttribute namespace="##any" processContents="lax"/>
27+
</xs:extension>
28+
</xs:complexContent>
29+
</xs:complexType>
30+
31+
<xs:complexType name="AnyTest_ExtendedTypeWithoutAnyAttr">
32+
<xs:complexContent>
33+
<xs:extension base="AnyTest_Type" />
34+
</xs:complexContent>
35+
</xs:complexType>
36+
37+
<xs:complexType name="SaleType">
38+
<xs:attributeGroup ref="myAnyAttribute" />
39+
</xs:complexType>
40+
41+
<xs:attributeGroup name="myAnyAttribute">
42+
<xs:anyAttribute namespace="##other" />
43+
</xs:attributeGroup>
44+
45+
<xs:complexType name="StockTypeBase" />
46+
<xs:complexType name="StockType1">
47+
<xs:complexContent>
48+
<xs:extension base="StockTypeBase">
49+
<xs:anyAttribute namespace="##other" />
50+
</xs:extension>
51+
</xs:complexContent>
52+
</xs:complexType>
53+
3754
</xs:schema>

XmlSchemaClassGenerator/ModelBuilder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ private TypeModel CreateTypeModel(XmlSchemaComplexType complexType)
597597
if (baseType is not XmlSchemaComplexType baseComplexType)
598598
continue;
599599

600-
if (baseComplexType.AttributeWildcard != null)
600+
if (baseComplexType.QualifiedName != AnyType && baseComplexType.AttributeWildcard != null)
601601
{
602602
hasAnyAttribute = false;
603603
break;

0 commit comments

Comments
 (0)