Support VS2019
Rob Mensching committed
May 9, 2019 at 15:12 UTC
1ec68f7c9925536e9f11f5f849eb812a99dfa8ce
4 files changed
+28
-3
appveyor.cmd
+7
-2
@@ -8,8 +8,13 @@ msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140_xp
8
9
msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp
10
msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141_xp
11
-msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
12
-msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141
11
+rem msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
12
+rem msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141
13
+
14
+msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142
15
+msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142
16
+rem msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142
17
+rem msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142
18
19
msbuild -p:Configuration=Release -t:PackNativeNuget src\dutil\dutil.vcxproj
20
appveyor.yml
+8
-1
@@ -3,7 +3,12 @@
3
# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
4
# then update all of the repos.
5
6
-image: Visual Studio 2017
6
+branches:
7
+ only:
8
+ - master
9
+ - develop
10
+
11
+image: Visual Studio 2019 Preview
12
13
version: 0.0.0.{build}
14
configuration: Release
@@ -28,6 +33,8 @@ skip_tags: true
33
artifacts:
34
- path: build\Release\**\*.nupkg
35
name: nuget
36
+- path: build\Release\**\*.msi
37
+ name: msi
38
39
notifications:
40
- provider: Slack
src/dutil/build/WixToolset.DUtil.props
+5
@@ -20,4 +20,9 @@
20
<AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
21
</Link>
22
</ItemDefinitionGroup>
23
+ <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
24
+ <Link>
25
+ <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
26
+ </Link>
27
+ </ItemDefinitionGroup>
28
</Project>
src/dutil/dutil.nuspec
+8
@@ -20,7 +20,15 @@
20
<file src="..\..\build\$configuration$\v140_xp\x86\dutil.lib" target="build\native\v140\x86" />
21
<file src="..\..\build\$configuration$\v141_xp\x64\dutil.lib" target="build\native\v141\x64" />
22
<file src="..\..\build\$configuration$\v141_xp\x86\dutil.lib" target="build\native\v141\x86" />
23
+ <!--
24
<file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" />
25
<file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
26
+ -->
27
+ <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" />
28
+ <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" />
29
+ <!--
30
+ <file src="..\..\build\$configuration$\v142\ARM\dutil.lib" target="build\native\v142\ARM" />
31
+ <file src="..\..\build\$configuration$\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" />
32
+ -->
33
</files>
34
</package>