From bfc587c1b4d1f96d8b7c595915152d5b6a5c01a6 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@joyofsetup.com>
Date: Sun, 10 May 2020 17:21:54 -0400
Subject: Drop XP support and enable ARM64.

---
 appveyor.cmd                | 17 +++++++++++------
 appveyor.yml                |  2 +-
 src/Cpp.Build.props         |  2 +-
 src/wcautil/packages.config |  4 ++--
 src/wcautil/wcautil.nuspec  | 17 +++++++++++------
 src/wcautil/wcautil.vcxproj | 16 ++++++++--------
 6 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/appveyor.cmd b/appveyor.cmd
index 213370fe..497a5b28 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -3,13 +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
-msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
-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
+msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142
+msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142
 
 msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj
 
diff --git a/appveyor.yml b/appveyor.yml
index d55322da..bbf880f0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,7 @@
 #  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
+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/wcautil/packages.config b/src/wcautil/packages.config
index b11fe210..0b643acb 100644
--- a/src/wcautil/packages.config
+++ b/src/wcautil/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Nerdbank.GitVersioning" version="2.0.37-beta" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.DUtil" version="4.0.3" targetFramework="native" />
+  <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.DUtil" version="4.0.20" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/wcautil/wcautil.nuspec b/src/wcautil/wcautil.nuspec
index 7a4707d1..784aa2bb 100644
--- a/src/wcautil/wcautil.nuspec
+++ b/src/wcautil/wcautil.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/wcautil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
@@ -19,11 +18,17 @@
   <files>
     <file src="build\$id$.props" target="build\" />
     <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140_xp\x64\wcautil.lib" target="build\native\v140\x64" />
-    <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\v140\x86" />
-    <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\v141\x64" />
-    <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v140\x64\wcautil.lib" target="build\native\v140\x64" />
+    <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" />
+    <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" />
+    <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" />
+    <!--
     <file src="..\..\build\$configuration$\v141\ARM\wcautil.lib" target="build\native\v141\ARM" />
     <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
+    -->
+    <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" />
+    <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" />
+    <file src="..\..\build\$configuration$\v142\ARM\wcautil.lib" target="build\native\v142\ARM" />
+    <file src="..\..\build\$configuration$\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" />
   </files>
 </package>
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj
index 5cdbf6f1..a31994ab 100644
--- a/src/wcautil/wcautil.vcxproj
+++ b/src/wcautil/wcautil.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -11,6 +11,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -27,10 +31,6 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -50,7 +50,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="Shared">
-    <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')" />
+    <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
   </ImportGroup>
   <Import Project="..\NativeMultiTargeting.Build.props" />
 
@@ -97,7 +97,7 @@
     <PropertyGroup>
       <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>
     </PropertyGroup>
-    <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'))" />
-    <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'))" />
+    <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'))" />
+    <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'))" />
   </Target>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb