From 7a354b882efd5b99ebbf02b95f86d2f83475236c Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 19 Oct 2022 09:56:21 -0700
Subject: Workaround ARM64 test failure until there is an ARM64 NETFX wix.exe

Related to 6960
---
 src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
index 92ee441a..09043918 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
@@ -26,6 +26,14 @@ namespace WixToolsetTest.BuildTasks
         {
             var folder = TestData.Get("TestData", "SimpleMsiPackage", "MsiPackage");
 
+            var wixExeFolder = PublishedWixExeFolder;
+
+            // TODO: See https://github.com/wixtoolset/issues/issues/6960 - fallback to x86 until we have a wix.exe that supports all platforms.
+            if (!Directory.Exists(wixExeFolder))
+            {
+                wixExeFolder = Path.Combine(Path.GetDirectoryName(wixExeFolder), "x86");
+            }
+
             using (var fs = new DisposableFileSystem())
             {
                 var baseFolder = fs.GetFolder();
@@ -54,7 +62,7 @@ namespace WixToolsetTest.BuildTasks
                     PdbType = "Full",
                     PdbFile = new TaskItem(pdbPath),
                     DefaultCompressionLevel = "nOnE",
-                    ToolPath = PublishedWixExeFolder
+                    ToolPath = wixExeFolder
                 };
 
                 var result = task.Execute();
-- 
cgit v1.2.3-55-g6feb