aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-09-02 14:41:15 -0700
committerRob Mensching <rob@firegiant.com>2022-10-27 14:30:34 -0700
commitd993372ad5468cae88990bc31a2c825e742cd717 (patch)
tree48d704daa4fae0160b64535b46a9bf7a0ff6b019 /src
parentd9ab1c3ce2cdebb865c2283eb3e764d3b2caaa98 (diff)
downloadwix-d993372ad5468cae88990bc31a2c825e742cd717.tar.gz
wix-d993372ad5468cae88990bc31a2c825e742cd717.tar.bz2
wix-d993372ad5468cae88990bc31a2c825e742cd717.zip
Enable ARM64 build for wix build
Fixes 6960
Diffstat (limited to 'src')
-rw-r--r--src/wix/Directory.Build.targets3
-rw-r--r--src/wix/publish_t.proj2
-rw-r--r--src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs10
-rw-r--r--src/wix/wix/wix.csproj2
4 files changed, 7 insertions, 10 deletions
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 @@
8 <None Include="$(MSBuildThisFileDirectory)wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " /> 8 <None Include="$(MSBuildThisFileDirectory)wixnative\x64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
9 <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " /> 9 <None Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x64' or '$(RuntimeIdentifier)'=='' " />
10 10
11 <None Include="$(MSBuildThisFileDirectory)wixnative\arm64\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-arm64' " />
12 <None Include="$(BaseOutputPath)$(Configuration)\arm64\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-arm64' " />
13
11 <None Include="$(MSBuildThisFileDirectory)wixnative\Win32\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " /> 14 <None Include="$(MSBuildThisFileDirectory)wixnative\Win32\mergemod.dll" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " />
12 <None Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " /> 15 <None Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" CopyToOutputDirectory="PreserveNewest" Condition=" '$(RuntimeIdentifier)'=='win-x86' " />
13 </ItemGroup> 16 </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 @@
8 <PublishHere>$(PublishRoot)WixToolset.Sdk\tools\net472\</PublishHere> 8 <PublishHere>$(PublishRoot)WixToolset.Sdk\tools\net472\</PublishHere>
9 <PublishX86>$(PublishRoot)WixToolset.Sdk\tools\net472\x86\</PublishX86> 9 <PublishX86>$(PublishRoot)WixToolset.Sdk\tools\net472\x86\</PublishX86>
10 <PublishX64>$(PublishRoot)WixToolset.Sdk\tools\net472\x64\</PublishX64> 10 <PublishX64>$(PublishRoot)WixToolset.Sdk\tools\net472\x64\</PublishX64>
11 <PublishARM64>$(PublishRoot)WixToolset.Sdk\tools\net472\arm64\</PublishARM64>
11 <PublishDnc>$(PublishRoot)WixToolset.Sdk\tools\net6.0\</PublishDnc> 12 <PublishDnc>$(PublishRoot)WixToolset.Sdk\tools\net6.0\</PublishDnc>
12 </PropertyGroup> 13 </PropertyGroup>
13 14
@@ -20,6 +21,7 @@
20 <!-- wix.exe doesn't need to filter any files so publish it straight into its final location --> 21 <!-- wix.exe doesn't need to filter any files so publish it straight into its final location -->
21 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" /> 22 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" />
22 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" /> 23 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" />
24 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-arm64;PublishDir=$(PublishARM64)" Targets="Publish" />
23 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net6.0;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" /> 25 <ProjectReference Include="wix\wix.csproj" Properties="TargetFramework=net6.0;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" />
24 </ItemGroup> 26 </ItemGroup>
25 27
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
26 { 26 {
27 var folder = TestData.Get("TestData", "SimpleMsiPackage", "MsiPackage"); 27 var folder = TestData.Get("TestData", "SimpleMsiPackage", "MsiPackage");
28 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()) 29 using (var fs = new DisposableFileSystem())
38 { 30 {
39 var baseFolder = fs.GetFolder(); 31 var baseFolder = fs.GetFolder();
@@ -62,7 +54,7 @@ namespace WixToolsetTest.BuildTasks
62 PdbType = "Full", 54 PdbType = "Full",
63 PdbFile = new TaskItem(pdbPath), 55 PdbFile = new TaskItem(pdbPath),
64 DefaultCompressionLevel = "nOnE", 56 DefaultCompressionLevel = "nOnE",
65 ToolPath = wixExeFolder 57 ToolPath = PublishedWixExeFolder
66 }; 58 };
67 59
68 var result = task.Execute(); 60 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 @@
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 <PackAsTool>true</PackAsTool> 11 <PackAsTool>true</PackAsTool>
12 <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='net6.0' ">win-x86;win-x64</RuntimeIdentifiers> 12 <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='net6.0' ">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
13 <AppConfig>app.config</AppConfig> 13 <AppConfig>app.config</AppConfig>
14 <ApplicationManifest>wix.exe.manifest</ApplicationManifest> 14 <ApplicationManifest>wix.exe.manifest</ApplicationManifest>
15 <RollForward>Major</RollForward> 15 <RollForward>Major</RollForward>