[XLinq] create new instance of XmlSchemaInfo for each XObject from XmlReader.

In referencesource, XmlReader.SchemaInfo does not return different instances
for each node at its state but just returns the XmlReader itself (which
implements IXmlSchemaInfo). Hence, if we just set the corresponding
IXmlScemaInfo to each XObject, it results in inconsistent state.

This fixes two regressions in ExtensionsTest (XAttributeFailValidate and
XAttributeThrowExceptionValidate).

1 files changed, 14 insertions, 2 deletions

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Schema/Extensions.cs b/mcs/class/System.Xml.Linq/System.Xml.Schema/Extensions.cs
index 7aa0bb9f009..4c167d8094a 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Schema/Extensions.cs
+++ b/mcs/class/System.Xml.Linq/System.Xml.Schema/Extensions.cs
@@ -84,15 +84,27 @@ namespace System.Xml.Schema
 			while (xr.Read ()) {
 				if (addSchemaInfo) {
 					if (xr.NodeType == XmlNodeType.Element) {
-						xsource.CurrentNode.AddAnnotation (xr.SchemaInfo);
+						xsource.CurrentNode.AddAnnotation (CopySchemaInfo (xr.SchemaInfo));
 						while (xr.MoveToNextAttribute ())
 							if (xr.NamespaceURI != XUtil.XmlnsNamespace)
-								xsource.GetCurrentAttribute ().AddAnnotation (xr.SchemaInfo);
+								xsource.GetCurrentAttribute ().AddAnnotation (CopySchemaInfo (xr.SchemaInfo));
 						xr.MoveToElement ();
 					}
 				}
 			}
 		}
+		
+		static XmlSchemaInfo CopySchemaInfo (IXmlSchemaInfo src)
+		{
+			return new XmlSchemaInfo () {
+				IsDefault = src.IsDefault,
+				IsNil = src.IsNil,
+				MemberType = src.MemberType,
+				SchemaAttribute = src.SchemaAttribute,
+				SchemaElement = src.SchemaElement,
+				SchemaType = src.SchemaType,
+				Validity = src.Validity };
+		}
 
 		[MonoTODO]
 		public static void Validate (this XElement source, XmlSchemaObject partialValidationType, XmlSchemaSet schemas, ValidationEventHandler validationEventHandler)