diff options
author | Bob Arnson <bob@firegiant.com> | 2021-04-18 21:08:08 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2021-04-18 21:11:12 -0400 |
commit | 4a28f74917af1725cf0ac06e68759806818c59e4 (patch) | |
tree | cc3f5c28e0cd0a7178c8e87637cf8beb746deda1 /src/test | |
parent | fc542c0974840882e5bbba0046c530e2ede34170 (diff) | |
download | wix-4a28f74917af1725cf0ac06e68759806818c59e4.tar.gz wix-4a28f74917af1725cf0ac06e68759806818c59e4.tar.bz2 wix-4a28f74917af1725cf0ac06e68759806818c59e4.zip |
Add `Wix4` table prefixes.
Per https://github.com/wixtoolset/issues/issues/5933.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/WixToolsetTest.Http/HttpExtensionFixture.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs b/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs index 1d350bdf..40b49327 100644 --- a/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs +++ b/src/test/WixToolsetTest.Http/HttpExtensionFixture.cs | |||
@@ -15,7 +15,7 @@ namespace WixToolsetTest.Http | |||
15 | var folder = TestData.Get("TestData", "SniSsl"); | 15 | var folder = TestData.Get("TestData", "SniSsl"); |
16 | var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder }); | 16 | var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder }); |
17 | 17 | ||
18 | var results = build.BuildAndQuery(Build, "CustomAction", "WixHttpSniSslCert"); | 18 | var results = build.BuildAndQuery(Build, "CustomAction", "Wix4HttpSniSslCert"); |
19 | WixAssert.CompareLineByLine(new[] | 19 | WixAssert.CompareLineByLine(new[] |
20 | { | 20 | { |
21 | "CustomAction:Wix4ExecHttpSniSslCertsInstall_X86\t3073\tWix4HttpCA_X86\tExecHttpSniSslCerts\t", | 21 | "CustomAction:Wix4ExecHttpSniSslCertsInstall_X86\t3073\tWix4HttpCA_X86\tExecHttpSniSslCerts\t", |
@@ -24,7 +24,7 @@ namespace WixToolsetTest.Http | |||
24 | "CustomAction:Wix4RollbackHttpSniSslCertsUninstall_X86\t3329\tWix4HttpCA_X86\tExecHttpSniSslCerts\t", | 24 | "CustomAction:Wix4RollbackHttpSniSslCertsUninstall_X86\t3329\tWix4HttpCA_X86\tExecHttpSniSslCerts\t", |
25 | "CustomAction:Wix4SchedHttpSniSslCertsInstall_X86\t1\tWix4HttpCA_X86\tSchedHttpSniSslCertsInstall\t", | 25 | "CustomAction:Wix4SchedHttpSniSslCertsInstall_X86\t1\tWix4HttpCA_X86\tSchedHttpSniSslCertsInstall\t", |
26 | "CustomAction:Wix4SchedHttpSniSslCertsUninstall_X86\t1\tWix4HttpCA_X86\tSchedHttpSniSslCertsUninstall\t", | 26 | "CustomAction:Wix4SchedHttpSniSslCertsUninstall_X86\t1\tWix4HttpCA_X86\tSchedHttpSniSslCertsUninstall\t", |
27 | "WixHttpSniSslCert:sslC9YX6_H7UL_WGBx4DoDGI.Sj.D0\texample.com\t8080\t[SOME_THUMBPRINT]\t\t\t2\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", | 27 | "Wix4HttpSniSslCert:sslC9YX6_H7UL_WGBx4DoDGI.Sj.D0\texample.com\t8080\t[SOME_THUMBPRINT]\t\t\t2\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", |
28 | }, results); | 28 | }, results); |
29 | } | 29 | } |
30 | 30 | ||
@@ -34,7 +34,7 @@ namespace WixToolsetTest.Http | |||
34 | var folder = TestData.Get(@"TestData\UsingUrlReservation"); | 34 | var folder = TestData.Get(@"TestData\UsingUrlReservation"); |
35 | var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder }); | 35 | var build = new Builder(folder, typeof(HttpExtensionFactory), new[] { folder }); |
36 | 36 | ||
37 | var results = build.BuildAndQuery(Build, "CustomAction", "WixHttpUrlAce", "WixHttpUrlReservation"); | 37 | var results = build.BuildAndQuery(Build, "CustomAction", "Wix4HttpUrlAce", "Wix4HttpUrlReservation"); |
38 | WixAssert.CompareLineByLine(new[] | 38 | WixAssert.CompareLineByLine(new[] |
39 | { | 39 | { |
40 | "CustomAction:Wix4ExecHttpUrlReservationsInstall_X86\t3073\tWix4HttpCA_X86\tExecHttpUrlReservations\t", | 40 | "CustomAction:Wix4ExecHttpUrlReservationsInstall_X86\t3073\tWix4HttpCA_X86\tExecHttpUrlReservations\t", |
@@ -43,8 +43,8 @@ namespace WixToolsetTest.Http | |||
43 | "CustomAction:Wix4RollbackHttpUrlReservationsUninstall_X86\t3329\tWix4HttpCA_X86\tExecHttpUrlReservations\t", | 43 | "CustomAction:Wix4RollbackHttpUrlReservationsUninstall_X86\t3329\tWix4HttpCA_X86\tExecHttpUrlReservations\t", |
44 | "CustomAction:Wix4SchedHttpUrlReservationsInstall_X86\t1\tWix4HttpCA_X86\tSchedHttpUrlReservationsInstall\t", | 44 | "CustomAction:Wix4SchedHttpUrlReservationsInstall_X86\t1\tWix4HttpCA_X86\tSchedHttpUrlReservationsInstall\t", |
45 | "CustomAction:Wix4SchedHttpUrlReservationsUninstall_X86\t1\tWix4HttpCA_X86\tSchedHttpUrlReservationsUninstall\t", | 45 | "CustomAction:Wix4SchedHttpUrlReservationsUninstall_X86\t1\tWix4HttpCA_X86\tSchedHttpUrlReservationsUninstall\t", |
46 | "WixHttpUrlAce:aceu5os2gQoblRmzwjt85LQf997uD4\turlO23FkY2xzEY54lY6E6sXFW6glXc\tNT SERVICE\\TestService\t268435456", | 46 | "Wix4HttpUrlAce:aceu5os2gQoblRmzwjt85LQf997uD4\turlO23FkY2xzEY54lY6E6sXFW6glXc\tNT SERVICE\\TestService\t268435456", |
47 | "WixHttpUrlReservation:urlO23FkY2xzEY54lY6E6sXFW6glXc\t0\t\thttp://+:80/vroot/\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", | 47 | "Wix4HttpUrlReservation:urlO23FkY2xzEY54lY6E6sXFW6glXc\t0\t\thttp://+:80/vroot/\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", |
48 | }, results); | 48 | }, results); |
49 | } | 49 | } |
50 | 50 | ||