aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler_2.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Compiler_2.cs')
-rw-r--r--src/WixToolset.Core/Compiler_2.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index c5f3fb6f..9e2ddb5b 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -1794,7 +1794,7 @@ namespace WixToolset.Core
1794 } 1794 }
1795 else 1795 else
1796 { 1796 {
1797 var context = new Dictionary<string, string>() { { "RegistryId", id.Id }, { "ComponentId", componentId }, { "Win64", win64Component.ToString() } }; 1797 var context = new Dictionary<string, string>() { { "RegistryId", id?.Id }, { "ComponentId", componentId }, { "Win64", win64Component.ToString() } };
1798 this.Core.ParseExtensionElement(node, child, context); 1798 this.Core.ParseExtensionElement(node, child, context);
1799 } 1799 }
1800 } 1800 }
@@ -1991,7 +1991,7 @@ namespace WixToolset.Core
1991 } 1991 }
1992 else 1992 else
1993 { 1993 {
1994 var context = new Dictionary<string, string>() { { "RegistryId", id.Id }, { "ComponentId", componentId }, { "Win64", win64Component.ToString() } }; 1994 var context = new Dictionary<string, string>() { { "RegistryId", id?.Id }, { "ComponentId", componentId }, { "Win64", win64Component.ToString() } };
1995 this.Core.ParseExtensionElement(node, child, context); 1995 this.Core.ParseExtensionElement(node, child, context);
1996 } 1996 }
1997 } 1997 }
@@ -3658,7 +3658,7 @@ namespace WixToolset.Core
3658 } 3658 }
3659 else 3659 else
3660 { 3660 {
3661 var context = new Dictionary<string, string>() { { "ServiceInstallId", id.Id }, { "ServiceInstallName", name }, { "ServiceInstallComponentId", componentId }, { "Win64", win64Component.ToString() } }; 3661 var context = new Dictionary<string, string>() { { "ServiceInstallId", id?.Id }, { "ServiceInstallName", name }, { "ServiceInstallComponentId", componentId }, { "Win64", win64Component.ToString() } };
3662 this.Core.ParseExtensionElement(node, child, context); 3662 this.Core.ParseExtensionElement(node, child, context);
3663 } 3663 }
3664 } 3664 }