From 97a70bbc1b90cb26f8c77d83e703689d15d08761 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 5 Nov 2019 22:33:33 -0800 Subject: Fix resolution of !(bind.ProductVersion.MsiId) bind variables Fixes wixtoolset/issues#4830 --- src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs') 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) -- cgit v1.2.3-55-g6feb