Fix #49

Update NuGet packages
💄

Author: Michael Ganss

XmlSchemaClassGenerator.Console/Glob.cs

@@ -494,7 +494,7 @@ public override string ToString()
         /// Returns a hash code for this instance.
         /// </summary>
         /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
         /// </returns>
         public override int GetHashCode()
         {

XmlSchemaClassGenerator.Console/Program.cs

@@ -92,7 +92,7 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
             var namespaceMap = namespaces.Select(n => ParseNamespace(n, namespacePrefix)).ToNamespaceProvider(key =>
             {
                 var xn = key.XmlSchemaNamespace;
-                var name = string.Join(".", xn.Split('/').Where(p => Regex.IsMatch(p, @"^[A-Za-z]+$") && p != "schema")
+                var name = string.Join(".", xn.Split('/').Where(p => p != "schema" && GeneratorConfiguration.IdentifierRegex.IsMatch(p))
                     .Select(n => n.ToTitleCase(NamingScheme.PascalCase)));
                 if (!string.IsNullOrEmpty(namespacePrefix)) { name = namespacePrefix + (string.IsNullOrEmpty(name) ? "" : ("." + name)); }
                 return name;
@@ -132,7 +132,7 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
             }
 
             if (verbose) { generator.Log = s => System.Console.Out.WriteLine(s); }
-            
+
             generator.Generate(files);
         }
 

XmlSchemaClassGenerator.Tests/NamespaceProviderTests.cs

@@ -20,7 +20,7 @@ public void ContainsKeyTest()
             Assert.True(ns.ContainsKey(new NamespaceKey("y")));
             Assert.False(ns.ContainsKey(new NamespaceKey("z")));
             ns.Clear();
-            Assert.Equal(0, ns.Count);
+            Assert.Empty(ns);
         }
 
         [Fact]
@@ -37,9 +37,9 @@ public void IndexTest()
             var ns = new NamespaceProvider();
             ns[new NamespaceKey("x")] = "c";
             ns.GenerateNamespace = k => k.XmlSchemaNamespace != "z" ? k.XmlSchemaNamespace : null;
-            Assert.Equal(ns[new NamespaceKey("x")], "c");
-            Assert.Equal(ns[new NamespaceKey("y")], "y");
-            Assert.Equal(ns[new NamespaceKey("y")], "y");
+            Assert.Equal("c", ns[new NamespaceKey("x")]);
+            Assert.Equal("y", ns[new NamespaceKey("y")]);
+            Assert.Equal("y", ns[new NamespaceKey("y")]);
             Assert.Throws<KeyNotFoundException>(() => ns[new NamespaceKey("z")]);
         }
     }

XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj

@@ -21,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.2.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.2.0" />
-    <PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.console" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.3.1" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

XmlSchemaClassGenerator.Tests/XsdElsterDatenabholung5.cs

@@ -88,7 +88,7 @@ public void CanCompileClasses()
             var outputName = Path.Combine(outputPath, "Elster.Test.dll");
             var fileNames = new DirectoryInfo(inputPath).GetFiles("*.cs").Select(x => x.FullName).ToArray();
             var results = provider.CompileAssemblyFromFile(new CompilerParameters(assemblies, outputName), fileNames);
-            Assert.Equal(0, results.Errors.Count);
+            Assert.Empty(results.Errors);
             results.CompiledAssembly.GetType("Elster.Datenabholung5.Elster", true);
             results.CompiledAssembly.GetType("Elster.Basis.TransferHeaderCType", true);
         }

XmlSchemaClassGenerator/GeneratorConfiguration.cs

@@ -11,6 +11,8 @@ namespace XmlSchemaClassGenerator
 {
     public class GeneratorConfiguration
     {
+        public static Regex IdentifierRegex = new Regex(@"^@?[_\p{L}\p{Nl}][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}\p{Cf}]*$", RegexOptions.Compiled);
+
         public GeneratorConfiguration()
         {
             NamespaceProvider = new NamespaceProvider()
@@ -19,7 +21,7 @@ public GeneratorConfiguration()
                 {
                     var xn = key.XmlSchemaNamespace;
                     var name = string.Join(".",
-                        xn.Split('/').Where(p => Regex.IsMatch(p, @"^[A-Za-z]+$") && p != "schema")
+                        xn.Split('/').Where(p => p != "schema" && IdentifierRegex.IsMatch(p))
                             .Select(n => n.ToTitleCase(NamingScheme.PascalCase)));
                     if (!string.IsNullOrEmpty(NamespacePrefix))
                     {

XmlSchemaClassGenerator/TypeModel.cs

@@ -597,10 +597,9 @@ private CodeTypeReference TypeReference
 
         private void AddDocs(CodeTypeMember member)
         {
-            var simpleType = PropertyType as SimpleModel;
             var docs = new List<DocumentationModel>(Documentation);
 
-            if (simpleType != null)
+            if (PropertyType is SimpleModel simpleType)
             {
                 docs.AddRange(simpleType.Documentation);
                 docs.AddRange(simpleType.Restrictions.Select(r => new DocumentationModel { Language = "en", Text = r.Description }));

XmlSchemaClassGenerator/XmlSchemaClassGenerator.csproj

@@ -52,4 +52,8 @@
     <Folder Include="Properties\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
+  </ItemGroup>
+
 </Project>