Support VS2019

4 files changed, 28 insertions, 3 deletions

diff --git a/appveyor.cmd b/appveyor.cmd
index e07239f7..7b8aeb28 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -8,8 +8,13 @@ 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
+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 -t:PackNativeNuget src\dutil\dutil.vcxproj
 
diff --git a/appveyor.yml b/appveyor.yml
index d55322da..6df525ad 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,12 @@
 #  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
 #  then update all of the repos.
 
-image: Visual Studio 2017
+branches:
+  only:
+    - master
+    - develop
+
+image: Visual Studio 2019 Preview
 
 version: 0.0.0.{build}
 configuration: Release
@@ -28,6 +33,8 @@ skip_tags: true
 artifacts:
 - path: build\Release\**\*.nupkg
   name: nuget
+- path: build\Release\**\*.msi
+  name: msi
 
 notifications:
 - provider: Slack
diff --git a/src/dutil/build/WixToolset.DUtil.props b/src/dutil/build/WixToolset.DUtil.props
index e39d9cea..35749be8 100644
--- a/src/dutil/build/WixToolset.DUtil.props
+++ b/src/dutil/build/WixToolset.DUtil.props
@@ -20,4 +20,9 @@
       <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
+    <Link>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
 </Project>
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec
index f74081be..ab74dc79 100644
--- a/src/dutil/dutil.nuspec
+++ b/src/dutil/dutil.nuspec
@@ -20,7 +20,15 @@
     <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$\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>