From d993372ad5468cae88990bc31a2c825e742cd717 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 2 Sep 2022 14:41:15 -0700
Subject: Enable ARM64 build for wix build

Fixes 6960
---
 src/wix/Directory.Build.targets                               |  3 +++
 src/wix/publish_t.proj                                        |  2 ++
 src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | 10 +---------
 src/wix/wix/wix.csproj                                        |  2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/wix/Directory.Build.targets b/src/wix/Directory.Build.targets
index d3c60a1e..78b83e60 100644
--- a/src/wix/Directory.Build.targets
+++ b/src/wix/Directory.Build.targets
@@ -8,6 +8,9 @@
     <None Include="$(MSBuildThisFileDirectory)wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
     <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
 
+    <None Include="$(MSBuildThisFileDirectory)wixnative\arm64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-arm64' " />
+    <None Include="$(BaseOutputPath)$(Configuration)\arm64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-arm64' " />
+
     <None Include="$(MSBuildThisFileDirectory)wixnative\Win32\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " />
     <None Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " />
   </ItemGroup>
diff --git a/src/wix/publish_t.proj b/src/wix/publish_t.proj
index a50c75b8..2ba70656 100644
--- a/src/wix/publish_t.proj
+++ b/src/wix/publish_t.proj
@@ -8,6 +8,7 @@
     <PublishHere>$(PublishRoot)WixToolset.Sdk\tools\net472\</PublishHere>
     <PublishX86>$(PublishRoot)WixToolset.Sdk\tools\net472\x86\</PublishX86>
     <PublishX64>$(PublishRoot)WixToolset.Sdk\tools\net472\x64\</PublishX64>
+    <PublishARM64>$(PublishRoot)WixToolset.Sdk\tools\net472\arm64\</PublishARM64>
     <PublishDnc>$(PublishRoot)WixToolset.Sdk\tools\net6.0\</PublishDnc>
   </PropertyGroup>
 
@@ -20,6 +21,7 @@
     <!-- wix.exe doesn't need to filter any files so publish it straight into its final location -->
     <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" />
     <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" />
+    <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-arm64;PublishDir=$(PublishARM64)" Targets="Publish" />
     <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net6.0;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" />
   </ItemGroup>
 
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
index 09043918..92ee441a 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
@@ -26,14 +26,6 @@ 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();
@@ -62,7 +54,7 @@ namespace WixToolsetTest.BuildTasks
                     PdbType = "Full",
                     PdbFile = new TaskItem(pdbPath),
                     DefaultCompressionLevel = "nOnE",
-                    ToolPath = wixExeFolder
+                    ToolPath = PublishedWixExeFolder
                 };
 
                 var result = task.Execute();
diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj
index d6776821..24131117 100644
--- a/src/wix/wix/wix.csproj
+++ b/src/wix/wix/wix.csproj
@@ -9,7 +9,7 @@
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackAsTool>true</PackAsTool>
-    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='net6.0' ">win-x86;win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='net6.0' ">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <AppConfig>app.config</AppConfig>
     <ApplicationManifest>wix.exe.manifest</ApplicationManifest>
     <RollForward>Major</RollForward>
-- 
cgit v1.2.3-55-g6feb