From 1be6baef099aa75fd45f41e55b8138ac2c7e0da3 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 13 Feb 2022 00:46:54 -0500 Subject: Versioned extension ids: ComPlus, Msmq --- .../ComPlusExtensionFixture.cs | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs') diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs index ace4d6b6..d0b8daba 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs @@ -16,17 +16,32 @@ namespace WixToolsetTest.ComPlus var folder = TestData.Get(@"TestData\UsingComPlusPartition"); var build = new Builder(folder, typeof(ComPlusExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(Build, "ComPlusPartition"); + var results = build.BuildAndQuery(Build, "Wix4ComPlusPartition", "CustomAction"); WixAssert.CompareLineByLine(new[] { - "ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition", + "CustomAction:Wix4ComPlusInstallCommit_A64\t11777\tWix4cpca_A64\tComPlusCleanup\t", + "CustomAction:Wix4ComPlusInstallExecute_A64\t11265\tWix4cpca_A64\tComPlusInstallExecute\t", + "CustomAction:Wix4ComPlusInstallExecuteCommit_A64\t11777\tWix4cpca_A64\tComPlusInstallExecuteCommit\t", + "CustomAction:Wix4ComPlusInstallPrepare_A64\t11265\tWix4cpca_A64\tComPlusPrepare\t", + "CustomAction:Wix4ComPlusRollbackInstallExecute_A64\t11521\tWix4cpca_A64\tComPlusRollbackInstallExecute\t", + "CustomAction:Wix4ComPlusRollbackInstallPrepare_A64\t11521\tWix4cpca_A64\tComPlusCleanup\t", + "CustomAction:Wix4ComPlusRollbackUninstallExecute_A64\t11521\tWix4cpca_A64\tComPlusInstallExecute\t", + "CustomAction:Wix4ComPlusRollbackUninstallPrepare_A64\t11521\tWix4cpca_A64\tComPlusCleanup\t", + "CustomAction:Wix4ComPlusUninstallCommit_A64\t11777\tWix4cpca_A64\tComPlusCleanup\t", + "CustomAction:Wix4ComPlusUninstallExecute_A64\t11265\tWix4cpca_A64\tComPlusUninstallExecute\t", + "CustomAction:Wix4ComPlusUninstallPrepare_A64\t11265\tWix4cpca_A64\tComPlusPrepare\t", + "CustomAction:Wix4ConfigureComPlusInstall_A64\t1\tWix4cpca_A64\tConfigureComPlusInstall\t", + "CustomAction:Wix4ConfigureComPlusUninstall_A64\t1\tWix4cpca_A64\tConfigureComPlusUninstall\t", + "Wix4ComPlusPartition:MyPartition\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tMyPartitionId\tMyPartition", }, results); } private static void Build(string[] args) { - var result = WixRunner.Execute(args) - .AssertSuccess(); + args = args.Concat(new[] { "-arch", "arm64" }).ToArray(); + + var result = WixRunner.Execute(args); + result.AssertSuccess(); } } } -- cgit v1.2.3-55-g6feb