2 files changed, 41 insertions, 1 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs b/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs
new file mode 100644
index 00000000..0fe60422
--- /dev/null
+++ b/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs
@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core.Burn
+{
+    using System.Xml;
+    using WixToolset.Data.Tuples;
+
+    internal class SetVariableSearchFacade : BaseSearchFacade
+    {
+        public SetVariableSearchFacade(WixSearchTuple searchTuple, WixSetVariableTuple setVariableTuple)
+        {
+            this.SearchTuple = searchTuple;
+            this.SetVariableTuple = setVariableTuple;
+        }
+
+        private WixSetVariableTuple SetVariableTuple { get; }
+
+        public override void WriteXml(XmlTextWriter writer)
+        {
+            writer.WriteStartElement("SetVariable");
+
+            base.WriteXml(writer);
+
+            if (this.SetVariableTuple.Type != null)
+            {
+                writer.WriteAttributeString("Value", this.SetVariableTuple.Value);
+                writer.WriteAttributeString("Type", this.SetVariableTuple.Type);
+            }
+
+            writer.WriteEndElement();
+        }
+    }
+}
diff --git a/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
index 55b31ed3..3f720115 100644
--- a/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
@@ -36,13 +36,16 @@ namespace WixToolset.Core.Burn.Bundles
                        t.Definition.Type == TupleDefinitionType.WixProductSearch ||
                        t.Definition.Type == TupleDefinitionType.WixRegistrySearch)
                 .ToDictionary(t => t.Id.Id);
+            var setVariablesById = this.Section.Tuples
+                .OfType<WixSetVariableTuple>()
+                .ToDictionary(t => t.Id.Id);
             var extensionSearchesById = this.Section.Tuples
                 .Where(t => t.Definition.HasTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag))
                 .ToDictionary(t => t.Id.Id);
             var searchTuples = this.Section.Tuples.OfType<WixSearchTuple>().ToList();
 
             this.ExtensionSearchTuplesByExtensionId = new Dictionary<string, IList<IntermediateTuple>>();
-            this.OrderedSearchFacades = new List<ISearchFacade>(legacySearchesById.Keys.Count + extensionSearchesById.Keys.Count);
+            this.OrderedSearchFacades = new List<ISearchFacade>(legacySearchesById.Keys.Count + setVariablesById.Keys.Count + extensionSearchesById.Keys.Count);
 
             foreach (var searchTuple in searchTuples)
             {
@@ -50,6 +53,10 @@ namespace WixToolset.Core.Burn.Bundles
                 {
                     this.OrderedSearchFacades.Add(new LegacySearchFacade(searchTuple, specificSearchTuple));
                 }
+                else if (setVariablesById.TryGetValue(searchTuple.Id.Id, out var setVariableTuple))
+                {
+                    this.OrderedSearchFacades.Add(new SetVariableSearchFacade(searchTuple, setVariableTuple));
+                }
                 else if (extensionSearchesById.TryGetValue(searchTuple.Id.Id, out var extensionSearchTuple))
                 {
                     this.OrderedSearchFacades.Add(new ExtensionSearchFacade(searchTuple));