aboutsummaryrefslogtreecommitdiff
path: root/src/wixext
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-07-04 19:02:15 -0400
committerBob Arnson <bob@firegiant.com>2020-07-04 19:06:16 -0400
commitecb774445b177c739864cbd0f6ad441c7864e3be (patch)
tree410717cb3b17e154b2056772b68a2e89b87ab136 /src/wixext
parentcd0d556f06a220c3406d3a42a4e4628ee1cb7cd6 (diff)
downloadwix-ecb774445b177c739864cbd0f6ad441c7864e3be.tar.gz
wix-ecb774445b177c739864cbd0f6ad441c7864e3be.tar.bz2
wix-ecb774445b177c739864cbd0f6ad441c7864e3be.zip
Add per-platform custom action support.
Diffstat (limited to 'src/wixext')
-rw-r--r--src/wixext/HttpCompiler.cs15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/wixext/HttpCompiler.cs b/src/wixext/HttpCompiler.cs
index bc64add2..a8c1bca8 100644
--- a/src/wixext/HttpCompiler.cs
+++ b/src/wixext/HttpCompiler.cs
@@ -7,6 +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.Extensibility.Data;
10 using WixToolset.Http.Symbols; 11 using WixToolset.Http.Symbols;
11 12
12 /// <summary> 13 /// <summary>
@@ -177,18 +178,8 @@ namespace WixToolset.Http
177 ComponentRef = componentId, 178 ComponentRef = componentId,
178 }); 179 });
179 180
180 if (this.Context.Platform == Platform.ARM) 181 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
181 { 182 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
182 // Ensure ARM version of the CA is referenced.
183 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall_ARM");
184 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall_ARM");
185 }
186 else
187 {
188 // All other supported platforms use x86.
189 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsInstall");
190 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "WixSchedHttpUrlReservationsUninstall");
191 }
192 } 183 }
193 } 184 }
194 185