Go back to separate .wixlibs for DifxApp.

Fixes https://github.com/wixtoolset/issues/issues/7015.

1 files changed, 15 insertions, 6 deletions

diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
index 7bdd039b..d132952f 100644
--- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
+++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolsetTest.DifxApp
 {
+    using System;
+    using System.IO;
     using System.Linq;
     using WixInternal.TestSupport;
     using WixInternal.Core.TestPackage;
@@ -19,17 +21,24 @@ namespace WixToolsetTest.DifxApp
             var results = build.BuildAndQuery(Build, "CustomAction");
             WixAssert.CompareLineByLine(new[]
             {
-                "CustomAction:MsiCleanupOnSuccess\t1\tDIFxApp.dll\tCleanupOnSuccess\t",
-                "CustomAction:MsiInstallDrivers\t3073\tDIFxAppA.dll\tInstallDriverPackages\t",
-                "CustomAction:MsiProcessDrivers\t1\tDIFxApp.dll\tProcessDriverPackages\t",
-                "CustomAction:MsiRollbackInstall\t3329\tDIFxAppA.dll\tRollbackInstall\t",
-                "CustomAction:MsiUninstallDrivers\t3073\tDIFxAppA.dll\tUninstallDriverPackages\t",
+                "CustomAction:MsiCleanupOnSuccess\t1\tDIFxAppx64\tCleanupOnSuccess\t",
+                "CustomAction:MsiInstallDrivers\t3073\tDIFxAppAx64\tInstallDriverPackages\t",
+                "CustomAction:MsiProcessDrivers\t1\tDIFxAppx64\tProcessDriverPackages\t",
+                "CustomAction:MsiRollbackInstall\t3329\tDIFxAppAx64\tRollbackInstall\t",
+                "CustomAction:MsiUninstallDrivers\t3073\tDIFxAppAx64\tUninstallDriverPackages\t",
             }, results);
         }
 
         private static void Build(string[] args)
         {
-            var result = WixRunner.Execute(warningsAsErrors: false, args).AssertSuccess();
+            var newArgs = args.ToList();
+            newArgs.Add("-platform");
+            newArgs.Add("x64");
+
+            var extDir = Path.GetDirectoryName(new Uri(typeof(DifxAppExtensionFactory).Assembly.CodeBase).LocalPath);
+            newArgs.Add(Path.Combine(extDir, "..", "difxapp_x64.wixlib"));
+
+            var result = WixRunner.Execute(warningsAsErrors: false, newArgs.ToArray()).AssertSuccess();
 
             Assert.Single(result.Messages.Where(m => m.Id == (int)WixToolset.Data.WarningMessages.Ids.DeprecatedElement));
         }