Add ARM/ARM64 wixnative.exe Update mergemod.dll from SDK 10.0.19041.0.
Add ARM/ARM64 wixnative.exe Update mergemod.dll from SDK 10.0.19041.0.
Sean Hall committed
Jun 24, 2020 at 14:32 UTC
84a60ab50339f158715172ef24804c5b9cb5ba9d
8 files changed
+56
-10
src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+8
@@ -9,6 +9,14 @@
9
</PropertyGroup>
10
11
<ItemGroup>
12
+ <ProjectReference Include="..\wixnative\wixnative.vcxproj">
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>
22
<Properties>Platform=Win32</Properties>
src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
+6
@@ -19,6 +19,12 @@
19
<files>
20
<file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
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" />
28
<file src="$mergemoddir$Win32\mergemod.dll" target="runtimes\win-x86\native" />
29
<file src="Win32\wixnative.exe" target="runtimes\win-x86\native" />
30
<file src="Win32\wixnative.pdb" target="runtimes\win-x86\native" />
src/winterop/winterop.vcxproj
+21
-5
@@ -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')" />
6
7
<ItemGroup Label="ProjectConfigurations">
8
- <ProjectConfiguration Include="Debug|Win32">
8
+ <ProjectConfiguration Include="Debug|ARM">
9
<Configuration>Debug</Configuration>
10
- <Platform>Win32</Platform>
10
+ <Platform>ARM</Platform>
11
</ProjectConfiguration>
12
- <ProjectConfiguration Include="Release|Win32">
13
- <Configuration>Release</Configuration>
12
+ <ProjectConfiguration Include="Debug|ARM64">
13
+ <Configuration>Debug</Configuration>
14
+ <Platform>ARM64</Platform>
15
+ </ProjectConfiguration>
16
+ <ProjectConfiguration Include="Debug|Win32">
17
+ <Configuration>Debug</Configuration>
18
<Platform>Win32</Platform>
19
</ProjectConfiguration>
20
<ProjectConfiguration Include="Debug|x64">
21
<Configuration>Debug</Configuration>
22
<Platform>x64</Platform>
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>
36
<ProjectConfiguration Include="Release|x64">
37
<Configuration>Release</Configuration>
38
<Platform>x64</Platform>
@@ -27,7 +43,7 @@
43
<ProjectGuid>{26D45E58-E703-431D-B67E-493C72C9DA0B}</ProjectGuid>
44
<ConfigurationType>DynamicLibrary</ConfigurationType>
45
<TargetName>winterop</TargetName>
30
- <PlatformToolset>v141</PlatformToolset>
46
+ <PlatformToolset>v142</PlatformToolset>
47
<CharacterSet>MultiByte</CharacterSet>
48
<ProjectModuleDefinitionFile>winterop.def</ProjectModuleDefinitionFile>
49
<Description>Native component of WixToolset.Core</Description>
src/wixnative/ARM/mergemod.dll
Binary files /dev/null and b/src/wixnative/ARM/mergemod.dll differ
src/wixnative/ARM64/mergemod.dll
Binary files /dev/null and b/src/wixnative/ARM64/mergemod.dll differ
src/wixnative/Win32/mergemod.dll
Binary files a/src/wixnative/Win32/mergemod.dll and b/src/wixnative/Win32/mergemod.dll differ
src/wixnative/wixnative.vcxproj
+21
-5
@@ -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')" />
6
7
<ItemGroup Label="ProjectConfigurations">
8
- <ProjectConfiguration Include="Debug|Win32">
8
+ <ProjectConfiguration Include="Debug|ARM">
9
<Configuration>Debug</Configuration>
10
- <Platform>Win32</Platform>
10
+ <Platform>ARM</Platform>
11
</ProjectConfiguration>
12
- <ProjectConfiguration Include="Release|Win32">
13
- <Configuration>Release</Configuration>
12
+ <ProjectConfiguration Include="Debug|ARM64">
13
+ <Configuration>Debug</Configuration>
14
+ <Platform>ARM64</Platform>
15
+ </ProjectConfiguration>
16
+ <ProjectConfiguration Include="Debug|Win32">
17
+ <Configuration>Debug</Configuration>
18
<Platform>Win32</Platform>
19
</ProjectConfiguration>
20
<ProjectConfiguration Include="Debug|x64">
21
<Configuration>Debug</Configuration>
22
<Platform>x64</Platform>
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>
36
<ProjectConfiguration Include="Release|x64">
37
<Configuration>Release</Configuration>
38
<Platform>x64</Platform>
@@ -28,7 +44,7 @@
44
<ConfigurationType>Application</ConfigurationType>
45
<ProjectSubSystem>Console</ProjectSubSystem>
46
<TargetName>wixnative</TargetName>
31
- <PlatformToolset>v141</PlatformToolset>
47
+ <PlatformToolset>v142</PlatformToolset>
48
<CharacterSet>Unicode</CharacterSet>
49
</PropertyGroup>
50
src/wixnative/x64/mergemod.dll
Binary files a/src/wixnative/x64/mergemod.dll and b/src/wixnative/x64/mergemod.dll differ