Workaround ARM64 test failure until there is an ARM64 NETFX wix.exe
Related to 6960
Rob Mensching committed
Oct 19, 2022 at 09:56 UTC
7a354b882efd5b99ebbf02b95f86d2f83475236c
1 file changed
+9
-1
src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+9
-1
@@ -26,6 +26,14 @@ namespace WixToolsetTest.BuildTasks
26
{
27
var folder = TestData.Get("TestData", "SimpleMsiPackage", "MsiPackage");
28
29
+ var wixExeFolder = PublishedWixExeFolder;
30
+
31
+ // TODO: See https://github.com/wixtoolset/issues/issues/6960 - fallback to x86 until we have a wix.exe that supports all platforms.
32
+ if (!Directory.Exists(wixExeFolder))
33
+ {
34
+ wixExeFolder = Path.Combine(Path.GetDirectoryName(wixExeFolder), "x86");
35
+ }
36
+
37
using (var fs = new DisposableFileSystem())
38
{
39
var baseFolder = fs.GetFolder();
@@ -54,7 +62,7 @@ namespace WixToolsetTest.BuildTasks
62
PdbType = "Full",
63
PdbFile = new TaskItem(pdbPath),
64
DefaultCompressionLevel = "nOnE",
57
- ToolPath = PublishedWixExeFolder
65
+ ToolPath = wixExeFolder
66
};
67
68
var result = task.Execute();