@joebigelow / wix-1 / commits / 0f13c5ea

Pack v141 ARM and ARM64.

Sean Hall committed Jun 18, 2020 at 21:46 UTC 0f13c5ea646abd77db71f1c7b562b9f9abdaa236
2 files changed +1 -4
src/wcautil/wcautil.nuspec
-2
@@ -22,10 +22,8 @@
22 <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" />
23 <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" />
24 <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" />
25 - <!--
25 <file src="..\..\build\$configuration$\v141\ARM\wcautil.lib" target="build\native\v141\ARM" />
26 <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
28 - -->
27 <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" />
28 <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" />
29 <file src="..\..\build\$configuration$\v142\ARM\wcautil.lib" target="build\native\v142\ARM" />
src/wcautil/wcautil.vcxproj
+1 -2
@@ -41,8 +41,7 @@
41 <ConfigurationType>StaticLibrary</ConfigurationType>
42 <TargetName>wcautil</TargetName>
43 <MultiTargetLibrary>true</MultiTargetLibrary>
44 - <PlatformToolset>v141_xp</PlatformToolset>
45 - <PlatformToolset Condition="$(Platform.StartsWith('ARM'))">v141</PlatformToolset>
44 + <PlatformToolset>v142</PlatformToolset>
45 <CharacterSet>MultiByte</CharacterSet>
46 <Description>WiX Toolset Custom Action native utility library</Description>
47 </PropertyGroup>