Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlXsdSupport.cs

@@ -41,7 +41,6 @@ namespace Commons.Xml.Nvdl
 		public override XmlReader CreateValidator (XmlReader reader,
 			XmlResolver resolver)
 		{
-#if NET_2_0
 			XmlReaderSettings s = new XmlReaderSettings ();
 			s.ValidationType = ValidationType.Schema;
 			// do not allow inline schema and schemaLocation.
@@ -50,14 +49,6 @@ namespace Commons.Xml.Nvdl
 			foreach (XmlSchema schema in schemas)
 				s.Schemas.Add (schema);
 			return XmlReader.Create (reader, s);
-#else
-			XmlValidatingReader xvr =
-				new XmlValidatingReader (reader);
-			xvr.XmlResolver = resolver;
-			foreach (XmlSchema schema in schemas)
-				xvr.Schemas.Add (schema);
-			return xvr;
-#endif
 		}
 
 		public override bool AddOption (string name, string arg)

mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Inference/RelaxngInference.cs

@@ -417,7 +417,6 @@ namespace Commons.Xml.Relaxng.Inference
 
 		private QName InferMergedType (string value, QName typeName)
 		{
-#if NET_2_0
 			// examine value against specified type and
 			// if unacceptable, then return a relaxed type.
 
@@ -436,7 +435,6 @@ namespace Commons.Xml.Relaxng.Inference
 					typeName = st != null ? st.QualifiedName : QName.Empty;
 				}
 			} while (typeName != QName.Empty);
-#endif
 			return QNameString;
 		}
 

mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Rnc/RncWriter.cs

@@ -34,11 +34,7 @@ using System.IO;
 using System.Xml;
 using Commons.Xml.Relaxng;
 
-#if NET_2_0
 using NSResolver = System.Xml.IXmlNamespaceResolver;
-#else
-using NSResolver = System.Xml.XmlNamespaceManager;
-#endif
 
 namespace Commons.Xml.Relaxng.Rnc
 {
@@ -217,11 +213,6 @@ namespace Commons.Xml.Relaxng.Rnc
 		{
 			string prefix = String.Empty;
 			if (ns != null && ns != String.Empty) {
-#if NET_2_0
-#else
-				// XmlNamespaceManager sucks.
-				ns = nss.NameTable.Add (ns);
-#endif
 				prefix = nss.LookupPrefix (ns);
 			}
 			if (prefix == null)
@@ -278,12 +269,8 @@ namespace Commons.Xml.Relaxng.Rnc
 					defaultNamespace);
 
 			if (nsmgr != null) {
-#if NET_2_0
 				foreach (string s in nsmgr.GetNamespacesInScope (
 					XmlNamespaceScope.All).Keys) {
-#else
-				foreach (string s in nsmgr) {
-#endif
 					switch (s) {
 					case "xml":
 					case "xmlns":

mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngPattern.cs

@@ -38,11 +38,7 @@ using System.Xml;
 using Commons.Xml.Relaxng.Derivative;
 using Commons.Xml.Relaxng.Rnc;
 
-#if NET_2_0
 using NSResolver = System.Xml.IXmlNamespaceResolver;
-#else
-using NSResolver = System.Xml.XmlNamespaceManager;
-#endif
 
 namespace Commons.Xml.Relaxng
 {