Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b

mcs/class/System.XML/System.Xml/XmlConvert.cs

@@ -838,7 +838,6 @@ namespace System.Xml {
 		}
 
 #if NET_2_0 // actually NET_3_5
-#if !TARGET_JVM
 
 		public static DateTimeOffset ToDateTimeOffset (string s)
 		{
@@ -867,7 +866,6 @@ namespace System.Xml {
 		{
 			return value.ToString (format, CultureInfo.InvariantCulture);
 		}
-#endif
 
 		// it is used only from 2.1 System.Xml.Serialization.dll from
 		// MS Silverlight SDK. We don't use it so far.

mcs/class/System.XML/System.Xml/XmlInputStream.cs

@@ -466,12 +466,6 @@ namespace System.Xml
 						}
 					}
 				}
-#if TARGET_JVM
-				else {
-					if (bufLength >= 10 && Encoding.Unicode.GetString (buffer, 2, 8) == "?xml")
-						enc = Encoding.Unicode;
-				}
-#endif
 				bufPos = 0;
 				break;
 			default:

mcs/class/System.XML/System.Xml/XmlReader.cs

@@ -494,12 +494,12 @@ namespace System.Xml
 		void IDisposable.Dispose() 
 #endif
 		{
-			Dispose (false);
+			Dispose (true);
 		}
 
 		protected virtual void Dispose (bool disposing)
 		{
-			if (ReadState != ReadState.Closed)
+			if (disposing && ReadState != ReadState.Closed)
 				Close ();
 		}
 #endif