From b62127f2f458d15ca22ff2a5398f5ed80c72a6a6 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 27 Feb 2024 18:17:33 -0500 Subject: Decompile null Message column in Error table. --- .../Decompile/Decompiler.cs | 2 +- .../TestData/Decompile/ExpectedUI.wxs | 1 + .../TestData/Decompile/ui.msi | Bin 290816 -> 290816 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs index e3609b30..788e87b8 100644 --- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs +++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs @@ -4506,7 +4506,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile { var xError = new XElement(Names.ErrorElement, new XAttribute("Id", row.FieldAsString(0)), - new XAttribute("Message", row.FieldAsString(1))); + row.IsColumnNull(1) ? null : new XAttribute("Message", row.FieldAsString(1))); this.UIElement.Add(xError); } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs index 38aa2e7a..7c90971a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs @@ -542,6 +542,7 @@ + diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi index 230cdb5d..4dea2b88 100644 Binary files a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi and b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi differ -- cgit v1.2.3-55-g6feb