aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-02-23 18:47:45 -0500
committerBob Arnson <bob@firegiant.com>2021-02-23 18:50:20 -0500
commit3b0f9180603844a49d3dfc814f0d5f08136a818e (patch)
tree31f91f2dc77fad6d3af9dc4787b29fc0919b7ec8
parentee12b7fcba1a007783b9c7488d968c8c9a66bcbf (diff)
downloadwix-3b0f9180603844a49d3dfc814f0d5f08136a818e.tar.gz
wix-3b0f9180603844a49d3dfc814f0d5f08136a818e.tar.bz2
wix-3b0f9180603844a49d3dfc814f0d5f08136a818e.zip
Add custom action prefixes.
-rw-r--r--src/test/WixToolsetTest.Http/HttpExtensionFixture.cs8
-rw-r--r--src/wixext/HttpCompiler.cs4
2 files changed, 9 insertions, 3 deletions
diff --git a/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs b/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs
index 2b501a6c..8cabf4b4 100644
--- a/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs
@@ -16,9 +16,15 @@ namespace WixToolsetTest.Http
16 var folder = TestData.Get(@"TestData\UsingUrlReservation"); 16 var folder = TestData.Get(@"TestData\UsingUrlReservation");
17 var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder }); 17 var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder });
18 18
19 var results = build.BuildAndQuery(Build, "WixHttpUrlAce", "WixHttpUrlReservation"); 19 var results = build.BuildAndQuery(Build, "CustomAction", "WixHttpUrlAce", "WixHttpUrlReservation");
20 Assert.Equal(new[] 20 Assert.Equal(new[]
21 { 21 {
22 "CustomAction:Wix4ExecHttpUrlReservationsInstall_X86\t3073\tHttpCA_X86\tExecHttpUrlReservations\t",
23 "CustomAction:Wix4ExecHttpUrlReservationsUninstall_X86\t3073\tHttpCA_X86\tExecHttpUrlReservations\t",
24 "CustomAction:Wix4RollbackHttpUrlReservationsInstall_X86\t3329\tHttpCA_X86\tExecHttpUrlReservations\t",
25 "CustomAction:Wix4RollbackHttpUrlReservationsUninstall_X86\t3329\tHttpCA_X86\tExecHttpUrlReservations\t",
26 "CustomAction:Wix4SchedHttpUrlReservationsInstall_X86\t1\tHttpCA_X86\tSchedHttpUrlReservationsInstall\t",
27 "CustomAction:Wix4SchedHttpUrlReservationsUninstall_X86\t1\tHttpCA_X86\tSchedHttpUrlReservationsUninstall\t",
22 "WixHttpUrlAce:aceu5os2gQoblRmzwjt85LQf997uD4\turlO23FkY2xzEY54lY6E6sXFW6glXc\tNT SERVICE\\TestService\t268435456", 28 "WixHttpUrlAce:aceu5os2gQoblRmzwjt85LQf997uD4\turlO23FkY2xzEY54lY6E6sXFW6glXc\tNT SERVICE\\TestService\t268435456",
23 "WixHttpUrlReservation:urlO23FkY2xzEY54lY6E6sXFW6glXc\t0\t\thttp://+:80/vroot/\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", 29 "WixHttpUrlReservation:urlO23FkY2xzEY54lY6E6sXFW6glXc\t0\t\thttp://+:80/vroot/\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
24 }, results); 30 }, results);
diff --git a/src/wixext/HttpCompiler.cs b/src/wixext/HttpCompiler.cs
index 135e6883..e6246619 100644
--- a/src/wixext/HttpCompiler.cs
+++ b/src/wixext/HttpCompiler.cs
@@ -178,8 +178,8 @@ namespace WixToolset.Http
178 ComponentRef = componentId, 178 ComponentRef = componentId,
179 }); 179 });
180 180
181 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 181 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedHttpUrlReservationsInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
182 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedHttpUrlReservationsUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 182 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4SchedHttpUrlReservationsUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
183 } 183 }
184 } 184 }
185 185