Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.XML/Mono.Xml.XPath/XPathEditableDocument.cs

@@ -34,7 +34,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
 
 using System;
 using System.Collections;
@@ -804,4 +803,3 @@ namespace Mono.Xml.XPath
 	}
 }
 
-#endif

mcs/class/System.XML/Mono.Xml.XPath/XPathNavigatorReader.cs

@@ -218,12 +218,8 @@ namespace Mono.Xml.XPath
 
 		public override bool IsDefault {
 			get {
-#if NET_2_0
 				IXmlSchemaInfo si = current as IXmlSchemaInfo;
 				return si != null && si.IsDefault;
-#else
-				return false; // no way to check this.
-#endif
 			}
 		}
 
@@ -232,11 +228,9 @@ namespace Mono.Xml.XPath
 			get { return '\"'; }
 		}
 
-#if NET_2_0
 		public override IXmlSchemaInfo SchemaInfo {
 			get { return current.SchemaInfo; }
 		}
-#endif
 
 		public override string XmlLang {
 			get { return current.XmlLang; }
@@ -498,10 +492,8 @@ namespace Mono.Xml.XPath
 		{
 			if (eof)
 				return false;
-#if NET_2_0
 			if (Binary != null)
 				Binary.Reset ();
-#endif
 
 			switch (ReadState) {
 			case ReadState.Interactive: