aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/HttpCompiler.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/HttpCompiler.cs')
-rw-r--r--src/wixext/HttpCompiler.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/wixext/HttpCompiler.cs b/src/wixext/HttpCompiler.cs
index e47990db..bc64add2 100644
--- a/src/wixext/HttpCompiler.cs
+++ b/src/wixext/HttpCompiler.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Http
7 using System.Xml.Linq; 7 using System.Xml.Linq;
8 using WixToolset.Data; 8 using WixToolset.Data;
9 using WixToolset.Extensibility; 9 using WixToolset.Extensibility;
10 using WixToolset.Http.Tuples; 10 using WixToolset.Http.Symbols;
11 11
12 /// <summary> 12 /// <summary>
13 /// The compiler for the WiX Toolset Http Extension. 13 /// The compiler for the WiX Toolset Http Extension.
@@ -169,7 +169,7 @@ namespace WixToolset.Http
169 169
170 if (!this.Messaging.EncounteredError) 170 if (!this.Messaging.EncounteredError)
171 { 171 {
172 section.AddTuple(new WixHttpUrlReservationTuple(sourceLineNumbers, id) 172 section.AddSymbol(new WixHttpUrlReservationSymbol(sourceLineNumbers, id)
173 { 173 {
174 HandleExisting = handleExisting, 174 HandleExisting = handleExisting,
175 Sddl = sddl, 175 Sddl = sddl,
@@ -180,14 +180,14 @@ namespace WixToolset.Http
180 if (this.Context.Platform == Platform.ARM) 180 if (this.Context.Platform == Platform.ARM)
181 { 181 {
182 // Ensure ARM version of the CA is referenced. 182 // Ensure ARM version of the CA is referenced.
183 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall_ARM"); 183 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall_ARM");
184 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall_ARM"); 184 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall_ARM");
185 } 185 }
186 else 186 else
187 { 187 {
188 // All other supported platforms use x86. 188 // All other supported platforms use x86.
189 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall"); 189 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall");
190 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall"); 190 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall");
191 } 191 }
192 } 192 }
193 } 193 }
@@ -205,7 +205,7 @@ namespace WixToolset.Http
205 var securityPrincipal = defaultSecurityPrincipal; 205 var securityPrincipal = defaultSecurityPrincipal;
206 var rights = HttpConstants.GENERIC_ALL; 206 var rights = HttpConstants.GENERIC_ALL;
207 string rightsValue = null; 207 string rightsValue = null;
208 208
209 foreach (var attrib in node.Attributes()) 209 foreach (var attrib in node.Attributes())
210 { 210 {
211 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) 211 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
@@ -263,7 +263,7 @@ namespace WixToolset.Http
263 263
264 if (!this.Messaging.EncounteredError) 264 if (!this.Messaging.EncounteredError)
265 { 265 {
266 section.AddTuple(new WixHttpUrlAceTuple(sourceLineNumbers, id) 266 section.AddSymbol(new WixHttpUrlAceSymbol(sourceLineNumbers, id)
267 { 267 {
268 WixHttpUrlReservationRef = urlReservationId, 268 WixHttpUrlReservationRef = urlReservationId,
269 SecurityPrincipal = securityPrincipal, 269 SecurityPrincipal = securityPrincipal,