Fix regression in mcs/tools/mdoc by giving referencesource-based message.

(The error message is actually created by ourselves.)

diff --git a/mcs/class/System.XML/Res.cs b/mcs/class/System.XML/Res.cs
index ab445bbd6425d2d709ca984970f274e9c4c6c6b5..2965d19be7c554f4d8d04178052f2dc8e6085784 100644 (file)
--- a/mcs/class/System.XML/Res.cs
+++ b/mcs/class/System.XML/Res.cs
@@ -991,7 +991,7 @@ namespace System.Xml
                public const string Sch_ElementFromGroupBase3 = "Sch_ElementFromGroupBase3";
                public const string Sch_ElementInMixedWithFixed = "Sch_ElementInMixedWithFixed";
                public const string Sch_ElementMissing = "Sch_ElementMissing";
-               public const string Sch_ElementName = "Sch_ElementName";
+               public const string Sch_ElementName = "'{0}' element";
                public const string Sch_ElementNameAndNamespace = "Sch_ElementNameAndNamespace";
                public const string Sch_ElementNameRef = "Sch_ElementNameRef";
                public const string Sch_ElementNotAllowed = "Sch_ElementNotAllowed";
@@ -1071,7 +1071,8 @@ namespace System.Xml
                public const string Sch_InvalidElementBlockValue = "Sch_InvalidElementBlockValue";
                public const string Sch_InvalidElementContent = "Sch_InvalidElementContent";
                public const string Sch_InvalidElementContentComplex = "Sch_InvalidElementContentComplex";
-               public const string Sch_InvalidElementContentExpecting = "Sch_InvalidElementContentExpecting";
+               // There are two places that use this message, but they have different number of arguments...! One has 3, anoher has 4. We cannot fail at 3 args.
+               public const string Sch_InvalidElementContentExpecting = "Invalid start element. Within {0}, got {1}, while expected {2}.";
                public const string Sch_InvalidElementContentExpectingComplex = "Sch_InvalidElementContentExpectingComplex";
                public const string Sch_InvalidElementDefaultValue = "Sch_InvalidElementDefaultValue";
                public const string Sch_InvalidElementFinalValue = "Sch_InvalidElementFinalValue";

diff --git a/mcs/tools/mdoc/Test/validate.check.monodocer.importslashdoc b/mcs/tools/mdoc/Test/validate.check.monodocer.importslashdoc
index d99e7e69247130eb4e8fd8ac5cff0404ad256ae3..acd6c45e0b0c5f2422dff2e6959c8986e1c7e416 100644 (file)
--- a/mcs/tools/mdoc/Test/validate.check.monodocer.importslashdoc
+++ b/mcs/tools/mdoc/Test/validate.check.monodocer.importslashdoc
@@ -1,4 +1,2 @@
-mdoc: Invalid start element: :extra XML URI: Test/en.expected.importslashdoc/Mono.DocTest/Widget.xml . Line 21, Position 6.
-mdoc: Element declaration for extra is missing. XML URI: Test/en.expected.importslashdoc/Mono.DocTest/Widget.xml . Line 21, Position 6.
-mdoc: Invalid end element. There are still required content items. XML URI: Test/en.expected.importslashdoc/Mono.DocTest/Widget.xml . Line 22, Position 5.
-Total validation errors: 3
+mdoc: Invalid start element. Within 'Docs' element, got 'extra' element, while expected 'summary, param, exception, returns, remarks, example, value, permission, PermissionSet, altmember, altcompliant, since, threadsafe, typeparam, filterpriority, related' element.
+Total validation errors: 1