Fix resolution of !(bind.ProductVersion.MsiId) bind variables

Fixes wixtoolset/issues#4830

1 files changed, 3 insertions, 4 deletions

diff --git a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
index 22710aca..be0e4578 100644
--- a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
+++ b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
@@ -153,12 +153,11 @@ namespace WixToolset.Core.Bind
                     }
                     else
                     {
-                        string key = String.Format(CultureInfo.InvariantCulture, "{0}.{1}", variableId, variableScope).ToLower(CultureInfo.InvariantCulture);
-                        string resolvedValue = variableDefaultValue;
+                        var key = String.Format(CultureInfo.InvariantCulture, "{0}.{1}", variableId, variableScope).ToLower(CultureInfo.InvariantCulture);
 
-                        if (resolutionData.ContainsKey(key))
+                        if (!resolutionData.TryGetValue(key, out var resolvedValue))
                         {
-                            resolvedValue = resolutionData[key];
+                            resolvedValue = variableDefaultValue;
                         }
 
                         if ("bind" == variableNamespace)