From 558dd1a421d53ebb9ca3171bcccc39eb58dfec70 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 2 Mar 2022 13:53:34 -0800 Subject: Minor code cleanup --- src/wix/WixToolset.Core/Preprocessor.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/wix/WixToolset.Core/Preprocessor.cs b/src/wix/WixToolset.Core/Preprocessor.cs index 603c0e5b..486a4c8c 100644 --- a/src/wix/WixToolset.Core/Preprocessor.cs +++ b/src/wix/WixToolset.Core/Preprocessor.cs @@ -402,8 +402,7 @@ namespace WixToolset.Core switch (reader.NodeType) { case XmlNodeType.XmlDeclaration: - var document = currentContainer as XDocument; - if (null != document) + if (currentContainer is XDocument document) { document.Declaration = new XDeclaration(null, null, null); while (reader.MoveToNextAttribute()) @@ -705,15 +704,13 @@ namespace WixToolset.Core } // get the offset of this xml fragment (for some reason its always off by 1) - var lineInfoReader = reader as IXmlLineInfo; - if (null != lineInfoReader) + if (reader is IXmlLineInfo lineInfoReader) { offset += lineInfoReader.LineNumber - 1; } - var textReader = reader as XmlTextReader; // dump the xml to a string (maintaining whitespace if possible) - if (null != textReader) + if (reader is XmlTextReader textReader) { textReader.WhitespaceHandling = WhitespaceHandling.All; } @@ -1344,8 +1341,7 @@ namespace WixToolset.Core /// This is the artificial offset of the line numbers from the reader. Used for the foreach processing. private void UpdateCurrentLineNumber(ProcessingState state, XmlReader reader, int offset) { - var lineInfoReader = reader as IXmlLineInfo; - if (null != lineInfoReader) + if (reader is IXmlLineInfo lineInfoReader) { var newLine = lineInfoReader.LineNumber + offset; -- cgit v1.2.3-55-g6feb