From 2a8f47e357bfbfe20c962cade4455793e45dae7c Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 16 Nov 2020 22:13:33 -0500
Subject: Support an empty multiString registry value

---
 src/WixToolset.Core/Compiler_2.cs                                  | 7 +------
 src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs         | 2 +-
 .../TestData/Registry/RegistryValueMultiString.wxs                 | 2 ++
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index f55264e5..1922a70b 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -1977,16 +1977,11 @@ namespace WixToolset.Core
                 }
             }
 
-            if (multiStringValue == null)
-            {
-                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value"));
-            }
-
             this.Core.VerifyNoInnerText(sourceLineNumbers, node);
 
             this.Core.ParseForExtensionElements(node);
 
-            return (null == value) ? multiStringValue : String.Concat(value, "[~]", multiStringValue);
+            return null == value ? multiStringValue ?? "[~]" : String.Concat(value, "[~]", multiStringValue);
         }
 
         /// <summary>
diff --git a/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs
index 2a1e2a49..699155d4 100644
--- a/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/RegistryFixture.cs
@@ -74,7 +74,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal(new[]
                 {
                     "Registry:regitq_Wx9LfvJuNSc2un6gIHAzr4A\t2\tPath\\To\\AnotherKey\tSecret\t#x\tMultiStringComponent",
-                    "Registry:regmeTJMpOD41igfxhTcUVZ7kNG1Mo\t2\tPath\\To\\Key\t\ta[~]b[~]c\tMultiStringComponent",
+                    "Registry:regmeTJMpOD41igfxhTcUVZ7kNG1Mo\t2\tPath\\To\\Key\t\ta[~]b[~][~]c[~]\tMultiStringComponent",
                 }, results);
             }
         }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValueMultiString.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValueMultiString.wxs
index d5c680ee..c62c571d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValueMultiString.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Registry/RegistryValueMultiString.wxs
@@ -6,7 +6,9 @@
                 <RegistryValue Root="HKLM" Key="Path\To\Key" Type="multiString" KeyPath="yes">
                     <MultiString Value="a" />
                     <MultiStringValue Value="b" />
+                    <MultiStringValue />
                     <MultiString Value="c" />
+                    <MultiStringValue />
                 </RegistryValue>
                 <RegistryValue Root="HKLM" Key="Path\To\AnotherKey" Name="Secret" Type="binary"  />
             </Component>
-- 
cgit v1.2.3-55-g6feb