diff options
author | Bevan Weiss <bevan.weiss@gmail.com> | 2025-02-15 17:15:03 +1100 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2025-03-03 06:35:56 -0800 |
commit | b710f6e40239f12d1b7ff670c8580a550f0bb557 (patch) | |
tree | db274c7407ebe3770b128fad8b64ce429a35ea2e /src | |
parent | 22e00b878ffe89ee3134d3d1b42b3d6c777adae8 (diff) | |
download | wix-b710f6e40239f12d1b7ff670c8580a550f0bb557.tar.gz wix-b710f6e40239f12d1b7ff670c8580a550f0bb557.tar.bz2 wix-b710f6e40239f12d1b7ff670c8580a550f0bb557.zip |
Skip Decompile roundtrip test for Msmq (it will require more time
to investigate Wix4Group / Wix6Group decompiler interactions).
Fix up Msmq Util dependency by bringing it into Build explicitly, as per
NetFx extension.
Signed-off-by: Bevan Weiss <bevan.weiss@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs | 32 | ||||
-rw-r--r-- | src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj | 1 |
2 files changed, 23 insertions, 10 deletions
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs index c89d138a..970bc2e9 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs | |||
@@ -9,7 +9,6 @@ namespace WixToolsetTest.Msmq | |||
9 | using WixInternal.TestSupport; | 9 | using WixInternal.TestSupport; |
10 | using WixInternal.Core.TestPackage; | 10 | using WixInternal.Core.TestPackage; |
11 | using WixToolset.Msmq; | 11 | using WixToolset.Msmq; |
12 | using WixToolset.Util; | ||
13 | using Xunit; | 12 | using Xunit; |
14 | 13 | ||
15 | public class MsmqExtensionFixture | 14 | public class MsmqExtensionFixture |
@@ -18,9 +17,9 @@ namespace WixToolsetTest.Msmq | |||
18 | public void CanBuildUsingMessageQueue() | 17 | public void CanBuildUsingMessageQueue() |
19 | { | 18 | { |
20 | var folder = TestData.Get(@"TestData\UsingMessageQueue"); | 19 | var folder = TestData.Get(@"TestData\UsingMessageQueue"); |
21 | var build = new Builder(folder, new[] { typeof(MsmqExtensionFactory), typeof(UtilExtensionFactory) }, new[] { folder }); | 20 | var build = new Builder(folder, new[] { typeof(MsmqExtensionFactory) }, new[] { folder }); |
22 | 21 | ||
23 | var results = build.BuildAndQuery(Build, "Wix4MessageQueue", "CustomAction", "Wix4MessageQueueUserPermission", "Wix4MessageQueueGroupPermission", "Wix4Group", "Wix4User"); | 22 | var results = build.BuildAndQuery(BuildWithUtil, "Wix4MessageQueue", "CustomAction", "Wix4MessageQueueUserPermission", "Wix4MessageQueueGroupPermission", "Wix4Group", "Wix4User"); |
24 | WixAssert.CompareLineByLine(new[] | 23 | WixAssert.CompareLineByLine(new[] |
25 | { | 24 | { |
26 | "CustomAction:Wix4MessageQueuingExecuteInstall_A64\t3073\tWix4MsmqCA_A64\tMessageQueuingExecuteInstall\t", | 25 | "CustomAction:Wix4MessageQueuingExecuteInstall_A64\t3073\tWix4MsmqCA_A64\tMessageQueuingExecuteInstall\t", |
@@ -37,14 +36,14 @@ namespace WixToolsetTest.Msmq | |||
37 | }, results); | 36 | }, results); |
38 | } | 37 | } |
39 | 38 | ||
40 | [Fact] | 39 | [Fact(Skip = "Util:Wix4Group and Util:Wix6Group decompilation issues prevent this usage currently")] |
41 | public void CanRoundtripMessageQueue() | 40 | public void CanRoundtripMessageQueue() |
42 | { | 41 | { |
43 | var folder = TestData.Get(@"TestData\UsingMessageQueue"); | 42 | var folder = TestData.Get(@"TestData\UsingMessageQueue"); |
44 | var build = new Builder(folder, new[] { typeof(MsmqExtensionFactory), typeof(UtilExtensionFactory) }, new[] { folder }); | 43 | var build = new Builder(folder, new[] { typeof(MsmqExtensionFactory) }, new[] { folder }); |
45 | var output = Path.Combine(folder, "MessageQueueDecompile.xml"); | 44 | var output = Path.Combine(folder, "MessageQueueDecompile.xml"); |
46 | 45 | ||
47 | build.BuildAndDecompileAndBuild(Build, Decompile, output); | 46 | build.BuildAndDecompileAndBuild(BuildWithUtil, DecompileWithUtil, output); |
48 | 47 | ||
49 | var doc = XDocument.Load(output); | 48 | var doc = XDocument.Load(output); |
50 | var actual = doc.Descendants() | 49 | var actual = doc.Descendants() |
@@ -60,16 +59,31 @@ namespace WixToolsetTest.Msmq | |||
60 | }, actual.Select(a => $"{a.Name}:{a.Id}").ToArray()); | 59 | }, actual.Select(a => $"{a.Name}:{a.Id}").ToArray()); |
61 | } | 60 | } |
62 | 61 | ||
63 | private static void Build(string[] args) | 62 | private static void BuildWithUtil(string[] args) |
64 | { | 63 | { |
65 | args = args.Concat(new[] { "-arch", "arm64" }).ToArray(); | 64 | var extensionResult = WixRunner.Execute(warningsAsErrors: true, new[] |
65 | { | ||
66 | "extension", "add", | ||
67 | "WixToolset.Util.wixext", | ||
68 | }); | ||
69 | |||
70 | args = args.Concat(new[] | ||
71 | { | ||
72 | "-ext", "WixToolset.Util.wixext", | ||
73 | "-arch", "arm64" | ||
74 | }).ToArray(); | ||
66 | 75 | ||
67 | var result = WixRunner.Execute(args); | 76 | var result = WixRunner.Execute(args); |
68 | result.AssertSuccess(); | 77 | result.AssertSuccess(); |
69 | } | 78 | } |
70 | 79 | ||
71 | private static void Decompile(string[] args) | 80 | private static void DecompileWithUtil(string[] args) |
72 | { | 81 | { |
82 | args = args.Concat(new[] | ||
83 | { | ||
84 | "-ext", "WixToolset.Util.wixext", | ||
85 | }).ToArray(); | ||
86 | |||
73 | var result = WixRunner.Execute(args); | 87 | var result = WixRunner.Execute(args); |
74 | result.AssertSuccess(); | 88 | result.AssertSuccess(); |
75 | } | 89 | } |
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj index 88718f98..e7b6f21e 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj | |||
@@ -16,7 +16,6 @@ | |||
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" /> | ||
20 | </ItemGroup> | 19 | </ItemGroup> |
21 | 20 | ||
22 | <ItemGroup> | 21 | <ItemGroup> |