From 1f57a3f457f60b4a1bfdc76b47f5e14044ec5f2c Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 6 Jan 2020 20:38:12 -0500 Subject: Add special handling for numeric Error ids. --- .../Bind/CreateOutputFromIRCommand.cs | 12 ++++++++++++ src/WixToolset.Core/Compiler.cs | 1 - src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 75eee3b6..16517e91 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -100,6 +100,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddEnvironmentTuple((EnvironmentTuple)tuple, output); break; + case TupleDefinitionType.Error: + this.AddErrorTuple((ErrorTuple)tuple, output); + break; + case TupleDefinitionType.Feature: this.AddFeatureTuple((FeatureTuple)tuple, output); break; @@ -488,6 +492,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[3] = tuple.ComponentRef; } + private void AddErrorTuple(ErrorTuple tuple, WindowsInstallerData output) + { + var table = output.EnsureTable(this.TableDefinitions["Error"]); + var row = table.CreateRow(tuple.SourceLineNumbers); + row[0] = Convert.ToInt32(tuple.Id.Id); + row[1] = tuple.Message; + } + private void AddFeatureTuple(FeatureTuple tuple, WindowsInstallerData output) { var attributes = tuple.DisallowAbsent ? WindowsInstallerConstants.MsidbFeatureAttributesUIDisallowAbsent : 0; diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 6b9fe59e..63d28e39 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -5299,7 +5299,6 @@ namespace WixToolset.Core { var tuple = new ErrorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id)) { - Error = id, Message = Common.GetInnerText(node) }; diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index a12ad469..75bbccd2 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs @@ -277,9 +277,9 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb")); var section = intermediate.Sections.Single(); - var errors = section.Tuples.OfType().ToDictionary(t => t.Error); - Assert.Equal("Category 55 Emergency Doomsday Crisis", errors[1234].Message.Trim()); - Assert.Equal(" ", errors[5678].Message); + var errors = section.Tuples.OfType().ToDictionary(t => t.Id.Id); + Assert.Equal("Category 55 Emergency Doomsday Crisis", errors["1234"].Message.Trim()); + Assert.Equal(" ", errors["5678"].Message); var customAction1 = section.Tuples.OfType().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single(); Assert.Equal("1234", customAction1.Target); -- cgit v1.2.3-55-g6feb