Support wixout and extract Resolve and Layout from Binder

1 files changed, 29 insertions, 24 deletions

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 74ca86ac..2dd7da4d 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -154,24 +154,40 @@ namespace WixToolset.Core
                 }
 
                 // Resolve any Component Id placeholders compiled into the intermediate.
-                if (0 < this.componentIdPlaceholdersResolver.VariableCount)
+                this.ResolveComponentIdPlaceholders(target);
+            }
+            finally
+            {
+                foreach (var extension in context.Extensions)
                 {
-                    foreach (var section in target.Sections)
+                    extension.PostCompile(target);
+                }
+
+                this.Core = null;
+            }
+
+            return this.Context.Messaging.EncounteredError ? null : target;
+        }
+
+        private void ResolveComponentIdPlaceholders(Intermediate target)
+        {
+            if (0 < this.componentIdPlaceholdersResolver.VariableCount)
+            {
+                foreach (var section in target.Sections)
+                {
+                    foreach (var tuple in section.Tuples)
                     {
-                        foreach (var tuple in section.Tuples)
+                        foreach (var field in tuple.Fields)
                         {
-                            foreach (var field in tuple.Fields)
+                            if (field?.Type == IntermediateFieldType.String)
                             {
-                                if (field != null && field.Type == IntermediateFieldType.String)
+                                var data = field.AsString();
+                                if (!String.IsNullOrEmpty(data))
                                 {
-                                    var data = field.AsString();
-                                    if (!String.IsNullOrEmpty(data))
+                                    var resolved = this.componentIdPlaceholdersResolver.ResolveVariables(tuple.SourceLineNumbers, data, false, false);
+                                    if (resolved.UpdatedValue)
                                     {
-                                        var resolved = this.componentIdPlaceholdersResolver.ResolveVariables(tuple.SourceLineNumbers, data, false, false, out var defaultIgnored, out var delayedIgnored);
-                                        if (data != resolved)
-                                        {
-                                            field.Set(resolved);
-                                        }
+                                        field.Set(resolved.Value);
                                     }
                                 }
                             }
@@ -179,17 +195,6 @@ namespace WixToolset.Core
                     }
                 }
             }
-            finally
-            {
-                foreach (var extension in context.Extensions)
-                {
-                    extension.PostCompile(target);
-                }
-
-                this.Core = null;
-            }
-
-            return this.Context.Messaging.EncounteredError ? null : target;
         }
 
         /// <summary>
@@ -2422,7 +2427,7 @@ namespace WixToolset.Core
             {
                 if (isGeneratableGuidOk || keyFound && !String.IsNullOrEmpty(keyPath))
                 {
-                    this.componentIdPlaceholdersResolver.AddVariable(componentIdPlaceholder, keyPath);
+                    this.componentIdPlaceholdersResolver.AddVariable(componentIdPlaceholder, keyPath, false);
 
                     id = new Identifier(keyPath, AccessModifier.Private);
                 }