From 61d0e33943811cc31aeeae0c8c1c5c5768986bbe Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 11 Mar 2020 20:54:04 -0400
Subject: Fix https://github.com/wixtoolset/issues/issues/5860 recursive loc
 strings.

---
 src/WixToolset.Core/VariableResolver.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/WixToolset.Core/VariableResolver.cs')

diff --git a/src/WixToolset.Core/VariableResolver.cs b/src/WixToolset.Core/VariableResolver.cs
index 3e0b65b3..0a7916a3 100644
--- a/src/WixToolset.Core/VariableResolver.cs
+++ b/src/WixToolset.Core/VariableResolver.cs
@@ -35,7 +35,7 @@ namespace WixToolset.Core
 
         private IMessaging Messaging { get; }
 
-        public int VariableCount  => this.wixVariables.Count;
+        public int VariableCount => this.wixVariables.Count;
 
         public void AddLocalization(Localization localization)
         {
@@ -94,7 +94,7 @@ namespace WixToolset.Core
             result.IsDefault = true;
             result.Value = value;
 
-            if (0 < matches.Count)
+            while (!result.DelayedResolve && matches.Count > 0)
             {
                 var sb = new StringBuilder(value);
 
@@ -203,6 +203,8 @@ namespace WixToolset.Core
                 }
 
                 result.Value = sb.ToString();
+                value = result.Value;
+                matches = Common.WixVariableRegex.Matches(value);
             }
 
             return result;
-- 
cgit v1.2.3-55-g6feb