Allow MsiProperty/@value to be an empty string.

Fixes wixtoolset/issues#7798.
wixtoolset · Feb 17, 2024 · a38b07a · a38b07a
1 parent e98ff25
commit a38b07a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wxs b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wxs
@@ -8,6 +8,7 @@
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)">
         <MsiProperty Name="INSTALLLOCATION" Value="[INSTALLLOCATION]" />
         <MsiProperty Name="LICENSEKEY" Value="[LICENSEKEY]" />
+        <MsiProperty Name="BLANKPROPERTY" Value="" />
       </MsiPackage>
     </PackageGroup>
 

diff --git a/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
@@ -30,7 +30,7 @@ public void CanHideHiddenVariables()
             // Burn logging its command line.
             Assert.True(LogVerifier.MessageInLogFile(logFilePath, "InstallLocation=nothingtoseehere licensekey=*****"));
             // Burn logging the MSI install command line.
-            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "INSTALLLOCATION=\"nothingtoseehere\" LICENSEKEY=\"*****\""));
+            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "INSTALLLOCATION=\"nothingtoseehere\" LICENSEKEY=\"*****\" BLANKPROPERTY=\"\""));
             Assert.False(LogVerifier.MessageInLogFile(logFilePath, "supersecretkey"));
         }
 

diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs
@@ -3340,7 +3340,7 @@ private void ParseMsiPropertyElement(XElement node, string packageId)
                             name = this.Core.GetAttributeMsiPropertyNameValue(sourceLineNumbers, attrib);
                             break;
                         case "Value":
-                            value = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            value = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty);
                             break;
                         case "Condition":
                             condition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);

diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -177,6 +177,15 @@ public void CanBuildSimpleBundle()
                     {
                         "<Payload Id='test.msi' FilePath='test.msi' FileSize='*' Hash='*' Packaging='embedded' SourcePath='a0' Container='WixAttachedContainer' />",
                     }, msiPayloads);
+
+                    var msiProperties = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsiPackage[@Id='test.msi']/burn:MsiProperty", ignoreAttributesByElementName);
+                    WixAssert.CompareLineByLine(new[]
+                    {
+                        "<MsiProperty Id='TEST' Value='1' />",
+                        "<MsiProperty Id='TESTBLANK' Value='' />",
+                        "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />",
+                        "<MsiProperty Id='MSIFASTINSTALL' Value='7' />",
+                    }, msiProperties);
                 }
 
                 var manifestResource = new Resource(ResourceType.Manifest, "#1", 1033);

diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/Bundle.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleBundle/Bundle.wxs
@@ -6,6 +6,7 @@
     <Chain>
       <MsiPackage SourceFile="test.msi">
         <MsiProperty Name="TEST" Value="1" />
+        <MsiProperty Name="TESTBLANK" Value="" />
       </MsiPackage>
     </Chain>
   </Bundle>