Skip v3 conversions when re-converting v4 code

Rename Wix3Converter to WixConverter as the class is used for all
conversions.

9 files changed, 107 insertions, 82 deletions

diff --git a/src/WixToolset.Converters/ConvertCommand.cs b/src/WixToolset.Converters/ConvertCommand.cs
index 139b5813..51e7b997 100644
--- a/src/WixToolset.Converters/ConvertCommand.cs
+++ b/src/WixToolset.Converters/ConvertCommand.cs
@@ -133,7 +133,7 @@ namespace WixToolset.Converters
                 }
             }
 
-            var converter = new Wix3Converter(this.Messaging, this.IndentationAmount, this.ErrorsAsWarnings, this.IgnoreErrors);
+            var converter = new WixConverter(this.Messaging, this.IndentationAmount, this.ErrorsAsWarnings, this.IgnoreErrors);
 
             var errors = this.InspectSubDirectories(converter, Path.GetFullPath("."), cancellationToken);
 
@@ -204,7 +204,7 @@ namespace WixToolset.Converters
         /// </summary>
         /// <param name="directory">The directory whose sub-directories will be inspected.</param>
         /// <returns>The number of errors that were found.</returns>
-        private int InspectSubDirectories(Wix3Converter converter, string directory, CancellationToken cancellationToken)
+        private int InspectSubDirectories(WixConverter converter, string directory, CancellationToken cancellationToken)
         {
             var errors = 0;
 
diff --git a/src/WixToolset.Converters/Wix3Converter.cs b/src/WixToolset.Converters/WixConverter.cs
index 8c7d2049..a89d44ce 100644
--- a/src/WixToolset.Converters/Wix3Converter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Converters
     /// <summary>
     /// WiX source code converter.
     /// </summary>
-    public class Wix3Converter
+    public class WixConverter
     {
         private static readonly Regex AddPrefix = new Regex(@"^[^a-zA-Z_]", RegexOptions.Compiled);
         private static readonly Regex IllegalIdentifierCharacters = new Regex(@"[^A-Za-z0-9_\.]|\.{2,}", RegexOptions.Compiled); // non 'words' and assorted valid characters
@@ -98,6 +98,18 @@ namespace WixToolset.Converters
             { "http://schemas.microsoft.com/wix/2006/WixUnit", "http://wixtoolset.org/schemas/v4/wixunit" },
         };
 
+        private readonly static SortedSet<string> Wix3Namespaces = new SortedSet<string>
+        {
+            "http://schemas.microsoft.com/wix/2006/wi",
+            "http://schemas.microsoft.com/wix/2006/localization",
+        };
+
+        private readonly static SortedSet<string> Wix4Namespaces = new SortedSet<string>
+        {
+            "http://wixtoolset.org/schemas/v4/wxs",
+            "http://wixtoolset.org/schemas/v4/wxl",
+        };
+
         private readonly Dictionary<XName, Action<XElement>> ConvertElementMapping;
 
         /// <summary>
@@ -106,48 +118,48 @@ namespace WixToolset.Converters
         /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param>
         /// <param name="errorsAsWarnings">Test errors to display as warnings.</param>
         /// <param name="ignoreErrors">Test errors to ignore.</param>
-        public Wix3Converter(IMessaging messaging, int indentationAmount, IEnumerable<string> errorsAsWarnings = null, IEnumerable<string> ignoreErrors = null)
+        public WixConverter(IMessaging messaging, int indentationAmount, IEnumerable<string> errorsAsWarnings = null, IEnumerable<string> ignoreErrors = null)
         {
             this.ConvertElementMapping = new Dictionary<XName, Action<XElement>>
             {
-                { Wix3Converter.AdminExecuteSequenceElementName, this.ConvertSequenceElement },
-                { Wix3Converter.AdminUISequenceSequenceElementName, this.ConvertSequenceElement },
-                { Wix3Converter.AdvertiseExecuteSequenceElementName, this.ConvertSequenceElement },
-                { Wix3Converter.InstallUISequenceSequenceElementName, this.ConvertSequenceElement },
-                { Wix3Converter.InstallExecuteSequenceElementName, this.ConvertSequenceElement },
-                { Wix3Converter.ColumnElementName, this.ConvertColumnElement },
-                { Wix3Converter.CustomTableElementName, this.ConvertCustomTableElement },
-                { Wix3Converter.ControlElementName, this.ConvertControlElement },
-                { Wix3Converter.ComponentElementName, this.ConvertComponentElement },
-                { Wix3Converter.DirectoryElementName, this.ConvertDirectoryElement },
-                { Wix3Converter.FeatureElementName, this.ConvertFeatureElement },
-                { Wix3Converter.FileElementName, this.ConvertFileElement },
-                { Wix3Converter.FragmentElementName, this.ConvertFragmentElement },
-                { Wix3Converter.EmbeddedChainerElementName, this.ConvertEmbeddedChainerElement },
-                { Wix3Converter.ErrorElementName, this.ConvertErrorElement },
-                { Wix3Converter.ExePackageElementName, this.ConvertSuppressSignatureValidation },
-                { Wix3Converter.MsiPackageElementName, this.ConvertSuppressSignatureValidation },
-                { Wix3Converter.MspPackageElementName, this.ConvertSuppressSignatureValidation },
-                { Wix3Converter.MsuPackageElementName, this.ConvertSuppressSignatureValidation },
-                { Wix3Converter.PayloadElementName, this.ConvertSuppressSignatureValidation },
-                { Wix3Converter.PermissionExElementName, this.ConvertPermissionExElement },
-                { Wix3Converter.ProductElementName, this.ConvertProductElement },
-                { Wix3Converter.ProgressTextElementName, this.ConvertProgressTextElement },
-                { Wix3Converter.PublishElementName, this.ConvertPublishElement },
-                { Wix3Converter.MultiStringValueElementName, this.ConvertMultiStringValueElement },
-                { Wix3Converter.RequiredPrivilegeElementName, this.ConvertRequiredPrivilegeElement },
-                { Wix3Converter.RowElementName, this.ConvertRowElement },
-                { Wix3Converter.CustomActionElementName, this.ConvertCustomActionElement },
-                { Wix3Converter.ServiceArgumentElementName, this.ConvertServiceArgumentElement },
-                { Wix3Converter.SetDirectoryElementName, this.ConvertSetDirectoryElement },
-                { Wix3Converter.SetPropertyElementName, this.ConvertSetPropertyElement },
-                { Wix3Converter.ShortcutPropertyElementName, this.ConvertShortcutPropertyElement },
-                { Wix3Converter.TextElementName, this.ConvertTextElement },
-                { Wix3Converter.UITextElementName, this.ConvertUITextElement },
-                { Wix3Converter.UtilPermissionExElementName, this.ConvertUtilPermissionExElement },
-                { Wix3Converter.PropertyElementName, this.ConvertPropertyElement },
-                { Wix3Converter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
-                { Wix3Converter.IncludeElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
+                { WixConverter.AdminExecuteSequenceElementName, this.ConvertSequenceElement },
+                { WixConverter.AdminUISequenceSequenceElementName, this.ConvertSequenceElement },
+                { WixConverter.AdvertiseExecuteSequenceElementName, this.ConvertSequenceElement },
+                { WixConverter.InstallUISequenceSequenceElementName, this.ConvertSequenceElement },
+                { WixConverter.InstallExecuteSequenceElementName, this.ConvertSequenceElement },
+                { WixConverter.ColumnElementName, this.ConvertColumnElement },
+                { WixConverter.CustomTableElementName, this.ConvertCustomTableElement },
+                { WixConverter.ControlElementName, this.ConvertControlElement },
+                { WixConverter.ComponentElementName, this.ConvertComponentElement },
+                { WixConverter.DirectoryElementName, this.ConvertDirectoryElement },
+                { WixConverter.FeatureElementName, this.ConvertFeatureElement },
+                { WixConverter.FileElementName, this.ConvertFileElement },
+                { WixConverter.FragmentElementName, this.ConvertFragmentElement },
+                { WixConverter.EmbeddedChainerElementName, this.ConvertEmbeddedChainerElement },
+                { WixConverter.ErrorElementName, this.ConvertErrorElement },
+                { WixConverter.ExePackageElementName, this.ConvertSuppressSignatureValidation },
+                { WixConverter.MsiPackageElementName, this.ConvertSuppressSignatureValidation },
+                { WixConverter.MspPackageElementName, this.ConvertSuppressSignatureValidation },
+                { WixConverter.MsuPackageElementName, this.ConvertSuppressSignatureValidation },
+                { WixConverter.PayloadElementName, this.ConvertSuppressSignatureValidation },
+                { WixConverter.PermissionExElementName, this.ConvertPermissionExElement },
+                { WixConverter.ProductElementName, this.ConvertProductElement },
+                { WixConverter.ProgressTextElementName, this.ConvertProgressTextElement },
+                { WixConverter.PublishElementName, this.ConvertPublishElement },
+                { WixConverter.MultiStringValueElementName, this.ConvertMultiStringValueElement },
+                { WixConverter.RequiredPrivilegeElementName, this.ConvertRequiredPrivilegeElement },
+                { WixConverter.RowElementName, this.ConvertRowElement },
+                { WixConverter.CustomActionElementName, this.ConvertCustomActionElement },
+                { WixConverter.ServiceArgumentElementName, this.ConvertServiceArgumentElement },
+                { WixConverter.SetDirectoryElementName, this.ConvertSetDirectoryElement },
+                { WixConverter.SetPropertyElementName, this.ConvertSetPropertyElement },
+                { WixConverter.ShortcutPropertyElementName, this.ConvertShortcutPropertyElement },
+                { WixConverter.TextElementName, this.ConvertTextElement },
+                { WixConverter.UITextElementName, this.ConvertUITextElement },
+                { WixConverter.UtilPermissionExElementName, this.ConvertUtilPermissionExElement },
+                { WixConverter.PropertyElementName, this.ConvertPropertyElement },
+                { WixConverter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
+                { WixConverter.IncludeElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
             };
 
             this.Messaging = messaging;
@@ -171,6 +183,8 @@ namespace WixToolset.Converters
 
         private string SourceFile { get; set; }
 
+        private int SourceVersion { get; set; }
+
         /// <summary>
         /// Convert a file.
         /// </summary>
@@ -184,6 +198,7 @@ namespace WixToolset.Converters
             // Set the instance info.
             this.Errors = 0;
             this.SourceFile = sourceFile;
+            this.SourceVersion = 0;
 
             try
             {
@@ -225,6 +240,7 @@ namespace WixToolset.Converters
         public int ConvertDocument(XDocument document)
         {
             this.Errors = 0;
+            this.SourceVersion = 0;
 
             var declaration = document.Declaration;
 
@@ -292,13 +308,13 @@ namespace WixToolset.Converters
 
         private void EnsurePrecedingWhitespaceCorrect(XText whitespace, XNode node, int level, ConverterTestType testType)
         {
-            if (!Wix3Converter.LeadingWhitespaceValid(this.IndentationAmount, level, whitespace.Value))
+            if (!WixConverter.LeadingWhitespaceValid(this.IndentationAmount, level, whitespace.Value))
             {
                 var message = testType == ConverterTestType.WhitespacePrecedingEndElementWrong ? "The whitespace preceding this end element is incorrect." : "The whitespace preceding this node is incorrect.";
 
                 if (this.OnError(testType, node, message))
                 {
-                    Wix3Converter.FixupWhitespace(this.IndentationAmount, level, whitespace);
+                    WixConverter.FixupWhitespace(this.IndentationAmount, level, whitespace);
                 }
             }
         }
@@ -323,8 +339,17 @@ namespace WixToolset.Converters
 
             foreach (var declaration in element.Attributes().Where(a => a.IsNamespaceDeclaration))
             {
-                if (Wix3Converter.OldToNewNamespaceMapping.TryGetValue(declaration.Value, out var ns))
+                if (WixConverter.OldToNewNamespaceMapping.TryGetValue(declaration.Value, out var ns))
                 {
+                    if (Wix3Namespaces.Contains(declaration.Value))
+                    {
+                        this.SourceVersion = 3;
+                    }
+                    else if (Wix4Namespaces.Contains(declaration.Value))
+                    {
+                        this.SourceVersion = 4;
+                    }
+
                     if (this.OnError(ConverterTestType.XmlnsValueWrong, declaration, "The namespace '{0}' is out of date.  It must be '{1}'.", declaration.Value, ns.NamespaceName))
                     {
                         deprecatedToUpdatedNamespaces.Add(declaration.Value, ns);
@@ -334,7 +359,7 @@ namespace WixToolset.Converters
 
             if (deprecatedToUpdatedNamespaces.Any())
             {
-                Wix3Converter.UpdateElementsWithDeprecatedNamespaces(element.DescendantsAndSelf(), deprecatedToUpdatedNamespaces);
+                WixConverter.UpdateElementsWithDeprecatedNamespaces(element.DescendantsAndSelf(), deprecatedToUpdatedNamespaces);
             }
 
             // Apply any specialized conversion actions.
@@ -457,7 +482,7 @@ namespace WixToolset.Converters
 
         private void ConvertFileElement(XElement element)
         {
-            if (null == element.Attribute("Id"))
+            if (this.SourceVersion < 4 && null == element.Attribute("Id"))
             {
                 var attribute = element.Attribute("Name");
 
@@ -470,7 +495,7 @@ namespace WixToolset.Converters
                 {
                     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))
+                    if (this.OnError(ConverterTestType.AssignAnonymousFileId, element, "The file id is being updated to '{0}' to ensure it remains the same as the v3 default", name))
                     {
                         IEnumerable<XAttribute> attributes = element.Attributes().ToList();
                         element.RemoveAttributes();
@@ -669,7 +694,7 @@ namespace WixToolset.Converters
 
         private void ConvertUtilPermissionExElement(XElement element)
         {
-            if (null == element.Attribute("Inheritable"))
+            if (this.SourceVersion < 4 && null == element.Attribute("Inheritable"))
             {
                 var inheritable = element.Parent.Name == CreateFolderElementName;
                 if (!inheritable)
diff --git a/src/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
index 804ebe5b..3fa7c031 100644
--- a/src/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
@@ -45,7 +45,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -81,7 +81,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -117,7 +117,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -151,7 +151,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -192,7 +192,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
diff --git a/src/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
index 10029090..c205df39 100644
--- a/src/test/WixToolsetTest.Converters/ConverterFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
@@ -29,7 +29,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -62,7 +62,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 4, null, null);
+            var converter = new WixConverter(messaging, 4, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -97,7 +97,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 4, null, null);
+            var converter = new WixConverter(messaging, 4, null, null);
 
             var conversions = converter.ConvertDocument(document);
 
@@ -133,7 +133,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 4, null, null);
+            var converter = new WixConverter(messaging, 4, null, null);
 
             var conversions = converter.ConvertDocument(document);
 
@@ -160,7 +160,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -188,7 +188,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -220,7 +220,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -249,7 +249,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -277,7 +277,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -315,7 +315,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -343,7 +343,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -370,7 +370,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -396,7 +396,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -422,7 +422,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
diff --git a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs b/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
index d4fd1acf..5eaeb985 100644
--- a/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
@@ -28,7 +28,7 @@ namespace WixToolsetTest.Converters
                 File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName));
 
                 var messaging = new MockMessaging();
-                var converter = new Wix3Converter(messaging, 4);
+                var converter = new WixConverter(messaging, 4);
                 var errors = converter.ConvertFile(targetFile, true);
 
                 Assert.Equal(8, errors);
@@ -55,7 +55,7 @@ namespace WixToolsetTest.Converters
                 File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName));
 
                 var messaging = new MockMessaging();
-                var converter = new Wix3Converter(messaging, 4);
+                var converter = new WixConverter(messaging, 4);
                 var errors = converter.ConvertFile(targetFile, true);
 
                 Assert.Equal(7, errors);
@@ -164,7 +164,7 @@ namespace WixToolsetTest.Converters
         private static void EnsureFixed(string targetFile)
         {
             var messaging2 = new MockMessaging();
-            var converter2 = new Wix3Converter(messaging2, 4);
+            var converter2 = new WixConverter(messaging2, 4);
             var errors2 = converter2.ConvertFile(targetFile, true);
             Assert.Equal(0, errors2);
         }
diff --git a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs b/src/test/WixToolsetTest.Converters/CustomActionFixture.cs
index 27d45bc6..e19de6e3 100644
--- a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/CustomActionFixture.cs
@@ -34,7 +34,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -72,7 +72,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
diff --git a/src/test/WixToolsetTest.Converters/CustomTableFixture.cs b/src/test/WixToolsetTest.Converters/CustomTableFixture.cs
index b61dbb10..10ee2748 100644
--- a/src/test/WixToolsetTest.Converters/CustomTableFixture.cs
+++ b/src/test/WixToolsetTest.Converters/CustomTableFixture.cs
@@ -37,7 +37,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(4, errors);
@@ -75,7 +75,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(3, errors);
@@ -114,7 +114,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(2, errors);
@@ -150,7 +150,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(2, errors);
@@ -175,7 +175,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
diff --git a/src/test/WixToolsetTest.Converters/PropertyFixture.cs b/src/test/WixToolsetTest.Converters/PropertyFixture.cs
index 90c1e5c9..e50a6518 100644
--- a/src/test/WixToolsetTest.Converters/PropertyFixture.cs
+++ b/src/test/WixToolsetTest.Converters/PropertyFixture.cs
@@ -32,7 +32,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -66,7 +66,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
 
@@ -96,7 +96,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
             var errors = converter.ConvertDocument(document);
 
             var actual = UnformattedDocumentString(document);
diff --git a/src/test/WixToolsetTest.Converters/SequenceFixture.cs b/src/test/WixToolsetTest.Converters/SequenceFixture.cs
index 1abe6c0c..2fbc4d4a 100644
--- a/src/test/WixToolsetTest.Converters/SequenceFixture.cs
+++ b/src/test/WixToolsetTest.Converters/SequenceFixture.cs
@@ -36,7 +36,7 @@ namespace WixToolsetTest.Converters
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
 
             var messaging = new MockMessaging();
-            var converter = new Wix3Converter(messaging, 2, null, null);
+            var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
             Assert.Equal(2, errors);