@joebigelow / wix / commits / 57536725

Pack v141 ARM and ARM64.

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