Fix filename casing in mobile_System.Data.dll.sources

[mono.git] / mcs / tools / mono-xsd / NewMonoXSD.cs

diff --git a/mcs/tools/mono-xsd/NewMonoXSD.cs b/mcs/tools/mono-xsd/NewMonoXSD.cs
index 8e332939e2a2907f96ca45f799f132724d089721..48caa8d225c1b696ae3002778c7f106be5500f71 100644 (file)
--- a/mcs/tools/mono-xsd/NewMonoXSD.cs
+++ b/mcs/tools/mono-xsd/NewMonoXSD.cs
@@ -210,6 +210,10 @@ namespace Mono.Util {
                                        Console.WriteLine (helpString);\r
                                        return;\r
                                }\r
+                               else if (option == "nologo")\r
+                               {\r
+                                       // ignore, since we do not output a logo anyway\r
+                               }\r
                                else\r
                                        Error (unknownOption, option);\r
                        }\r
@@ -255,11 +259,7 @@ namespace Mono.Util {
                                } else {\r
                                        typename = param.Substring (0, comma);\r
                                        string asmName = param.Substring (comma + 1);\r
-#if NET_1_1\r
                                        Assembly asm = Assembly.LoadFile (asmName);\r
-#else\r
-                                       Assembly asm = Assembly.LoadFrom (asmName);\r
-#endif\r
                                        if (asm == null)\r
                                                Error (generatorAssemblyNotFound, asmName);\r
                                        generatorType = asm.GetType (typename);\r
@@ -377,7 +377,7 @@ namespace Mono.Util {
                        foreach (string fileName in schemaNames)\r
                        {\r
                                StreamReader sr = new StreamReader (fileName);\r
-                               schemas.Add (XmlSchema.Read (sr, null));\r
+                               schemas.Add (XmlSchema.Read (sr, new ValidationEventHandler (HandleValidationError)));\r
                                sr.Close ();\r
 \r
                                if (targetFile == "") targetFile = Path.GetFileNameWithoutExtension (fileName);\r