Drop XP support and enable ARM64.
Bob Arnson committed
May 10, 2020 at 17:21 UTC
bfc587c1b4d1f96d8b7c595915152d5b6a5c01a6
6 files changed
+34
-24
appveyor.cmd
+11
-6
@@ -3,13 +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
-msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
12
-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
+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\wcautil\wcautil.vcxproj
20
appveyor.yml
+1
-1
@@ -3,7 +3,7 @@
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
+image: Visual Studio 2019
7
8
version: 0.0.0.{build}
9
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/wcautil/packages.config
+2
-2
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
- <package id="Nerdbank.GitVersioning" version="2.0.37-beta" targetFramework="native" developmentDependency="true" />
4
- <package id="WixToolset.DUtil" version="4.0.3" targetFramework="native" />
3
+ <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.DUtil" version="4.0.20" targetFramework="native" />
5
</packages>
\ No newline at end of file
src/wcautil/wcautil.nuspec
+11
-6
@@ -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/wcautil</projectUrl>
10
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11
<description>$description$</description>
@@ -19,11 +18,17 @@
18
<files>
19
<file src="build\$id$.props" target="build\" />
20
<file src="inc\*" target="build\native\include" />
22
- <file src="..\..\build\$configuration$\v140_xp\x64\wcautil.lib" target="build\native\v140\x64" />
23
- <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\v140\x86" />
24
- <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\v141\x64" />
25
- <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" />
21
+ <file src="..\..\build\$configuration$\v140\x64\wcautil.lib" target="build\native\v140\x64" />
22
+ <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" />
23
+ <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" />
24
+ <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" />
25
+ <!--
26
<file src="..\..\build\$configuration$\v141\ARM\wcautil.lib" target="build\native\v141\ARM" />
27
<file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
28
+ -->
29
+ <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" />
30
+ <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" />
31
+ <file src="..\..\build\$configuration$\v142\ARM\wcautil.lib" target="build\native\v142\ARM" />
32
+ <file src="..\..\build\$configuration$\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" />
33
</files>
34
</package>
src/wcautil/wcautil.vcxproj
+8
-8
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" />
4
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props')" />
5
<ItemGroup Label="ProjectConfigurations">
6
<ProjectConfiguration Include="Debug|ARM">
7
<Configuration>Debug</Configuration>
@@ -11,6 +11,10 @@
11
<Configuration>Debug</Configuration>
12
<Platform>ARM64</Platform>
13
</ProjectConfiguration>
14
+ <ProjectConfiguration Include="Debug|x64">
15
+ <Configuration>Debug</Configuration>
16
+ <Platform>x64</Platform>
17
+ </ProjectConfiguration>
18
<ProjectConfiguration Include="Debug|Win32">
19
<Configuration>Debug</Configuration>
20
<Platform>Win32</Platform>
@@ -27,10 +31,6 @@
31
<Configuration>Release</Configuration>
32
<Platform>Win32</Platform>
33
</ProjectConfiguration>
30
- <ProjectConfiguration Include="Debug|x64">
31
- <Configuration>Debug</Configuration>
32
- <Platform>x64</Platform>
33
- </ProjectConfiguration>
34
<ProjectConfiguration Include="Release|x64">
35
<Configuration>Release</Configuration>
36
<Platform>x64</Platform>
@@ -50,7 +50,7 @@
50
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
51
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
52
<ImportGroup Label="Shared">
53
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets')" />
53
+ <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
54
</ImportGroup>
55
<Import Project="..\NativeMultiTargeting.Build.props" />
56
@@ -97,7 +97,7 @@
97
<PropertyGroup>
98
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
99
</PropertyGroup>
100
- <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets'))" />
101
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props'))" />
100
+ <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
101
+ <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props'))" />
102
</Target>
103
</Project>
\ No newline at end of file