Fix #556

Implement VS suggestions

Author: mganss

XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj

@@ -13,9 +13,10 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <LangVersion>preview</LangVersion>
-	<CoverletOutputFormat>opencover</CoverletOutputFormat>
-	<CoverletOutput>../coverage.xml</CoverletOutput>
-	<Include>[XmlSchemaClassGenerator]*</Include>
+    <CoverletOutputFormat>opencover</CoverletOutputFormat>
+    <CoverletOutput>../coverage.xml</CoverletOutput>
+    <Include>[XmlSchemaClassGenerator]*</Include>
+    <NoWarn>$(NoWarn);IDE0130;SYSLIB1045</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\XmlSampleGenerator\XmlSampleGenerator.csproj" />

XmlSchemaClassGenerator.Tests/XmlTests.cs

@@ -29,10 +29,7 @@ public class XmlTests(ITestOutputHelper output)
 
     private static IEnumerable<string> ConvertXml(string name, IEnumerable<string> xsds, Generator generatorPrototype = null)
     {
-        if (name is null)
-        {
-            throw new ArgumentNullException(nameof(name));
-        }
+        ArgumentNullException.ThrowIfNull(name);
 
         var writer = new MemoryOutputWriter();
 
@@ -729,10 +726,7 @@ public void TestXbrl()
 
         gen.NamespaceProvider.Add(new NamespaceKey("http://www.xbrl.org/2003/XLink"), "XbrlLink");
 
-        var xsdFiles = new[]
-        {
-            "xhtml-inlinexbrl-1_1.xsd",
-        }.Select(x => Path.Combine(Directory.GetCurrentDirectory(), "xsd", "xbrl", x)).ToList();
+        var xsdFiles = new[] { Path.Combine(Directory.GetCurrentDirectory(), "xsd", "xbrl", "xhtml-inlinexbrl-1_1.xsd") };
 
         var assembly = Compiler.GenerateFiles("Xbrl", xsdFiles, gen);
         Assert.NotNull(assembly);
@@ -784,8 +778,8 @@ void UnknownAttributeHandler(object sender, XmlAttributeEventArgs e)
 
     private static readonly XmlQualifiedName AnyType = new("anyType", XmlSchema.Namespace);
 
-    public static TheoryData<string> Classes => new()
-    {
+    public static TheoryData<string> Classes =>
+    [
         "ApartmentBuy",
         "ApartmentRent",
         "AssistedLiving",
@@ -806,7 +800,7 @@ void UnknownAttributeHandler(object sender, XmlAttributeEventArgs e)
         "SpecialPurpose",
         "Store",
         "TradeSite",
-    };
+    ];
 
     [Theory, TestPriority(2)]
     [MemberData(nameof(Classes))]
@@ -1974,10 +1968,10 @@ public void RefTypesGetNoXmlElementAttributeTest()
         var classType = assembly.GetType("Test.SampleRoot");
         Assert.NotNull(classType);
 
-        var directProperty = Assert.Single(classType.GetProperties().Where(p => p.Name == "Direct"));
+        var directProperty = Assert.Single(classType.GetProperties(), p => p.Name == "Direct");
         Assert.Equal(XmlSchemaForm.Unqualified, directProperty.GetCustomAttributes<XmlElementAttribute>().FirstOrDefault()?.Form);
 
-        var viaRefProperty = Assert.Single(classType.GetProperties().Where(p => p.Name == "ViaRef"));
+        var viaRefProperty = Assert.Single(classType.GetProperties(), p => p.Name == "ViaRef");
         Assert.Equal(XmlSchemaForm.None, viaRefProperty.GetCustomAttributes<XmlElementAttribute>().FirstOrDefault()?.Form);
     }
 
@@ -2718,10 +2712,8 @@ public void TestNetex()
             GenerateInterfaces = false,
             UniqueTypeNamesAcrossNamespaces = true,
         };
-        var xsdFiles = new[]
-        {
-            "NeTEx_publication.xsd",
-        }.Select(x => Path.Combine(Directory.GetCurrentDirectory(), "xsd", "netex", x)).ToList();
+
+        var xsdFiles = new[] { Path.Combine(Directory.GetCurrentDirectory(), "xsd", "netex", "NeTEx_publication.xsd") };
 
         var assembly = Compiler.GenerateFiles("Netex", xsdFiles, gen);
         Assert.NotNull(assembly);

XmlSchemaClassGenerator/TypeModel.cs

@@ -441,7 +441,7 @@ public override CodeExpression GetDefaultValueFor(string defaultString, bool att
     {
         var rootClass = AllBaseTypes.LastOrDefault();
 
-        if (rootClass is SimpleModel)
+        if (rootClass is SimpleModel || rootClass is EnumModel)
         {
             string reference, val;