aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Msmq/test/WixToolsetTest.Msmq
diff options
context:
space:
mode:
authorBevan Weiss <bevan.weiss@gmail.com>2025-01-16 21:29:43 +1100
committerRob Mensching <rob@firegiant.com>2025-03-03 06:35:56 -0800
commit3b9efe831c6a408cd71a7bea6fa95f65c141911b (patch)
treebf57792ff48689ecfffca80f68d0aa5b725dab27 /src/ext/Msmq/test/WixToolsetTest.Msmq
parent4992cb0ec8259603133638b19633bd09a32d9261 (diff)
downloadwix-3b9efe831c6a408cd71a7bea6fa95f65c141911b.tar.gz
wix-3b9efe831c6a408cd71a7bea6fa95f65c141911b.tar.bz2
wix-3b9efe831c6a408cd71a7bea6fa95f65c141911b.zip
Fix up missing 'Wix4' prefixes on MSMQ Permission tables.
And updated decompiler to Wix4 table names etc in line with firewall CA. Fixes wixtoolset/issues#8902 Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
Diffstat (limited to 'src/ext/Msmq/test/WixToolsetTest.Msmq')
-rw-r--r--src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs9
-rw-r--r--src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/PackageComponents.wxs10
-rw-r--r--src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj1
3 files changed, 16 insertions, 4 deletions
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
index 674d6a66..424d3d5b 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs
@@ -6,6 +6,7 @@ namespace WixToolsetTest.Msmq
6 using WixInternal.TestSupport; 6 using WixInternal.TestSupport;
7 using WixInternal.Core.TestPackage; 7 using WixInternal.Core.TestPackage;
8 using WixToolset.Msmq; 8 using WixToolset.Msmq;
9 using WixToolset.Util;
9 using Xunit; 10 using Xunit;
10 11
11 public class MsmqExtensionFixture 12 public class MsmqExtensionFixture
@@ -14,9 +15,9 @@ namespace WixToolsetTest.Msmq
14 public void CanBuildUsingMessageQueue() 15 public void CanBuildUsingMessageQueue()
15 { 16 {
16 var folder = TestData.Get(@"TestData\UsingMessageQueue"); 17 var folder = TestData.Get(@"TestData\UsingMessageQueue");
17 var build = new Builder(folder, typeof(MsmqExtensionFactory), new[] { folder }); 18 var build = new Builder(folder, new[] { typeof(MsmqExtensionFactory), typeof(UtilExtensionFactory) }, new[] { folder });
18 19
19 var results = build.BuildAndQuery(Build, "Wix4MessageQueue", "CustomAction"); 20 var results = build.BuildAndQuery(Build, "Wix4MessageQueue", "CustomAction", "Wix4MessageQueueUserPermission", "Wix4MessageQueueGroupPermission", "Wix4Group", "Wix4User");
20 WixAssert.CompareLineByLine(new[] 21 WixAssert.CompareLineByLine(new[]
21 { 22 {
22 "CustomAction:Wix4MessageQueuingExecuteInstall_A64\t3073\tWix4MsmqCA_A64\tMessageQueuingExecuteInstall\t", 23 "CustomAction:Wix4MessageQueuingExecuteInstall_A64\t3073\tWix4MsmqCA_A64\tMessageQueuingExecuteInstall\t",
@@ -25,7 +26,11 @@ namespace WixToolsetTest.Msmq
25 "CustomAction:Wix4MessageQueuingRollbackInstall_A64\t3329\tWix4MsmqCA_A64\tMessageQueuingRollbackInstall\t", 26 "CustomAction:Wix4MessageQueuingRollbackInstall_A64\t3329\tWix4MsmqCA_A64\tMessageQueuingRollbackInstall\t",
26 "CustomAction:Wix4MessageQueuingRollbackUninstall_A64\t3329\tWix4MsmqCA_A64\tMessageQueuingRollbackUninstall\t", 27 "CustomAction:Wix4MessageQueuingRollbackUninstall_A64\t3329\tWix4MsmqCA_A64\tMessageQueuingRollbackUninstall\t",
27 "CustomAction:Wix4MessageQueuingUninstall_A64\t1\tWix4MsmqCA_A64\tMessageQueuingUninstall\t", 28 "CustomAction:Wix4MessageQueuingUninstall_A64\t1\tWix4MsmqCA_A64\tMessageQueuingUninstall\t",
29 "Wix4Group:TestGroup\t\tTestGroup\t",
28 "Wix4MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0", 30 "Wix4MessageQueue:TestMQ\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t\t\tMQLabel\t\tMQPath\t\t\t\t0",
31 "Wix4MessageQueueGroupPermission:TestMQ_TestGroup\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tTestMQ\tTestGroup\t160",
32 "Wix4MessageQueueUserPermission:TestMQ_TestUser\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tTestMQ\tTestUser\t160",
33 "Wix4User:TestUser\t\tTestUser\t\t\t\t0",
29 }, results); 34 }, results);
30 } 35 }
31 36
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/PackageComponents.wxs b/src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/PackageComponents.wxs
index ff9f7d92..bba105a0 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/PackageComponents.wxs
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/TestData/UsingMessageQueue/PackageComponents.wxs
@@ -1,11 +1,17 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" 2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3 xmlns:msmq="http://wixtoolset.org/schemas/v4/wxs/msmq"> 3 xmlns:msmq="http://wixtoolset.org/schemas/v4/wxs/msmq"
4 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
4 <Fragment> 5 <Fragment>
6 <util:Group Id="TestGroup" Name="TestGroup" />
7 <util:User Id="TestUser" Name="TestUser" />
5 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> 8 <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
6 <Component> 9 <Component>
7 <File Source="example.txt" /> 10 <File Source="example.txt" />
8 <msmq:MessageQueue Id="TestMQ" Label="MQLabel" PathName="MQPath" /> 11 <msmq:MessageQueue Id="TestMQ" Label="MQLabel" PathName="MQPath" >
12 <msmq:MessageQueuePermission Id="TestMQ_TestGroup" GetQueuePermissions="yes" GetQueueProperties="yes" Group="TestGroup" />
13 <msmq:MessageQueuePermission Id="TestMQ_TestUser" GetQueuePermissions="yes" GetQueueProperties="yes" User="TestUser" />
14 </msmq:MessageQueue>
9 </Component> 15 </Component>
10 </ComponentGroup> 16 </ComponentGroup>
11 </Fragment> 17 </Fragment>
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
index e7b6f21e..88718f98 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
@@ -16,6 +16,7 @@
16 16
17 <ItemGroup> 17 <ItemGroup>
18 <ProjectReference Include="..\..\wixext\WixToolset.Msmq.wixext.csproj" /> 18 <ProjectReference Include="..\..\wixext\WixToolset.Msmq.wixext.csproj" />
19 <ProjectReference Include="..\..\..\Util\wixext\WixToolset.Util.wixext.csproj" />
19 </ItemGroup> 20 </ItemGroup>
20 21
21 <ItemGroup> 22 <ItemGroup>