From aa6f15ec4998a77622fafe9c510b3b547c595679 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 14 Nov 2017 23:21:52 -0800 Subject: Refactor CompilerCore to ParserHelper and other clean up --- src/WixToolset.Core/Common.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/WixToolset.Core/Common.cs') diff --git a/src/WixToolset.Core/Common.cs b/src/WixToolset.Core/Common.cs index 28e7ee7b..9a0d3aec 100644 --- a/src/WixToolset.Core/Common.cs +++ b/src/WixToolset.Core/Common.cs @@ -1,6 +1,6 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -namespace WixToolset +namespace WixToolset.Core { using System; using System.Diagnostics; @@ -13,6 +13,7 @@ namespace WixToolset using System.Xml; using System.Xml.Linq; using WixToolset.Data; + using WixToolset.Extensibility; /// /// Common Wix utility methods and types. @@ -766,8 +767,8 @@ namespace WixToolset /// The attribute's YesNoType value. internal static string GetInnerText(XElement node) { - XText text = node.Nodes().Where(n => XmlNodeType.Text == n.NodeType || XmlNodeType.CDATA == n.NodeType).Cast().FirstOrDefault(); - return (null == text) ? null : text.Value; + var text = node.Nodes().Where(n => XmlNodeType.Text == n.NodeType || XmlNodeType.CDATA == n.NodeType).Cast().FirstOrDefault(); + return text?.Value; } /// -- cgit v1.2.3-55-g6feb