From 38afa9e7bc7eacc021f8805f607368a05751e3c3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 25 Jun 2020 14:43:50 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- .../Bind/CreateSpecialPropertiesCommand.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs index 5b4fe9e5..0a042f48 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Collections.Generic; using System.Linq; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class CreateSpecialPropertiesCommand { @@ -24,7 +24,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var secureProperties = new SortedSet(); var hiddenProperties = new SortedSet(); - foreach (var wixPropertyRow in this.Section.Tuples.OfType()) + foreach (var wixPropertyRow in this.Section.Symbols.OfType()) { if (wixPropertyRow.Admin) { @@ -43,7 +43,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } // Hide properties for in-script custom actions that have HideTarget set. - var hideTargetCustomActions = this.Section.Tuples.OfType().Where( + var hideTargetCustomActions = this.Section.Symbols.OfType().Where( ca => ca.Hidden && (ca.ExecutionType == CustomActionExecutionType.Deferred || ca.ExecutionType == CustomActionExecutionType.Commit @@ -52,12 +52,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind hiddenProperties.UnionWith(hideTargetCustomActions); // Ensure upgrade action properties are secure. - var actionProperties = this.Section.Tuples.OfType().Select(u => u.ActionProperty); + var actionProperties = this.Section.Symbols.OfType().Select(u => u.ActionProperty); secureProperties.UnionWith(actionProperties); if (0 < adminProperties.Count) { - this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "AdminProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "AdminProperties")) { Value = String.Join(";", adminProperties), }); @@ -65,7 +65,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (0 < secureProperties.Count) { - this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "SecureCustomProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "SecureCustomProperties")) { Value = String.Join(";", secureProperties), }); @@ -73,7 +73,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (0 < hiddenProperties.Count) { - this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties")) + this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties")) { Value = String.Join(";", hiddenProperties) }); -- cgit v1.2.3-55-g6feb