Fix WixCop namespaces and some C# modernization

6 files changed, 90 insertions, 89 deletions

diff --git a/src/wixcop/CommandLine/ConvertCommand.cs b/src/wixcop/CommandLine/ConvertCommand.cs
index 6af7d4ca..ab7cd359 100644
--- a/src/wixcop/CommandLine/ConvertCommand.cs
+++ b/src/wixcop/CommandLine/ConvertCommand.cs
@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml;
-using WixToolset.Extensibility.Data;
-using WixToolset.Extensibility.Services;
-
-namespace WixCop.CommandLine
+// 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.Tools.WixCop.CommandLine
 {
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Xml;
+    using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
+
     internal class ConvertCommand : ICommandLineCommand
     {
         private const string SettingsFileDefault = "wixcop.settings.xml";
@@ -69,7 +70,7 @@ namespace WixCop.CommandLine
 
             var errors = this.InspectSubDirectories(converter, Path.GetFullPath("."));
 
-            foreach (string searchPattern in this.SearchPatterns)
+            foreach (var searchPattern in this.SearchPatterns)
             {
                 if (!this.SearchPatternResults.Contains(searchPattern))
                 {
diff --git a/src/wixcop/CommandLine/HelpCommand.cs b/src/wixcop/CommandLine/HelpCommand.cs
index a75dac5c..bfb784b0 100644
--- a/src/wixcop/CommandLine/HelpCommand.cs
+++ b/src/wixcop/CommandLine/HelpCommand.cs
@@ -1,8 +1,10 @@
-using System;
-using WixToolset.Extensibility.Data;
+// 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 WixCop.CommandLine
+namespace WixToolset.Tools.WixCop.CommandLine
 {
+    using System;
+    using WixToolset.Extensibility.Data;
+
     internal class HelpCommand : ICommandLineCommand
     {
         public int Execute()
diff --git a/src/wixcop/CommandLine/WixCopCommandLineParser.cs b/src/wixcop/CommandLine/WixCopCommandLineParser.cs
index 53012cfd..ae826d4f 100644
--- a/src/wixcop/CommandLine/WixCopCommandLineParser.cs
+++ b/src/wixcop/CommandLine/WixCopCommandLineParser.cs
@@ -1,12 +1,14 @@
-using System;
-using System.Collections.Generic;
-using WixCop.Interfaces;
-using WixToolset.Core;
-using WixToolset.Extensibility.Data;
-using WixToolset.Extensibility.Services;
+// 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 WixCop.CommandLine
+namespace WixToolset.Tools.WixCop.CommandLine
 {
+    using System;
+    using System.Collections.Generic;
+    using WixToolset.Core;
+    using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
+    using WixToolset.Tools.WixCop.Interfaces;
+
     public sealed class WixCopCommandLineParser : IWixCopCommandLineParser
     {
         private bool fixErrors;
@@ -89,43 +91,43 @@ namespace WixCop.CommandLine
 
             switch (parameter.ToLowerInvariant())
             {
-                case "?":
-                    this.showHelp = true;
-                    return true;
-                case "f":
-                    this.fixErrors = true;
-                    return true;
-                case "nologo":
-                    this.showLogo = false;
-                    return true;
-                case "s":
-                    this.subDirectories = true;
-                    return true;
-                default: // other parameters
-                    if (parameter.StartsWith("set1", StringComparison.Ordinal))
-                    {
-                        this.settingsFile1 = parameter.Substring(4);
-                    }
-                    else if (parameter.StartsWith("set2", StringComparison.Ordinal))
-                    {
-                        this.settingsFile2 = parameter.Substring(4);
-                    }
-                    else if (parameter.StartsWith("indent:", StringComparison.Ordinal))
+            case "?":
+                this.showHelp = true;
+                return true;
+            case "f":
+                this.fixErrors = true;
+                return true;
+            case "nologo":
+                this.showLogo = false;
+                return true;
+            case "s":
+                this.subDirectories = true;
+                return true;
+            default: // other parameters
+                if (parameter.StartsWith("set1", StringComparison.Ordinal))
+                {
+                    this.settingsFile1 = parameter.Substring(4);
+                }
+                else if (parameter.StartsWith("set2", StringComparison.Ordinal))
+                {
+                    this.settingsFile2 = parameter.Substring(4);
+                }
+                else if (parameter.StartsWith("indent:", StringComparison.Ordinal))
+                {
+                    try
                     {
-                        try
-                        {
-                            this.indentationAmount = Convert.ToInt32(parameter.Substring(7));
-                        }
-                        catch
-                        {
-                            throw new ArgumentException("Invalid numeric argument.", parameter);
-                        }
+                        this.indentationAmount = Convert.ToInt32(parameter.Substring(7));
                     }
-                    else
+                    catch
                     {
-                        throw new ArgumentException("Invalid argument.", parameter);
+                        throw new ArgumentException("Invalid numeric argument.", parameter);
                     }
-                    return true;
+                }
+                else
+                {
+                    throw new ArgumentException("Invalid argument.", parameter);
+                }
+                return true;
             }
         }
     }
diff --git a/src/wixcop/Converter.cs b/src/wixcop/Converter.cs
index a204ebe0..7e8486ab 100644
--- a/src/wixcop/Converter.cs
+++ b/src/wixcop/Converter.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 WixCop
+namespace WixToolset.Tools.WixCop
 {
     using System;
     using System.Collections.Generic;
@@ -141,7 +141,7 @@ namespace WixCop
             {
                 try
                 {
-                    using (StreamWriter writer = File.CreateText(this.SourceFile))
+                    using (var writer = File.CreateText(this.SourceFile))
                     {
                         document.Save(writer, SaveOptions.DisableFormatting | SaveOptions.OmitDuplicateNamespaces);
                     }
@@ -162,7 +162,7 @@ namespace WixCop
         /// <returns>The number of errors found.</returns>
         public int ConvertDocument(XDocument document)
         {
-            XDeclaration declaration = document.Declaration;
+            var declaration = document.Declaration;
 
             // Convert the declaration.
             if (null != declaration)
@@ -206,7 +206,7 @@ namespace WixCop
             }
 
             // Convert this node if it is an element.
-            XElement element = node as XElement;
+            var element = node as XElement;
 
             if (null != element)
             {
@@ -215,7 +215,7 @@ namespace WixCop
                 // Convert all children of this element.
                 IEnumerable<XNode> children = element.Nodes().ToList();
 
-                foreach (XNode child in children)
+                foreach (var child in children)
                 {
                     this.ConvertNode(child, level + 1);
                 }
@@ -225,9 +225,9 @@ namespace WixCop
         private void ConvertElement(XElement element)
         {
             // Gather any deprecated namespaces, then update this element tree based on those deprecations.
-            Dictionary<XNamespace, XNamespace> deprecatedToUpdatedNamespaces = new Dictionary<XNamespace, XNamespace>();
+            var deprecatedToUpdatedNamespaces = new Dictionary<XNamespace, XNamespace>();
 
-            foreach (XAttribute declaration in element.Attributes().Where(a => a.IsNamespaceDeclaration))
+            foreach (var declaration in element.Attributes().Where(a => a.IsNamespaceDeclaration))
             {
                 XNamespace ns;
 
@@ -258,7 +258,7 @@ namespace WixCop
         {
             if (null == element.Attribute("Id"))
             {
-                XAttribute attribute = element.Attribute("Name");
+                var attribute = element.Attribute("Name");
 
                 if (null == attribute)
                 {
@@ -267,7 +267,7 @@ namespace WixCop
 
                 if (null != attribute)
                 {
-                    string name = Path.GetFileName(attribute.Value);
+                    var name = Path.GetFileName(attribute.Value);
 
                     if (this.OnError(ConverterTestType.AssignAnonymousFileId, element, "The file id is being updated to '{0}' to ensure it remains the same as the default", name))
                     {
@@ -282,7 +282,7 @@ namespace WixCop
 
         private void ConvertSuppressSignatureValidation(XElement element)
         {
-            XAttribute suppressSignatureValidation = element.Attribute("SuppressSignatureValidation");
+            var suppressSignatureValidation = element.Attribute("SuppressSignatureValidation");
 
             if (null != suppressSignatureValidation)
             {
@@ -311,7 +311,7 @@ namespace WixCop
 
                 element.Add(new XAttribute("xmlns", WixNamespace.NamespaceName)); // set the default namespace.
 
-                foreach (XElement elementWithoutNamespace in element.Elements().Where(e => XNamespace.None == e.Name.Namespace))
+                foreach (var elementWithoutNamespace in element.Elements().Where(e => XNamespace.None == e.Name.Namespace))
                 {
                     elementWithoutNamespace.Name = WixNamespace.GetName(elementWithoutNamespace.Name.LocalName);
                 }
@@ -326,9 +326,7 @@ namespace WixCop
         private void ConvertWhitespace(XNode node, int level)
         {
             // Fix the whitespace before this node.
-            XText whitespace = node.PreviousNode as XText;
-
-            if (null != whitespace)
+            if (node.PreviousNode is XText whitespace)
             {
                 if (XmlNodeType.CDATA == node.NodeType)
                 {
@@ -351,9 +349,7 @@ namespace WixCop
             }
 
             // Fix the whitespace after CDATA nodes.
-            XCData cdata = node as XCData;
-
-            if (null != cdata)
+            if (node is XCData cdata)
             {
                 whitespace = cdata.NextNode as XText;
 
@@ -368,9 +364,7 @@ namespace WixCop
             else
             {
                 // Fix the whitespace inside and after this node (except for Error which may contain just whitespace).
-                XElement element = node as XElement;
-
-                if (null != element && "Error" != element.Name.LocalName)
+                if (node is XElement element && "Error" != element.Name.LocalName)
                 {
                     if (!element.HasElements && !element.IsEmpty && String.IsNullOrEmpty(element.Value.Trim()))
                     {
@@ -403,7 +397,7 @@ namespace WixCop
         {
             if (null != types)
             {
-                foreach (string type in types)
+                foreach (var type in types)
                 {
                     ConverterTestType itt;
 
@@ -421,7 +415,7 @@ namespace WixCop
 
         private static void UpdateElementsWithDeprecatedNamespaces(IEnumerable<XElement> elements, Dictionary<XNamespace, XNamespace> deprecatedToUpdatedNamespaces)
         {
-            foreach (XElement element in elements)
+            foreach (var element in elements)
             {
                 XNamespace ns;
 
@@ -434,9 +428,9 @@ namespace WixCop
                 IEnumerable<XAttribute> attributes = element.Attributes().ToList();
                 element.RemoveAttributes();
 
-                foreach (XAttribute attribute in attributes)
+                foreach (var attribute in attributes)
                 {
-                    XAttribute convertedAttribute = attribute;
+                    var convertedAttribute = attribute;
 
                     if (attribute.IsNamespaceDeclaration)
                     {
@@ -477,7 +471,7 @@ namespace WixCop
             }
 
             // check the spaces
-            foreach (char character in whitespace)
+            foreach (var character in whitespace)
             {
                 if (' ' != character)
                 {
@@ -496,9 +490,9 @@ namespace WixCop
         /// <param name="whitespace">The whitespace node to fix.</param>
         private static void FixWhitespace(int indentationAmount, int level, XText whitespace)
         {
-            int newLineCount = 0;
+            var newLineCount = 0;
 
-            for (int i = 0; i + 1 < whitespace.Value.Length; ++i)
+            for (var i = 0; i + 1 < whitespace.Value.Length; ++i)
             {
                 if (XDocumentNewLine == whitespace.Value.Substring(i, 2))
                 {
@@ -516,7 +510,7 @@ namespace WixCop
             whitespace.Value = String.Empty;
 
             // add the correct number of newlines
-            for (int i = 0; i < newLineCount; ++i)
+            for (var i = 0; i < newLineCount; ++i)
             {
                 whitespace.Value = String.Concat(whitespace.Value, XDocumentNewLine);
             }
@@ -543,9 +537,9 @@ namespace WixCop
             // Increase the error count.
             this.Errors++;
 
-            SourceLineNumber sourceLine = (null == node) ? new SourceLineNumber(this.SourceFile ?? "wixcop.exe") : new SourceLineNumber(this.SourceFile, ((IXmlLineInfo)node).LineNumber);
-            bool warning = this.ErrorsAsWarnings.Contains(converterTestType);
-            string display = String.Format(CultureInfo.CurrentCulture, message, args);
+            var sourceLine = (null == node) ? new SourceLineNumber(this.SourceFile ?? "wixcop.exe") : new SourceLineNumber(this.SourceFile, ((IXmlLineInfo)node).LineNumber);
+            var warning = this.ErrorsAsWarnings.Contains(converterTestType);
+            var display = String.Format(CultureInfo.CurrentCulture, message, args);
 
             var msg = new Message(sourceLine, warning ? MessageLevel.Warning : MessageLevel.Error, (int)converterTestType, "{0} ({1})", display, converterTestType.ToString());
 
diff --git a/src/wixcop/Interfaces/IWixCopCommandLineParser.cs b/src/wixcop/Interfaces/IWixCopCommandLineParser.cs
index 2093f5d8..44c75289 100644
--- a/src/wixcop/Interfaces/IWixCopCommandLineParser.cs
+++ b/src/wixcop/Interfaces/IWixCopCommandLineParser.cs
@@ -1,7 +1,9 @@
-using WixToolset.Extensibility.Data;
+// 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 WixCop.Interfaces
+namespace WixToolset.Tools.WixCop.Interfaces
 {
+    using WixToolset.Extensibility.Data;
+
     public interface IWixCopCommandLineParser
     {
         ICommandLineArguments Arguments { get; set; }
diff --git a/src/wixcop/Program.cs b/src/wixcop/Program.cs
index b26bd6c9..8e9534f6 100644
--- a/src/wixcop/Program.cs
+++ b/src/wixcop/Program.cs
@@ -1,15 +1,15 @@
 // 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 WixCop
+namespace WixToolset.Tools.WixCop
 {
     using System;
-    using WixCop.CommandLine;
-    using WixCop.Interfaces;
     using WixToolset.Core;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
     using WixToolset.Tools.Core;
+    using WixToolset.Tools.WixCop.CommandLine;
+    using WixToolset.Tools.WixCop.Interfaces;
 
     /// <summary>
     /// Wix source code style inspector and converter.