Drop XP support and enable ARM64.
Bob Arnson committed
May 9, 2020 at 22:24 UTC
00fe99e60cabf3200a316498ee9c9b90060ec937
4 files changed
+15
-18
appveyor.cmd
+8
-8
@@ -3,18 +3,18 @@
3
4
nuget restore
5
6
-msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140_xp
7
-msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140_xp
6
+msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140
7
+msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140
8
9
-msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp
10
-msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141_xp
11
-rem msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
12
-rem msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141
9
+msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141
10
+msbuild -p:Configuration=Release;Platform=x64;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
16
+msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142
17
+msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142
18
19
msbuild -p:Configuration=Release -t:PackNativeNuget src\dutil\dutil.vcxproj
20
appveyor.yml
+1
-1
@@ -8,7 +8,7 @@ branches:
8
- master
9
- develop
10
11
-image: Visual Studio 2019 Preview
11
+image: Visual Studio 2019
12
13
version: 0.0.0.{build}
14
configuration: Release
src/Cpp.Build.props
+1
-1
@@ -8,7 +8,7 @@
8
<OutDir>$(OutputPath)$(Platform)\</OutDir>
9
</PropertyGroup>
10
11
- <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
11
+ <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
12
<WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
13
</PropertyGroup>
14
src/dutil/dutil.nuspec
+5
-8
@@ -5,8 +5,7 @@
5
<version>$version$</version>
6
<authors>$authors$</authors>
7
<owners>$authors$</owners>
8
- <!-- <license type="expression">MS-RL</license> -->
9
- <licenseUrl>https://licenses.nuget.org/MS-RL</licenseUrl>
8
+ <license type="expression">MS-RL</license>
9
<projectUrl>https://github.com/wixtoolset/dutil</projectUrl>
10
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11
<description>$description$</description>
@@ -16,19 +15,17 @@
15
<files>
16
<file src="build\$id$.props" target="build\" />
17
<file src="inc\*" target="build\native\include" />
19
- <file src="..\..\build\$configuration$\v140_xp\x64\dutil.lib" target="build\native\v140\x64" />
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" />
18
+ <file src="..\..\build\$configuration$\v140\x64\dutil.lib" target="build\native\v140\x64" />
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
<!--
23
<file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" />
24
<file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
25
-->
26
<file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" />
27
<file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" />
29
- <!--
28
<file src="..\..\build\$configuration$\v142\ARM\dutil.lib" target="build\native\v142\ARM" />
29
<file src="..\..\build\$configuration$\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" />
32
- -->
30
</files>
31
</package>