diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-04 10:28:49 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-04 11:32:20 -0700 |
| commit | 110bfc5b5bfee7c4592d9898406d2250f3c96ca3 (patch) | |
| tree | 891ec77e048044553270115b714a817051b80b47 /src/WixToolset.Core/Compiler.cs | |
| parent | 90f501f6ad35a060fbb404f6a3eeaf1ac50e1a3c (diff) | |
| download | wix-110bfc5b5bfee7c4592d9898406d2250f3c96ca3.tar.gz wix-110bfc5b5bfee7c4592d9898406d2250f3c96ca3.tar.bz2 wix-110bfc5b5bfee7c4592d9898406d2250f3c96ca3.zip | |
Correctly pass extension context when Id attribute is null
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 83623883..3365789f 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -2416,7 +2416,7 @@ namespace WixToolset.Core | |||
| 2416 | } | 2416 | } |
| 2417 | else | 2417 | else |
| 2418 | { | 2418 | { |
| 2419 | var context = new Dictionary<string, string>() { { "ComponentId", id.Id }, { "DirectoryId", directoryId }, { "Win64", win64.ToString() }, }; | 2419 | var context = new Dictionary<string, string>() { { "ComponentId", id?.Id }, { "DirectoryId", directoryId }, { "Win64", win64.ToString() }, }; |
| 2420 | var possibleKeyPath = this.Core.ParsePossibleKeyPathExtensionElement(node, child, context); | 2420 | var possibleKeyPath = this.Core.ParsePossibleKeyPathExtensionElement(node, child, context); |
| 2421 | if (null != possibleKeyPath) | 2421 | if (null != possibleKeyPath) |
| 2422 | { | 2422 | { |
| @@ -5753,7 +5753,7 @@ namespace WixToolset.Core | |||
| 5753 | } | 5753 | } |
| 5754 | else | 5754 | else |
| 5755 | { | 5755 | { |
| 5756 | var context = new Dictionary<string, string>() { { "FileId", id.Id }, { "ComponentId", componentId }, { "DirectoryId", directoryId }, { "Win64", win64Component.ToString() } }; | 5756 | var context = new Dictionary<string, string>() { { "FileId", id?.Id }, { "ComponentId", componentId }, { "DirectoryId", directoryId }, { "Win64", win64Component.ToString() } }; |
| 5757 | this.Core.ParseExtensionElement(node, child, context); | 5757 | this.Core.ParseExtensionElement(node, child, context); |
| 5758 | } | 5758 | } |
| 5759 | } | 5759 | } |