NH-3807 - Use XmlReader.Create instead of XmlTextReader.

XmlTextReader has been removed from CoreClr

Author: ngbrown

src/NHibernate/Cfg/Configuration.cs

@@ -358,25 +358,20 @@ private static void LogAndThrow(Exception exception)
 		public Configuration AddXmlFile(string xmlFile)
 		{
 			log.Info("Mapping file: " + xmlFile);
-			XmlTextReader textReader = null;
-			try
-			{
-				textReader = new XmlTextReader(xmlFile);
-				AddXmlReader(textReader, xmlFile);
-			}
-			catch (MappingException)
-			{
-				throw;
-			}
-			catch (Exception e)
+			using (TextReader streamReader = File.OpenText(xmlFile))
+			using (XmlReader textReader = XmlReader.Create(streamReader))
 			{
-				LogAndThrow(new MappingException("Could not configure datastore from file " + xmlFile, e));
-			}
-			finally
-			{
-				if (textReader != null)
+				try
+				{
+					AddXmlReader(textReader, xmlFile);
+				}
+				catch (MappingException)
 				{
-					textReader.Close();
+					throw;
+				}
+				catch (Exception e)
+				{
+					LogAndThrow(new MappingException("Could not configure datastore from file " + xmlFile, e));
 				}
 			}
 			return this;
@@ -400,28 +395,23 @@ public Configuration AddXml(string xml, string name)
 			{
 				log.Debug("Mapping XML:\n" + xml);
 			}
-			XmlTextReader reader = null;
-			try
-			{
-				reader = new XmlTextReader(xml, XmlNodeType.Document, null);
-				// make a StringReader for the string passed in - the StringReader
-				// inherits from TextReader.  We can use the XmlTextReader.ctor that
-				// takes the TextReader to build from a string...
-				AddXmlReader(reader, name);
-			}
-			catch (MappingException)
+			using (TextReader textReader = new StringReader(xml))
+			using (XmlReader reader = XmlReader.Create(textReader))
 			{
-				throw;
-			}
-			catch (Exception e)
-			{
-				LogAndThrow(new MappingException("Could not configure datastore from XML string " + name, e));
-			}
-			finally
-			{
-				if (reader != null)
+				try
+				{
+					// make a StringReader for the string passed in - the StringReader
+					// inherits from TextReader.  We can use the XmlTextReader.ctor that
+					// takes the TextReader to build from a string...
+					AddXmlReader(reader, name);
+				}
+				catch (MappingException)
+				{
+					throw;
+				}
+				catch (Exception e)
 				{
-					reader.Close();
+					LogAndThrow(new MappingException("Could not configure datastore from XML string " + name, e));
 				}
 			}
 			return this;
@@ -634,27 +624,21 @@ public Configuration AddInputStream(Stream xmlInputStream)
 		/// </remarks>
 		public Configuration AddInputStream(Stream xmlInputStream, string name)
 		{
-			XmlTextReader textReader = null;
-			try
-			{
-				textReader = new XmlTextReader(xmlInputStream);
-				AddXmlReader(textReader, name);
-				return this;
-			}
-			catch (MappingException)
-			{
-				throw;
-			}
-			catch (Exception e)
+			using (XmlReader textReader = XmlReader.Create(xmlInputStream))
 			{
-				LogAndThrow(new MappingException("Could not configure datastore from input stream " + name, e));
-				return this; // To please the compiler
-			}
-			finally
-			{
-				if (textReader != null)
+				try
+				{
+					AddXmlReader(textReader, name);
+					return this;
+				}
+				catch (MappingException)
 				{
-					textReader.Close();
+					throw;
+				}
+				catch (Exception e)
+				{
+					LogAndThrow(new MappingException("Could not configure datastore from input stream " + name, e));
+					return this; // To please the compiler
 				}
 			}
 		}
@@ -1462,19 +1446,11 @@ private Configuration Configure(string fileName, bool ignoreSessionFactoryConfig
 				properties = Environment.Properties;
 			}
 
-			XmlTextReader reader = null;
-			try
+			using (TextReader streamReader = File.OpenText(fileName))
+			using (XmlReader reader = XmlReader.Create(streamReader))
 			{
-				reader = new XmlTextReader(fileName);
 				return Configure(reader);
 			}
-			finally
-			{
-				if (reader != null)
-				{
-					reader.Close();
-				}
-			}
 		}
 
 		/// <summary>
@@ -1507,7 +1483,7 @@ public Configuration Configure(Assembly assembly, string resourceName)
 												 + " in Assembly " + assembly.FullName);
 				}
 
-				return Configure(new XmlTextReader(stream));
+				return Configure(XmlReader.Create(stream));
 			}
 		}
 

src/NHibernate/Cfg/ConfigurationSchema/HibernateConfiguration.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Xml;
 using System.Xml.XPath;
 
@@ -59,8 +60,11 @@ private HibernateConfiguration(XmlReader hbConfigurationReader, bool fromAppSett
 
 		internal static HibernateConfiguration FromAppConfig(XmlNode node)
 		{
-			XmlTextReader reader = new XmlTextReader(node.OuterXml, XmlNodeType.Document, null);
-			return new HibernateConfiguration(reader, true);
+			using (TextReader textReader = new StringReader(node.OuterXml))
+			using (XmlReader reader = XmlReader.Create(textReader))
+			{
+				return new HibernateConfiguration(reader, true);
+			}
 		}
 
 		private XmlReaderSettings GetSettings()