16 files changed, 316 insertions, 245 deletions

diff --git a/src/test/wixcop/ConverterFixture.cs b/src/test/WixToolsetTest.WixCop/ConverterFixture.cs
index 45ccc33e..86931d5a 100644
--- a/src/test/wixcop/ConverterFixture.cs
+++ b/src/test/WixToolsetTest.WixCop/ConverterFixture.cs
@@ -1,16 +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 WixTest.WixUnitTest
+namespace WixToolsetTest.WixCop
 {
     using System;
     using System.IO;
     using System.Text;
     using System.Xml.Linq;
-    using WixCop;
-    using WixToolset;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Services;
+    using WixToolset.Tools.WixCop;
     using Xunit;
 
     public class ConverterFixture
@@ -20,25 +19,25 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void EnsuresDeclaration()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                 "  <Fragment />",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment />",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(1, errors);
             Assert.Equal(expected, actual);
@@ -47,18 +46,18 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void EnsuresUtf8Declaration()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0'?>",
                 "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                 "    <Fragment />",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 4, null, null);
+            var converter = new Converter(messaging, 4, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
             Assert.Equal(1, errors);
             Assert.Equal("1.0", document.Declaration.Version);
@@ -68,7 +67,7 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanFixWhitespace()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                 "  <Fragment>",
@@ -78,7 +77,7 @@ namespace WixTest.WixUnitTest
                 "  </Fragment>",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "    <Fragment>",
@@ -86,14 +85,14 @@ namespace WixTest.WixUnitTest
                 "    </Fragment>",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 4, null, null);
+            var converter = new Converter(messaging, 4, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(4, errors);
             Assert.Equal(expected, actual);
@@ -102,7 +101,7 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanFixCdataWhitespace()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                 "  <Fragment>",
@@ -112,7 +111,7 @@ namespace WixTest.WixUnitTest
                 "  </Fragment>",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment>",
@@ -120,42 +119,78 @@ namespace WixTest.WixUnitTest
                 "  </Fragment>",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
+            Assert.Equal(expected, actual);
             Assert.Equal(2, errors);
+        }
+
+        [Fact]
+        public void CanFixCdataWithWhitespace()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version='1.0' encoding='utf-8'?>",
+                "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                "  <Fragment>",
+                "    <Property Id='Prop'>",
+                "       <![CDATA[",
+                "           1<2",
+                "       ]]>",
+                "    </Property>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <Property Id=\"Prop\"><![CDATA[1<2]]></Property>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new DummyMessaging();
+            var converter = new Converter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+
+            var actual = UnformattedDocumentString(document);
+
             Assert.Equal(expected, actual);
+            Assert.Equal(2, errors);
         }
 
         [Fact]
         public void CanConvertMainNamespace()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
                 "  <Fragment />",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment />",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(1, errors);
             //Assert.Equal(Wix4Namespace, document.Root.GetDefaultNamespace());
@@ -165,26 +200,26 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanConvertNamedMainNamespace()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<w:Wix xmlns:w='http://schemas.microsoft.com/wix/2006/wi'>",
                 "  <w:Fragment />",
                 "</w:Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<w:Wix xmlns:w=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <w:Fragment />",
                 "</w:Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(1, errors);
             Assert.Equal(expected, actual);
@@ -194,7 +229,7 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanConvertNonWixDefaultNamespace()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<w:Wix xmlns:w='http://schemas.microsoft.com/wix/2006/wi' xmlns='http://schemas.microsoft.com/wix/UtilExtension'>",
                 "  <w:Fragment>",
@@ -202,7 +237,7 @@ namespace WixTest.WixUnitTest
                 "  </w:Fragment>",
                 "</w:Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<w:Wix xmlns:w=\"http://wixtoolset.org/schemas/v4/wxs\" xmlns=\"http://wixtoolset.org/schemas/v4/wxs/util\">",
                 "  <w:Fragment>",
@@ -210,17 +245,17 @@ namespace WixTest.WixUnitTest
                 "  </w:Fragment>",
                 "</w:Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
-            Assert.Equal(2, errors);
             Assert.Equal(expected, actual);
+            Assert.Equal(2, errors);
             Assert.Equal(Wix4Namespace, document.Root.GetNamespaceOfPrefix("w"));
             Assert.Equal("http://wixtoolset.org/schemas/v4/wxs/util", document.Root.GetDefaultNamespace());
         }
@@ -228,26 +263,26 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanConvertExtensionNamespace()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'>",
                 "  <Fragment />",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\" xmlns:util=\"http://wixtoolset.org/schemas/v4/wxs/util\">",
                 "  <Fragment />",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(2, errors);
             Assert.Equal(expected, actual);
@@ -257,26 +292,26 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanConvertMissingNamespace()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Wix>",
                 "  <Fragment />",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment />",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(1, errors);
             Assert.Equal(expected, actual);
@@ -286,26 +321,26 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanConvertAnonymousFile()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                 "  <File Source='path\\to\\foo.txt' />",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <File Id=\"foo.txt\" Source=\"path\\to\\foo.txt\" />",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(1, errors);
             Assert.Equal(expected, actual);
@@ -314,26 +349,26 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanConvertSuppressSignatureValidationNo()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                 "  <MsiPackage SuppressSignatureValidation='no' />",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <MsiPackage EnableSignatureValidation=\"yes\" />",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(1, errors);
             Assert.Equal(expected, actual);
@@ -342,26 +377,26 @@ namespace WixTest.WixUnitTest
         [Fact]
         public void CanConvertSuppressSignatureValidationYes()
         {
-            string parse = String.Join(Environment.NewLine,
+            var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                 "  <Payload SuppressSignatureValidation='yes' />",
                 "</Wix>");
 
-            string expected = String.Join(Environment.NewLine,
+            var expected = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Payload />",
                 "</Wix>");
 
-            XDocument document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new DummyMessaging();
-            Converter converter = new Converter(messaging, 2, null, null);
+            var converter = new Converter(messaging, 2, null, null);
 
-            int errors = converter.ConvertDocument(document);
+            var errors = converter.ConvertDocument(document);
 
-            string actual = UnformattedDocumentString(document);
+            var actual = UnformattedDocumentString(document);
 
             Assert.Equal(1, errors);
             Assert.Equal(expected, actual);
@@ -369,11 +404,11 @@ namespace WixTest.WixUnitTest
 
         private static string UnformattedDocumentString(XDocument document)
         {
-            StringBuilder sb = new StringBuilder();
+            var sb = new StringBuilder();
 
-            using (StringWriter writer = new StringWriter(sb))
+            using (var writer = new StringWriter(sb))
             {
-                document.Save(writer, SaveOptions.DisableFormatting | SaveOptions.OmitDuplicateNamespaces);
+                document.Save(writer, SaveOptions.DisableFormatting);
             }
 
             return sb.ToString();
@@ -386,17 +421,16 @@ namespace WixTest.WixUnitTest
             public int LastErrorNumber { get; set; }
 
             public bool ShowVerboseMessages { get; set; }
+
             public bool SuppressAllWarnings { get; set; }
+
             public bool WarningsAsError { get; set; }
 
             public void ElevateWarningMessage(int warningNumber)
             {
             }
 
-            public string FormatMessage(Message message)
-            {
-                return "";
-            }
+            public string FormatMessage(Message message) => String.Empty;
 
             public void SetListener(IMessageListener listener)
             {
diff --git a/src/test/wixcop/TestData/Preprocessor/ConvertedPreprocessor.wxs b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs
index d6280185..d6280185 100644
--- a/src/test/wixcop/TestData/Preprocessor/ConvertedPreprocessor.wxs
+++ b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/ConvertedPreprocessor.wxs
diff --git a/src/test/wixcop/TestData/Preprocessor/Preprocessor.wxs b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs
index 2eb908c2..2eb908c2 100644
--- a/src/test/wixcop/TestData/Preprocessor/Preprocessor.wxs
+++ b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/Preprocessor.wxs
diff --git a/src/test/wixcop/TestData/Preprocessor/wixcop.settings.xml b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml
index 9d3ad496..9d3ad496 100644
--- a/src/test/wixcop/TestData/Preprocessor/wixcop.settings.xml
+++ b/src/test/WixToolsetTest.WixCop/TestData/Preprocessor/wixcop.settings.xml
diff --git a/src/test/wixcop/TestData/SingleFile/ConvertedSingleFile.wxs b/src/test/WixToolsetTest.WixCop/TestData/SingleFile/ConvertedSingleFile.wxs
index aacb68fa..aacb68fa 100644
--- a/src/test/wixcop/TestData/SingleFile/ConvertedSingleFile.wxs
+++ b/src/test/WixToolsetTest.WixCop/TestData/SingleFile/ConvertedSingleFile.wxs
diff --git a/src/test/wixcop/TestData/SingleFile/SingleFile.wxs b/src/test/WixToolsetTest.WixCop/TestData/SingleFile/SingleFile.wxs
index 310ae811..310ae811 100644
--- a/src/test/wixcop/TestData/SingleFile/SingleFile.wxs
+++ b/src/test/WixToolsetTest.WixCop/TestData/SingleFile/SingleFile.wxs
diff --git a/src/test/wixcop/WixCopFixture.cs b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs
index 1fa49be9..1025eac8 100644
--- a/src/test/wixcop/WixCopFixture.cs
+++ b/src/test/WixToolsetTest.WixCop/WixCopFixture.cs
@@ -1,18 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using WixBuildTools.TestSupport;
-using WixCop.CommandLine;
-using WixCop.Interfaces;
-using WixToolset.Core;
-using WixToolset.Core.TestPackage;
-using WixToolset.Extensibility;
-using WixToolset.Extensibility.Services;
-using Xunit;
-
-namespace WixCopTests
+// 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 WixToolsetTest.WixCop
 {
+    using System.IO;
+    using WixBuildTools.TestSupport;
+    using Xunit;
+
     public class WixCopFixture
     {
         [Fact]
@@ -37,13 +30,18 @@ namespace WixCopTests
                     },
                 };
 
-                var result = runner.Execute(out var messages);
+                var result = runner.Execute();
 
-                Assert.Equal(2, result);
+                Assert.Equal(2, result.ExitCode);
 
                 var actualLines = File.ReadAllLines(targetFile);
                 var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName));
-                Assert.Equal(expectedLines, actualLines);
+
+                for (var i = 0; i < actualLines.Length && i < expectedLines.Length; ++i)
+                {
+                    Assert.Equal(expectedLines[i], actualLines[i]);
+                }
+                Assert.Equal(expectedLines.Length, actualLines.Length);
 
                 var runner2 = new WixCopRunner
                 {
@@ -54,9 +52,9 @@ namespace WixCopTests
                     },
                 };
 
-                var result2 = runner2.Execute(out var messages2);
+                var result2 = runner2.Execute();
 
-                Assert.Equal(0, result2);
+                Assert.Equal(0, result2.ExitCode);
             }
         }
 
@@ -83,9 +81,9 @@ namespace WixCopTests
                     },
                 };
 
-                var result = runner.Execute(out var messages);
+                var result = runner.Execute();
 
-                Assert.Equal(2, result);
+                Assert.Equal(2, result.ExitCode);
 
                 var actualLines = File.ReadAllLines(targetFile);
                 var expectedLines = File.ReadAllLines(Path.Combine(folder, afterFileName));
@@ -101,61 +99,9 @@ namespace WixCopTests
                     },
                 };
 
-                var result2 = runner2.Execute(out var messages2);
-
-                Assert.Equal(0, result2);
-            }
-        }
+                var result2 = runner2.Execute();
 
-        private class WixCopRunner
-        {
-            public bool FixErrors { get; set; }
-
-            public List<string> SearchPatterns { get; } = new List<string>();
-
-            public string SettingFile1 { get; set; }
-
-            public int Execute(out List<string> messages)
-            {
-                var argList = new List<string>();
-
-                if (this.FixErrors)
-                {
-                    argList.Add("-f");
-                }
-
-                if (!String.IsNullOrEmpty(this.SettingFile1))
-                {
-                    argList.Add($"-set1{this.SettingFile1}");
-                }
-
-                foreach (string searchPattern in this.SearchPatterns)
-                {
-                    argList.Add(searchPattern);
-                }
-
-                return WixCopRunner.Execute(argList.ToArray(), out messages);
-            }
-
-            public static int Execute(string[] args, out List<string> messages)
-            {
-                var listener = new TestMessageListener();
-
-                var serviceProvider = new WixToolsetServiceProvider();
-                serviceProvider.AddService<IMessageListener>((x, y) => listener);
-                serviceProvider.AddService<IWixCopCommandLineParser>((x, y) => new WixCopCommandLineParser(x));
-
-                var result = Execute(serviceProvider, args);
-
-                var messaging = serviceProvider.GetService<IMessaging>();
-                messages = listener.Messages.Select(x => messaging.FormatMessage(x)).ToList();
-                return result;
-            }
-
-            public static int Execute(IServiceProvider serviceProvider, string[] args)
-            {
-                var wixcop = new WixCop.Program();
-                return wixcop.Run(serviceProvider, args);
+                Assert.Equal(0, result2.ExitCode);
             }
         }
     }
diff --git a/src/test/WixToolsetTest.WixCop/WixCopRunner.cs b/src/test/WixToolsetTest.WixCop/WixCopRunner.cs
new file mode 100644
index 00000000..b831baa7
--- /dev/null
+++ b/src/test/WixToolsetTest.WixCop/WixCopRunner.cs
@@ -0,0 +1,67 @@
+// 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 WixToolsetTest.WixCop
+{
+    using System;
+    using System.Collections.Generic;
+    using WixToolset.Core;
+    using WixToolset.Core.TestPackage;
+    using WixToolset.Extensibility;
+    using WixToolset.Tools.WixCop;
+    using WixToolset.Tools.WixCop.CommandLine;
+    using WixToolset.Tools.WixCop.Interfaces;
+
+    public class WixCopRunner
+    {
+        public bool FixErrors { get; set; }
+
+        public List<string> SearchPatterns { get; } = new List<string>();
+
+        public string SettingFile1 { get; set; }
+
+        public WixCopRunnerResult Execute()
+        {
+            var argList = new List<string>();
+
+            if (this.FixErrors)
+            {
+                argList.Add("-f");
+            }
+
+            if (!String.IsNullOrEmpty(this.SettingFile1))
+            {
+                argList.Add($"-set1{this.SettingFile1}");
+            }
+
+            foreach (var searchPattern in this.SearchPatterns)
+            {
+                argList.Add(searchPattern);
+            }
+
+            return WixCopRunner.Execute(argList.ToArray());
+        }
+
+        public static WixCopRunnerResult Execute(string[] args)
+        {
+            var listener = new TestMessageListener();
+
+            var serviceProvider = new WixToolsetServiceProvider();
+            serviceProvider.AddService<IMessageListener>((x, y) => listener);
+            serviceProvider.AddService<IWixCopCommandLineParser>((x, y) => new WixCopCommandLineParser(x));
+
+            var exitCode = Execute(serviceProvider, args);
+
+            return new WixCopRunnerResult
+            {
+                ExitCode = exitCode,
+                Messages = listener.Messages.ToArray()
+            };
+        }
+
+        public static int Execute(IServiceProvider serviceProvider, string[] args)
+        {
+            var wixcop = new Program();
+            return wixcop.Run(serviceProvider, args);
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.WixCop/WixCopRunnerResult.cs b/src/test/WixToolsetTest.WixCop/WixCopRunnerResult.cs
new file mode 100644
index 00000000..1b35e491
--- /dev/null
+++ b/src/test/WixToolsetTest.WixCop/WixCopRunnerResult.cs
@@ -0,0 +1,22 @@
+// 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 WixToolsetTest.WixCop
+{
+    using System;
+    using System.Linq;
+    using WixToolset.Data;
+    using Xunit;
+
+    public class WixCopRunnerResult
+    {
+        public int ExitCode { get; set; }
+
+        public Message[] Messages { get; set; }
+
+        public WixCopRunnerResult AssertSuccess()
+        {
+            Assert.True(0 == this.ExitCode, $"WixCop failed unexpectedly. Output:\r\n{String.Join("\r\n", this.Messages.Select(m => m.ToString()).ToArray())}");
+            return this;
+        }
+    }
+}
diff --git a/src/test/wixcop/WixCopTests.csproj b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
index 012ef4db..6b41b6b6 100644
--- a/src/test/wixcop/WixCopTests.csproj
+++ b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
@@ -7,6 +7,7 @@
     <IsPackable>false</IsPackable>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
+
   <ItemGroup>
     <None Remove="TestData\SingleFile\ConvertedSingleFile.wxs" />
     <None Remove="TestData\SingleFile\SingleFile.wxs" />
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.