3 files changed, 71 insertions, 35 deletions

diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs
index ac63f26b..c713045e 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -78,6 +78,7 @@ namespace WixToolset.Converters
         private static readonly XName VariableElementName = WixNamespace + "Variable";
         private static readonly XName UtilCloseApplicationElementName = WixUtilNamespace + "CloseApplication";
         private static readonly XName UtilPermissionExElementName = WixUtilNamespace + "PermissionEx";
+        private static readonly XName UtilRegistrySearchName = WixUtilNamespace + "RegistrySearch";
         private static readonly XName UtilXmlConfigElementName = WixUtilNamespace + "XmlConfig";
         private static readonly XName CustomActionElementName = WixNamespace + "CustomAction";
         private static readonly XName PropertyElementName = WixNamespace + "Property";
@@ -151,8 +152,8 @@ namespace WixToolset.Converters
                 { WixConverter.ErrorElementName, this.ConvertErrorElement },
                 { WixConverter.ExePackageElementName, this.ConvertSuppressSignatureValidation },
                 { WixConverter.ModuleElementName, this.ConvertModuleElement },
-                { WixConverter.MsiPackageElementName, this.ConvertSuppressSignatureValidation },
-                { WixConverter.MspPackageElementName, this.ConvertSuppressSignatureValidation },
+                { WixConverter.MsiPackageElementName, this.ConvertWindowsInstallerPackageElement },
+                { WixConverter.MspPackageElementName, this.ConvertWindowsInstallerPackageElement },
                 { WixConverter.MsuPackageElementName, this.ConvertSuppressSignatureValidation },
                 { WixConverter.PayloadElementName, this.ConvertSuppressSignatureValidation },
                 { WixConverter.PermissionExElementName, this.ConvertPermissionExElement },
@@ -171,6 +172,7 @@ namespace WixToolset.Converters
                 { WixConverter.VariableElementName, this.ConvertVariableElement },
                 { WixConverter.UtilCloseApplicationElementName, this.ConvertUtilCloseApplicationElementName },
                 { WixConverter.UtilPermissionExElementName, this.ConvertUtilPermissionExElement },
+                { WixConverter.UtilRegistrySearchName, this.ConvertUtilRegistrySearchElement },
                 { WixConverter.UtilXmlConfigElementName, this.ConvertUtilXmlConfigElement },
                 { WixConverter.PropertyElementName, this.ConvertPropertyElement },
                 { WixConverter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
@@ -863,6 +865,16 @@ namespace WixToolset.Converters
 
         private void ConvertUITextElement(XElement element) => this.ConvertInnerTextToAttribute(element, "Value");
 
+        private void ConvertWindowsInstallerPackageElement(XElement element)
+        {
+            this.ConvertSuppressSignatureValidation(element);
+
+            if (null != element.Attribute("DisplayInternalUI"))
+            {
+                this.OnError(ConverterTestType.DisplayInternalUiNotConvertable, element, "The DisplayInternalUI functionality has fundamentally changed and requires BootstrapperApplication support.");
+            }
+        }
+
         private void ConvertCustomActionElement(XElement xCustomAction)
         {
             var xBinaryKey = xCustomAction.Attribute("BinaryKey");
@@ -986,6 +998,18 @@ namespace WixToolset.Converters
             }
         }
 
+        private void ConvertUtilRegistrySearchElement(XElement element)
+        {
+            if (this.SourceVersion < 4)
+            {
+                var result = element.Attribute("Result")?.Value;
+                if (result == null || result == "value")
+                {
+                    this.OnError(ConverterTestType.UtilRegistryValueSearchBehaviorChange, element, "Breaking change: util:RegistrySearch for a value no longer clears the variable when the key or value is missing.");
+                }
+            }
+        }
+
         private void ConvertUtilXmlConfigElement(XElement element) => this.ConvertInnerTextToAttribute(element, "Value");
 
         /// <summary>
@@ -1422,6 +1446,16 @@ namespace WixToolset.Converters
             /// A MediaTemplate with no attributes set is now provided by default.
             /// </summary>
             DefaultMediaTemplate,
+
+            /// <summary>
+            /// util:RegistrySearch has breaking change when value is missing.
+            /// </summary>
+            UtilRegistryValueSearchBehaviorChange,
+
+            /// <summary>
+            /// DisplayInternalUI can't be converted.
+            /// </summary>
+            DisplayInternalUiNotConvertable,
         }
     }
 }
diff --git a/src/test/WixToolsetTest.Converters/ExtensionFixture.cs b/src/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
index 4bf2ed3d..f3437078 100644
--- a/src/test/WixToolsetTest.Converters/ExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
@@ -43,38 +43,5 @@ namespace WixToolsetTest.Converters
             var actualLines = UnformattedDocumentLines(document);
             WixAssert.CompareLineByLine(expected, actualLines);
         }
-
-        [Fact]
-        public void FixXmlConfigValue()
-        {
-            var parse = String.Join(Environment.NewLine,
-                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'>",
-                "  <Fragment>",
-                "    <util:XmlConfig Id='Change' ElementPath='book'>",
-                "      a&lt;>b",
-                "    </util:XmlConfig>",
-                "  </Fragment>",
-                "</Wix>");
-
-            var expected = new[]
-            {
-                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\" xmlns:util=\"http://wixtoolset.org/schemas/v4/wxs/util\">",
-                "  <Fragment>",
-                "    <util:XmlConfig Id=\"Change\" ElementPath=\"book\" Value=\"a&lt;&gt;b\" />",
-                "  </Fragment>",
-                "</Wix>"
-            };
-
-            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
-
-            var messaging = new MockMessaging();
-            var converter = new WixConverter(messaging, 2, null, null);
-
-            var errors = converter.ConvertDocument(document);
-            Assert.Equal(3, errors);
-
-            var actualLines = UnformattedDocumentLines(document);
-            WixAssert.CompareLineByLine(expected, actualLines);
-        }
     }
 }
diff --git a/src/test/WixToolsetTest.Converters/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
index 9d55af79..9964e3b0 100644
--- a/src/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
@@ -76,5 +76,40 @@ namespace WixToolsetTest.Converters
             var actualLines = UnformattedDocumentLines(document);
             WixAssert.CompareLineByLine(expected, actualLines);
         }
+
+        [Fact]
+        public void WarnsOnAllRegistryValueSearches()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'>",
+                "  <Fragment>",
+                "    <util:RegistrySearch Id='RegValue' Root='HKLM' Key='Converter' Variable='Test' />",
+                "    <util:RegistrySearch Id='RegValue2' Root='HKLM' Key='Converter' Variable='Test' Result='value' />",
+                "    <util:RegistrySearch Id='RegValue3' Root='HKLM' Key='Converter' Variable='Test' Result='exists' />",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\" xmlns:util=\"http://wixtoolset.org/schemas/v4/wxs/util\">",
+                "  <Fragment>",
+                "    <util:RegistrySearch Id=\"RegValue\" Root=\"HKLM\" Key=\"Converter\" Variable=\"Test\" />",
+                "    <util:RegistrySearch Id=\"RegValue2\" Root=\"HKLM\" Key=\"Converter\" Variable=\"Test\" Result=\"value\" />",
+                "    <util:RegistrySearch Id=\"RegValue3\" Root=\"HKLM\" Key=\"Converter\" Variable=\"Test\" Result=\"exists\" />",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(4, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
     }
 }