Respect <xsl:output>-settings, but omit xml-declaration if no output-settings specified

Author: oledid

xslt-cli/XslTransformer.cs

@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Data;
 using System.IO;
+using System.Text;
 using System.Xml;
 using System.Xml.Xsl;
 
@@ -66,14 +67,38 @@ private static string TransformDataSet(DataSet dataSet, string xslt)
 				dataSet.WriteXml(dataSetXmlWriter);
 				dataSetOutputStream.Position = 0;
 
+				var stringBuilder = new StringBuilder();
+
+				var outputSettings = CreateOutputSettings(xslTransform.OutputSettings);
+
 				using (var dataSetXml = new XmlTextReader(dataSetOutputStream))
-				using (var resultOutputStream = new MemoryStream())
-				using (var resultWriter = new XmlTextWriter(resultOutputStream, encoding))
+				using (var resultWriter = XmlWriter.Create(stringBuilder, outputSettings))
 				{
 					xslTransform.Transform(dataSetXml, resultWriter);
-					return encoding.GetString(resultOutputStream.ToArray());
+					return stringBuilder.ToString();
 				}
 			}
 		}
+
+		private static XmlWriterSettings CreateOutputSettings(XmlWriterSettings settingsFromReader)
+		{
+			return new XmlWriterSettings
+			{
+				Async = settingsFromReader.Async,
+				CheckCharacters = settingsFromReader.CheckCharacters,
+				CloseOutput = settingsFromReader.CloseOutput,
+				ConformanceLevel = settingsFromReader.ConformanceLevel,
+				DoNotEscapeUriAttributes = settingsFromReader.DoNotEscapeUriAttributes,
+				Encoding = settingsFromReader.Encoding,
+				Indent = settingsFromReader.Indent,
+				IndentChars = settingsFromReader.IndentChars,
+				NamespaceHandling = settingsFromReader.NamespaceHandling,
+				NewLineChars = settingsFromReader.NewLineChars,
+				NewLineHandling = settingsFromReader.NewLineHandling,
+				NewLineOnAttributes = settingsFromReader.NewLineOnAttributes,
+				OmitXmlDeclaration = settingsFromReader.OutputMethod == XmlOutputMethod.AutoDetect || settingsFromReader.OmitXmlDeclaration,
+				WriteEndDocumentOnClose = settingsFromReader.WriteEndDocumentOnClose
+			};
+		}
 	}
 }