From c455d2290ef903ff36d540903e27d76d473cb67c Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 27 Mar 2020 14:30:35 +1000 Subject: Add SetVariable. --- .../Bind/SetVariableSearchFacade.cs | 33 ++++++++++++++++++++++ .../Bundles/OrderSearchesCommand.cs | 9 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs (limited to 'src/WixToolset.Core.Burn') 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() + .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().ToList(); this.ExtensionSearchTuplesByExtensionId = new Dictionary>(); - this.OrderedSearchFacades = new List(legacySearchesById.Keys.Count + extensionSearchesById.Keys.Count); + this.OrderedSearchFacades = new List(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)); -- cgit v1.2.3-55-g6feb