Merge pull request #6 from wixtoolset/bob/arm64

Drop XP support and enable ARM64.

4 files changed, 15 insertions, 18 deletions

diff --git a/appveyor.cmd b/appveyor.cmd
index 7b8aeb28..49869ace 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -3,18 +3,18 @@
 
 nuget restore
 
-msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140_xp
-msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140_xp
+msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140
+msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140
 
-msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp
-msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141_xp
-rem msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
-rem msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141
+msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141
+msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141
+REM msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
+REM msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141
 
 msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142
 msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142
-rem msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142
-rem msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142
+msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142
+msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142
 
 msbuild -p:Configuration=Release -t:PackNativeNuget src\dutil\dutil.vcxproj
 
diff --git a/appveyor.yml b/appveyor.yml
index 6df525ad..522e5af3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ branches:
     - master
     - develop
 
-image: Visual Studio 2019 Preview
+image: Visual Studio 2019
 
 version: 0.0.0.{build}
 configuration: Release
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 0e00132b..44a042c7 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -8,7 +8,7 @@
     <OutDir>$(OutputPath)$(Platform)\</OutDir>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
     <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec
index ab74dc79..2ae420e1 100644
--- a/src/dutil/dutil.nuspec
+++ b/src/dutil/dutil.nuspec
@@ -5,8 +5,7 @@
     <version>$version$</version>
     <authors>$authors$</authors>
     <owners>$authors$</owners>
-    <!-- <license type="expression">MS-RL</license> -->
-    <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
+    <license type="expression">MS-RL</license>
     <projectUrl>https://github.com/wixtoolset/dutil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
@@ -16,19 +15,17 @@
   <files>
     <file src="build\$id$.props" target="build\" />
     <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140_xp\x64\dutil.lib" target="build\native\v140\x64" />
-    <file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\v140\x86" />
-    <file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\v141\x64" />
-    <file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v140\x64\dutil.lib" target="build\native\v140\x64" />
+    <file src="..\..\build\$configuration$\v140\x86\dutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\build\$configuration$\v141\x64\dutil.lib" target="build\native\v141\x64" />
+    <file src="..\..\build\$configuration$\v141\x86\dutil.lib" target="build\native\v141\x86" />
     <!--
     <file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" />
     <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
     -->
     <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" />
     <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" />
-    <!--
     <file src="..\..\build\$configuration$\v142\ARM\dutil.lib" target="build\native\v142\ARM" />
     <file src="..\..\build\$configuration$\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" />
-    -->
   </files>
 </package>