Also take into account containing type name when choosing XmlTextAttr…

…ibute member name (yes, this collision is really happening in the schemas I need to process).

XmlSchemaClassGenerator.Tests/XmlTests.cs

@@ -402,6 +402,30 @@ public void MixedTypeMustNotCollideWithExistingMembers()
  generatedType.First());
  }
 
+ [Fact]
+ public void MixedTypeMustNotCollideWithContainingTypeName()
+ {
+ const string xsd = @"<?xml version=""1.0"" encoding=""UTF-8""?>
+<xs:schema elementFormDefault=""qualified"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"" targetNamespace=""http://local.none"" xmlns:l=""http://local.none""> 
+ <xs:element name=""document"" type=""l:Text""> 
+ </xs:element>
+ <xs:complexType name=""Text"" mixed=""true""> 
+ </xs:complexType> 
+</xs:schema>";
+
+ var generatedType = ConvertXml(nameof(MixedTypeMustNotCollideWithExistingMembers), xsd, new Generator
+ {
+ NamespaceProvider = new NamespaceProvider
+ {
+ GenerateNamespace = key => "Test"
+ }
+ });
+
+ Assert.Contains(
+ @"public string[] Text_1 { get; set; }",
+ generatedType.First());
+ }
+
  [Theory]
  [InlineData(@"xml/sameattributenames.xsd", @"xml/sameattributenames_import.xsd")]
  public void CollidingAttributeAndPropertyNamesCanBeResolved(params string[] files)

XmlSchemaClassGenerator/TypeModel.cs

@@ -402,7 +402,7 @@ public override CodeTypeDeclaration Generate()
  var propName = "Text"; 
 
  // To not collide with any existing members
- for (var propertyIndex = 1; Properties.Any(x => x.Name.Equals(propName, StringComparison.Ordinal)); propertyIndex++)
+ for (var propertyIndex = 1; Properties.Any(x => x.Name.Equals(propName, StringComparison.Ordinal)) || propName.Equals(classDeclaration.Name, StringComparison.Ordinal); propertyIndex++)
  { 
  propName = $"Text_{propertyIndex}"; 
  }