Use root element name for XmlTypeAttribute if different from class name

XmlSchemaClassGenerator.Tests/XmlTests.cs

@@ -2617,7 +2617,8 @@ public void TestNetex()
  CollectionSettersMode = CollectionSettersMode.Public,
  EmitOrder = true,
  SeparateSubstitutes = true,
- GenerateInterfaces = false
+ GenerateInterfaces = false,
+ UniqueTypeNamesAcrossNamespaces = true,
  };
  var xsdFiles = new[]
  {

XmlSchemaClassGenerator/CodeUtilities.cs

@@ -14,12 +14,12 @@ namespace XmlSchemaClassGenerator
 {
  public static class CodeUtilities
  {
- private static readonly Regex invalidCharsRgx = new Regex("[^_a-zA-Z0-9]");
- private static readonly Regex whiteSpace = new Regex(@"(?<=\s)");
- private static readonly Regex startsWithLowerCaseChar = new Regex("^[a-z]");
- private static readonly Regex firstCharFollowedByUpperCasesOnly = new Regex("(?<=[A-Z])[A-Z0-9]+$");
- private static readonly Regex lowerCaseNextToNumber = new Regex("(?<=[0-9])[a-z]");
- private static readonly Regex upperCaseInside = new Regex("(?<=[A-Z])[A-Z]+?((?=[A-Z][a-z])|(?=[0-9]))");
+ private static readonly Regex invalidCharsRgx = new("[^_a-zA-Z0-9]");
+ private static readonly Regex whiteSpace = new(@"(?<=\s)");
+ private static readonly Regex startsWithLowerCaseChar = new("^[a-z]");
+ private static readonly Regex firstCharFollowedByUpperCasesOnly = new("(?<=[A-Z])[A-Z0-9]+$");
+ private static readonly Regex lowerCaseNextToNumber = new("(?<=[0-9])[a-z]");
+ private static readonly Regex upperCaseInside = new("(?<=[A-Z])[A-Z]+?((?=[A-Z][a-z])|(?=[0-9]))");
 
  // Credits: chviLadislav
  // https://stackoverflow.com/questions/18627112/how-can-i-convert-text-to-pascal-case

XmlSchemaClassGenerator/TypeModel.cs

@@ -92,11 +92,16 @@ public virtual CodeTypeDeclaration Generate()
 
  protected void GenerateTypeAttribute(CodeTypeDeclaration typeDeclaration)
  {
- if (XmlSchemaName == null || IsRedefined) return;
+ var xmlSchemaName = XmlSchemaName;
+
+ if (xmlSchemaName == null && RootElementName != null && typeDeclaration.Name != RootElementName.Name)
+ xmlSchemaName = RootElementName;
+
+ if (xmlSchemaName == null || IsRedefined) return;
 
  var typeAttribute = AttributeDecl<XmlTypeAttribute>(
- new(new CodePrimitiveExpression(XmlSchemaName.Name)),
- new(nameof(XmlRootAttribute.Namespace), new CodePrimitiveExpression(XmlSchemaName.Namespace)));
+ new(new CodePrimitiveExpression(xmlSchemaName.Name)),
+ new(nameof(XmlRootAttribute.Namespace), new CodePrimitiveExpression(xmlSchemaName.Namespace)));
 
  // don't generate AnonymousType if it's derived class, otherwise XmlSerializer will
  // complain with "InvalidOperationException: Cannot include anonymous type '...'"