From 7c6e29d18a5f3b89b18218bc100c1999f0e0731d Mon Sep 17 00:00:00 2001
From: Michael Ganss <michael.ganss@updatestar.com>
Date: Wed, 23 Jan 2019 13:50:11 +0100
Subject: [PATCH] Fix #98

---
 XmlSchemaClassGenerator/Generator.cs | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/XmlSchemaClassGenerator/Generator.cs b/XmlSchemaClassGenerator/Generator.cs
index b0f34d8c..b96a8884 100644
--- a/XmlSchemaClassGenerator/Generator.cs
+++ b/XmlSchemaClassGenerator/Generator.cs
@@ -202,20 +202,13 @@ public bool EnableUpaCheck
         public void Generate(IEnumerable<string> files)
         {
             var set = new XmlSchemaSet();
-            var settings = new XmlReaderSettings
-            {
-                DtdProcessing = DtdProcessing.Ignore
-            };
+            var settings = new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore };
+            var readers = files.Select(f => XmlReader.Create(f, settings));
 
-            var schemas = files.Select(f => XmlSchema.Read(XmlReader.Create(f, settings), (s, e) =>
-            {
-                Trace.TraceError(e.Message);
-            }));
+            set.ValidationEventHandler += (s, e) => Trace.TraceError(e.Message);
 
-            foreach (var s in schemas)
-            {
-                set.Add(s.TargetNamespace, s.SourceUri);
-            }
+            foreach (var reader in readers)
+                set.Add(null, reader);
 
             Generate(set);
         }