aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-24 14:32:26 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-06-24 20:36:35 +1000
commit84a60ab50339f158715172ef24804c5b9cb5ba9d (patch)
treef2052847f2a19c193ff7a92864ae0467e48dc464 /src
parentc1cc095efa7deec07ffe29034a076035458c260f (diff)
downloadwix-84a60ab50339f158715172ef24804c5b9cb5ba9d.tar.gz
wix-84a60ab50339f158715172ef24804c5b9cb5ba9d.tar.bz2
wix-84a60ab50339f158715172ef24804c5b9cb5ba9d.zip
Add ARM/ARM64 wixnative.exe
Update mergemod.dll from SDK 10.0.19041.0.
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Core.Native/WixToolset.Core.Native.csproj8
-rw-r--r--src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec6
-rw-r--r--src/winterop/winterop.vcxproj26
-rw-r--r--src/wixnative/ARM/mergemod.dllbin0 -> 172704 bytes
-rw-r--r--src/wixnative/ARM64/mergemod.dllbin0 -> 194512 bytes
-rw-r--r--src/wixnative/Win32/mergemod.dllbin169304 -> 159176 bytes
-rw-r--r--src/wixnative/wixnative.vcxproj26
-rw-r--r--src/wixnative/x64/mergemod.dllbin183848 -> 180376 bytes
8 files changed, 56 insertions, 10 deletions
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index d62de257..2626f749 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -11,6 +11,14 @@
11 <ItemGroup> 11 <ItemGroup>
12 <ProjectReference Include="..\wixnative\wixnative.vcxproj"> 12 <ProjectReference Include="..\wixnative\wixnative.vcxproj">
13 <PrivateAssets>All</PrivateAssets> 13 <PrivateAssets>All</PrivateAssets>
14 <Properties>Platform=ARM</Properties>
15 </ProjectReference>
16 <ProjectReference Include="..\wixnative\wixnative.vcxproj">
17 <PrivateAssets>All</PrivateAssets>
18 <Properties>Platform=ARM64</Properties>
19 </ProjectReference>
20 <ProjectReference Include="..\wixnative\wixnative.vcxproj">
21 <PrivateAssets>All</PrivateAssets>
14 <Properties>Platform=Win32</Properties> 22 <Properties>Platform=Win32</Properties>
15 </ProjectReference> 23 </ProjectReference>
16 <ProjectReference Include="..\wixnative\wixnative.vcxproj"> 24 <ProjectReference Include="..\wixnative\wixnative.vcxproj">
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
index e862b1ba..2e4b491c 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
@@ -19,6 +19,12 @@
19 <files> 19 <files>
20 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> 20 <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
21 21
22 <file src="$mergemoddir$ARM\mergemod.dll" target="runtimes\win-arm\native" />
23 <file src="ARM\wixnative.exe" target="runtimes\win-arm\native" />
24 <file src="ARM\wixnative.pdb" target="runtimes\win-arm\native" />
25 <file src="$mergemoddir$ARM64\mergemod.dll" target="runtimes\win-arm64\native" />
26 <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" />
27 <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" />
22 <file src="$mergemoddir$Win32\mergemod.dll" target="runtimes\win-x86\native" /> 28 <file src="$mergemoddir$Win32\mergemod.dll" target="runtimes\win-x86\native" />
23 <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" /> 29 <file src="Win32\wixnative.exe" target="runtimes\win-x86\native" />
24 <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" /> 30 <file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" />
diff --git a/src/winterop/winterop.vcxproj b/src/winterop/winterop.vcxproj
index a4603557..be006c38 100644
--- a/src/winterop/winterop.vcxproj
+++ b/src/winterop/winterop.vcxproj
@@ -5,18 +5,34 @@
5 <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> 5 <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
6 6
7 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
8 <ProjectConfiguration Include="Debug|Win32"> 8 <ProjectConfiguration Include="Debug|ARM">
9 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
10 <Platform>Win32</Platform> 10 <Platform>ARM</Platform>
11 </ProjectConfiguration> 11 </ProjectConfiguration>
12 <ProjectConfiguration Include="Release|Win32"> 12 <ProjectConfiguration Include="Debug|ARM64">
13 <Configuration>Release</Configuration> 13 <Configuration>Debug</Configuration>
14 <Platform>ARM64</Platform>
15 </ProjectConfiguration>
16 <ProjectConfiguration Include="Debug|Win32">
17 <Configuration>Debug</Configuration>
14 <Platform>Win32</Platform> 18 <Platform>Win32</Platform>
15 </ProjectConfiguration> 19 </ProjectConfiguration>
16 <ProjectConfiguration Include="Debug|x64"> 20 <ProjectConfiguration Include="Debug|x64">
17 <Configuration>Debug</Configuration> 21 <Configuration>Debug</Configuration>
18 <Platform>x64</Platform> 22 <Platform>x64</Platform>
19 </ProjectConfiguration> 23 </ProjectConfiguration>
24 <ProjectConfiguration Include="Release|ARM">
25 <Configuration>Release</Configuration>
26 <Platform>ARM</Platform>
27 </ProjectConfiguration>
28 <ProjectConfiguration Include="Release|ARM64">
29 <Configuration>Release</Configuration>
30 <Platform>ARM64</Platform>
31 </ProjectConfiguration>
32 <ProjectConfiguration Include="Release|Win32">
33 <Configuration>Release</Configuration>
34 <Platform>Win32</Platform>
35 </ProjectConfiguration>
20 <ProjectConfiguration Include="Release|x64"> 36 <ProjectConfiguration Include="Release|x64">
21 <Configuration>Release</Configuration> 37 <Configuration>Release</Configuration>
22 <Platform>x64</Platform> 38 <Platform>x64</Platform>
@@ -27,7 +43,7 @@
27 <ProjectGuid>{26D45E58-E703-431D-B67E-493C72C9DA0B}</ProjectGuid> 43 <ProjectGuid>{26D45E58-E703-431D-B67E-493C72C9DA0B}</ProjectGuid>
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 44 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <TargetName>winterop</TargetName> 45 <TargetName>winterop</TargetName>
30 <PlatformToolset>v141</PlatformToolset> 46 <PlatformToolset>v142</PlatformToolset>
31 <CharacterSet>MultiByte</CharacterSet> 47 <CharacterSet>MultiByte</CharacterSet>
32 <ProjectModuleDefinitionFile>winterop.def</ProjectModuleDefinitionFile> 48 <ProjectModuleDefinitionFile>winterop.def</ProjectModuleDefinitionFile>
33 <Description>Native component of WixToolset.Core</Description> 49 <Description>Native component of WixToolset.Core</Description>
diff --git a/src/wixnative/ARM/mergemod.dll b/src/wixnative/ARM/mergemod.dll
new file mode 100644
index 00000000..739af831
--- /dev/null
+++ b/src/wixnative/ARM/mergemod.dll
Binary files differ
diff --git a/src/wixnative/ARM64/mergemod.dll b/src/wixnative/ARM64/mergemod.dll
new file mode 100644
index 00000000..564a75fc
--- /dev/null
+++ b/src/wixnative/ARM64/mergemod.dll
Binary files differ
diff --git a/src/wixnative/Win32/mergemod.dll b/src/wixnative/Win32/mergemod.dll
index 2bf647b2..4286df4d 100644
--- a/src/wixnative/Win32/mergemod.dll
+++ b/src/wixnative/Win32/mergemod.dll
Binary files differ
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj
index e53af651..373c8d06 100644
--- a/src/wixnative/wixnative.vcxproj
+++ b/src/wixnative/wixnative.vcxproj
@@ -5,18 +5,34 @@
5 <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> 5 <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
6 6
7 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
8 <ProjectConfiguration Include="Debug|Win32"> 8 <ProjectConfiguration Include="Debug|ARM">
9 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
10 <Platform>Win32</Platform> 10 <Platform>ARM</Platform>
11 </ProjectConfiguration> 11 </ProjectConfiguration>
12 <ProjectConfiguration Include="Release|Win32"> 12 <ProjectConfiguration Include="Debug|ARM64">
13 <Configuration>Release</Configuration> 13 <Configuration>Debug</Configuration>
14 <Platform>ARM64</Platform>
15 </ProjectConfiguration>
16 <ProjectConfiguration Include="Debug|Win32">
17 <Configuration>Debug</Configuration>
14 <Platform>Win32</Platform> 18 <Platform>Win32</Platform>
15 </ProjectConfiguration> 19 </ProjectConfiguration>
16 <ProjectConfiguration Include="Debug|x64"> 20 <ProjectConfiguration Include="Debug|x64">
17 <Configuration>Debug</Configuration> 21 <Configuration>Debug</Configuration>
18 <Platform>x64</Platform> 22 <Platform>x64</Platform>
19 </ProjectConfiguration> 23 </ProjectConfiguration>
24 <ProjectConfiguration Include="Release|ARM">
25 <Configuration>Release</Configuration>
26 <Platform>ARM</Platform>
27 </ProjectConfiguration>
28 <ProjectConfiguration Include="Release|ARM64">
29 <Configuration>Release</Configuration>
30 <Platform>ARM64</Platform>
31 </ProjectConfiguration>
32 <ProjectConfiguration Include="Release|Win32">
33 <Configuration>Release</Configuration>
34 <Platform>Win32</Platform>
35 </ProjectConfiguration>
20 <ProjectConfiguration Include="Release|x64"> 36 <ProjectConfiguration Include="Release|x64">
21 <Configuration>Release</Configuration> 37 <Configuration>Release</Configuration>
22 <Platform>x64</Platform> 38 <Platform>x64</Platform>
@@ -28,7 +44,7 @@
28 <ConfigurationType>Application</ConfigurationType> 44 <ConfigurationType>Application</ConfigurationType>
29 <ProjectSubSystem>Console</ProjectSubSystem> 45 <ProjectSubSystem>Console</ProjectSubSystem>
30 <TargetName>wixnative</TargetName> 46 <TargetName>wixnative</TargetName>
31 <PlatformToolset>v141</PlatformToolset> 47 <PlatformToolset>v142</PlatformToolset>
32 <CharacterSet>Unicode</CharacterSet> 48 <CharacterSet>Unicode</CharacterSet>
33 </PropertyGroup> 49 </PropertyGroup>
34 50
diff --git a/src/wixnative/x64/mergemod.dll b/src/wixnative/x64/mergemod.dll
index 2f4cdc7c..b6422174 100644
--- a/src/wixnative/x64/mergemod.dll
+++ b/src/wixnative/x64/mergemod.dll
Binary files differ
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 00:54:07 +0000