Set Form=Unqualified on elements if elementFormDefault is unset (fixes #255)

Michael Ganss · Michael Ganss · commit bc9172a2e8a9 · 2021-03-17T18:43:10.000+01:00
diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
@@ -1255,7 +1255,7 @@ private IEnumerable<CodeAttributeDeclaration> GetAttributes(bool isArray, TypeMo
                             new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(CodeUtilities.CreateTypeReference(typeof(XmlSchemaForm), Configuration)),
                                 "Qualified")));
                     }
-                    else if (Form == XmlSchemaForm.Unqualified && !IsAttribute && !IsAny && XmlNamespace == null)
+                    else if ((Form == XmlSchemaForm.Unqualified || Form == XmlSchemaForm.None) && !IsAttribute && !IsAny && XmlNamespace == null)
                     {
                         attribute.Arguments.Add(new CodeAttributeArgument("Form",
                             new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(CodeUtilities.CreateTypeReference(typeof(XmlSchemaForm), Configuration)),

Original file line number	Diff line number	Diff line change
`@@ -1255,7 +1255,7 @@ private IEnumerable<CodeAttributeDeclaration> GetAttributes(bool isArray, TypeMo`
`1255`	`1255`	`new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(CodeUtilities.CreateTypeReference(typeof(XmlSchemaForm), Configuration)),`
`1256`	`1256`	`"Qualified")));`
`1257`	`1257`	`}`
`1258`		`- else if (Form == XmlSchemaForm.Unqualified && !IsAttribute && !IsAny && XmlNamespace == null)`
	`1258`	`+ else if ((Form == XmlSchemaForm.Unqualified \|\| Form == XmlSchemaForm.None) && !IsAttribute && !IsAny && XmlNamespace == null)`
`1259`	`1259`	`{`
`1260`	`1260`	`attribute.Arguments.Add(new CodeAttributeArgument("Form",`
`1261`	`1261`	`new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(CodeUtilities.CreateTypeReference(typeof(XmlSchemaForm), Configuration)),`