Add ARM and ARM64 for v141.

5 files changed, 47 insertions, 10 deletions

diff --git a/appveyor.cmd b/appveyor.cmd
index 74f0ec2c..213370fe 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -8,6 +8,8 @@ msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140_xp
 
 msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp
 msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141_xp
+msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
+msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141
 
 msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj
 
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 296b36ca..0e00132b 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -8,6 +8,10 @@
     <OutDir>$(OutputPath)$(Platform)\</OutDir>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
+    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
@@ -16,7 +20,7 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
-      <CallingConvention>StdCall</CallingConvention>
+      <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
       <TreatWarningAsError>true</TreatWarningAsError>
       <ExceptionHandling>false</ExceptionHandling>
       <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
diff --git a/src/wcautil/wcautil.nuspec b/src/wcautil/wcautil.nuspec
index 66baa81b..7a4707d1 100644
--- a/src/wcautil/wcautil.nuspec
+++ b/src/wcautil/wcautil.nuspec
@@ -23,5 +23,7 @@
     <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\v140\x86" />
     <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\v141\x64" />
     <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v141\ARM\wcautil.lib" target="build\native\v141\ARM" />
+    <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
   </files>
 </package>
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj
index d9356a8e..5cdbf6f1 100644
--- a/src/wcautil/wcautil.vcxproj
+++ b/src/wcautil/wcautil.vcxproj
@@ -3,10 +3,26 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -26,6 +42,7 @@
     <TargetName>wcautil</TargetName>
     <MultiTargetLibrary>true</MultiTargetLibrary>
     <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset Condition="$(Platform.StartsWith('ARM'))">v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Custom Action native utility library</Description>
   </PropertyGroup>
diff --git a/wcautil.sln b/wcautil.sln
index 1b6d9e30..8f45f5f6 100644
--- a/wcautil.sln
+++ b/wcautil.sln
@@ -3,24 +3,36 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wcautil", "src\wcautil\wcautil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wcautil", "src\wcautil\wcautil.vcxproj", "{5B3714B6-3A76-463E-8595-D48DA276C512}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|ARM = Debug|ARM
+                Debug|ARM64 = Debug|ARM64
                 Debug|x64 = Debug|x64
                 Debug|x86 = Debug|x86
+                Release|ARM = Release|ARM
+                Release|ARM64 = Release|ARM64
                 Release|x64 = Release|x64
                 Release|x86 = Release|x86
         EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.ActiveCfg = Debug|x64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.Build.0 = Debug|x64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.ActiveCfg = Debug|Win32
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.Build.0 = Debug|Win32
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.ActiveCfg = Release|x64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.Build.0 = Release|x64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.ActiveCfg = Release|Win32
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.Build.0 = Release|Win32
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM.ActiveCfg = Debug|ARM
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM.Build.0 = Debug|ARM
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.ActiveCfg = Debug|ARM64
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.Build.0 = Debug|ARM64
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.ActiveCfg = Debug|x64
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.Build.0 = Debug|x64
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.ActiveCfg = Debug|Win32
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.Build.0 = Debug|Win32
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM.ActiveCfg = Release|ARM
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM.Build.0 = Release|ARM
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.ActiveCfg = Release|ARM64
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.Build.0 = Release|ARM64
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x64.ActiveCfg = Release|x64
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x64.Build.0 = Release|x64
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x86.ActiveCfg = Release|Win32
+                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x86.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE