aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-25 14:43:50 -0700
committerRob Mensching <rob@firegiant.com>2020-06-25 14:50:31 -0700
commit38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch)
tree803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
parent8968578d50858721317d410549a9f9b5c62bf1f7 (diff)
downloadwix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.gz
wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.bz2
wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.zip
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs14
1 files changed, 7 insertions, 7 deletions
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
6 using System.Collections.Generic; 6 using System.Collections.Generic;
7 using System.Linq; 7 using System.Linq;
8 using WixToolset.Data; 8 using WixToolset.Data;
9 using WixToolset.Data.Tuples; 9 using WixToolset.Data.Symbols;
10 10
11 internal class CreateSpecialPropertiesCommand 11 internal class CreateSpecialPropertiesCommand
12 { 12 {
@@ -24,7 +24,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
24 var secureProperties = new SortedSet<string>(); 24 var secureProperties = new SortedSet<string>();
25 var hiddenProperties = new SortedSet<string>(); 25 var hiddenProperties = new SortedSet<string>();
26 26
27 foreach (var wixPropertyRow in this.Section.Tuples.OfType<WixPropertyTuple>()) 27 foreach (var wixPropertyRow in this.Section.Symbols.OfType<WixPropertySymbol>())
28 { 28 {
29 if (wixPropertyRow.Admin) 29 if (wixPropertyRow.Admin)
30 { 30 {
@@ -43,7 +43,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
43 } 43 }
44 44
45 // Hide properties for in-script custom actions that have HideTarget set. 45 // Hide properties for in-script custom actions that have HideTarget set.
46 var hideTargetCustomActions = this.Section.Tuples.OfType<CustomActionTuple>().Where( 46 var hideTargetCustomActions = this.Section.Symbols.OfType<CustomActionSymbol>().Where(
47 ca => ca.Hidden 47 ca => ca.Hidden
48 && (ca.ExecutionType == CustomActionExecutionType.Deferred 48 && (ca.ExecutionType == CustomActionExecutionType.Deferred
49 || ca.ExecutionType == CustomActionExecutionType.Commit 49 || ca.ExecutionType == CustomActionExecutionType.Commit
@@ -52,12 +52,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
52 hiddenProperties.UnionWith(hideTargetCustomActions); 52 hiddenProperties.UnionWith(hideTargetCustomActions);
53 53
54 // Ensure upgrade action properties are secure. 54 // Ensure upgrade action properties are secure.
55 var actionProperties = this.Section.Tuples.OfType<UpgradeTuple>().Select(u => u.ActionProperty); 55 var actionProperties = this.Section.Symbols.OfType<UpgradeSymbol>().Select(u => u.ActionProperty);
56 secureProperties.UnionWith(actionProperties); 56 secureProperties.UnionWith(actionProperties);
57 57
58 if (0 < adminProperties.Count) 58 if (0 < adminProperties.Count)
59 { 59 {
60 this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "AdminProperties")) 60 this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "AdminProperties"))
61 { 61 {
62 Value = String.Join(";", adminProperties), 62 Value = String.Join(";", adminProperties),
63 }); 63 });
@@ -65,7 +65,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
65 65
66 if (0 < secureProperties.Count) 66 if (0 < secureProperties.Count)
67 { 67 {
68 this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "SecureCustomProperties")) 68 this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "SecureCustomProperties"))
69 { 69 {
70 Value = String.Join(";", secureProperties), 70 Value = String.Join(";", secureProperties),
71 }); 71 });
@@ -73,7 +73,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
73 73
74 if (0 < hiddenProperties.Count) 74 if (0 < hiddenProperties.Count)
75 { 75 {
76 this.Section.AddTuple(new PropertyTuple(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties")) 76 this.Section.AddSymbol(new PropertySymbol(null, new Identifier(AccessModifier.Private, "MsiHiddenProperties"))
77 { 77 {
78 Value = String.Join(";", hiddenProperties) 78 Value = String.Join(";", hiddenProperties)
79 }); 79 });