diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-01-06 20:38:12 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-01-06 20:43:15 -0500 |
| commit | 1f57a3f457f60b4a1bfdc76b47f5e14044ec5f2c (patch) | |
| tree | 8bb45ccb613c2d3b40981a77b07c1640a54a800d /src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | |
| parent | 69651a71ff2fdc1e9897b878782d79dcc1f9b896 (diff) | |
| download | wix-1f57a3f457f60b4a1bfdc76b47f5e14044ec5f2c.tar.gz wix-1f57a3f457f60b4a1bfdc76b47f5e14044ec5f2c.tar.bz2 wix-1f57a3f457f60b4a1bfdc76b47f5e14044ec5f2c.zip | |
Add special handling for numeric Error ids.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | 12 |
1 files changed, 12 insertions, 0 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 | |||
| 100 | this.AddEnvironmentTuple((EnvironmentTuple)tuple, output); | 100 | this.AddEnvironmentTuple((EnvironmentTuple)tuple, output); |
| 101 | break; | 101 | break; |
| 102 | 102 | ||
| 103 | case TupleDefinitionType.Error: | ||
| 104 | this.AddErrorTuple((ErrorTuple)tuple, output); | ||
| 105 | break; | ||
| 106 | |||
| 103 | case TupleDefinitionType.Feature: | 107 | case TupleDefinitionType.Feature: |
| 104 | this.AddFeatureTuple((FeatureTuple)tuple, output); | 108 | this.AddFeatureTuple((FeatureTuple)tuple, output); |
| 105 | break; | 109 | break; |
| @@ -488,6 +492,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 488 | row[3] = tuple.ComponentRef; | 492 | row[3] = tuple.ComponentRef; |
| 489 | } | 493 | } |
| 490 | 494 | ||
| 495 | private void AddErrorTuple(ErrorTuple tuple, WindowsInstallerData output) | ||
| 496 | { | ||
| 497 | var table = output.EnsureTable(this.TableDefinitions["Error"]); | ||
| 498 | var row = table.CreateRow(tuple.SourceLineNumbers); | ||
| 499 | row[0] = Convert.ToInt32(tuple.Id.Id); | ||
| 500 | row[1] = tuple.Message; | ||
| 501 | } | ||
| 502 | |||
| 491 | private void AddFeatureTuple(FeatureTuple tuple, WindowsInstallerData output) | 503 | private void AddFeatureTuple(FeatureTuple tuple, WindowsInstallerData output) |
| 492 | { | 504 | { |
| 493 | var attributes = tuple.DisallowAbsent ? WindowsInstallerConstants.MsidbFeatureAttributesUIDisallowAbsent : 0; | 505 | var attributes = tuple.DisallowAbsent ? WindowsInstallerConstants.MsidbFeatureAttributesUIDisallowAbsent : 0; |
